[Libreoffice-commits] .: 2 commits - configure.in sw/source

2012-02-13 Thread Tor Lillqvist 
 configure.in  |2 +-
 sw/source/ui/inc/FrameControl.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5ba36c0e820e7ef32ea332d9be58441729f6993e
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Feb 13 10:39:21 2012 +0200

Say MSVC build as that is what build_os = cygwin means

diff --git a/configure.in b/configure.in
index cdd09e3..2dbdd4e 100644
--- a/configure.in
+++ b/configure.in
@@ -10650,7 +10650,7 @@ AC_MSG_RESULT([$BUILD_NCPUS])
 AC_SUBST(BUILD_NCPUS)
 
 #
-# Set up ILIB for windows build
+# Set up ILIB for MSVC build
 #
 if test $build_os = cygwin; then
 ILIB=.;$SRC_ROOT/solver/$INPATH/lib
commit b7980663f0866629e7c54a085f31dba3d9c26b26
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 09:42:39 2012 +0200

WaE: type name first seen using 'class' now seen using 'struct'

diff --git a/sw/source/ui/inc/FrameControl.hxx 
b/sw/source/ui/inc/FrameControl.hxx
index cf887a9..53976f8 100644
--- a/sw/source/ui/inc/FrameControl.hxx
+++ b/sw/source/ui/inc/FrameControl.hxx
@@ -30,7 +30,7 @@
 
 class SwEditWin;
 class SwFrm;
-struct Point;
+class Point;
 
 /** Class representing a control linked to a SwFrm.
   */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2012-02-13 Thread Stephan Bergmann 
 vcl/unx/generic/gdi/salgdi3.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 758cceaff4c8038c5ec5115aaa593d46483d6626
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 13 10:59:34 2012 +0100

Duplicate #include

diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index c55cb14..7761445 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -84,7 +84,6 @@
 #include cairo-ft.h
 #include cairo-xlib.h
 #include cairo-xlib-xrender.h
-#include fontconfig/fontconfig.h
 
 struct BOX
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2012-02-13 Thread Miklos Vajna 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 492dbf9ceceea81edeb5d6c8d94aeed09e738176
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Feb 13 11:04:32 2012 +0100

fix RTF import of ffres token for checkboxes

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a3a9e73..8f3f311 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2525,7 +2525,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
m_aFormfieldSprms-push_back(make_pair(NS_ooxml::LN_CT_FFDDList_default, 
pIntValue));
 break;
 case RTF_FFRES:
-if (m_nFormFieldType == FORMFIELD_LIST)
+if (m_nFormFieldType == FORMFIELD_CHECKBOX)
+
m_aFormfieldSprms-push_back(make_pair(NS_ooxml::LN_CT_FFCheckBox_checked, 
pIntValue));
+else if (m_nFormFieldType == FORMFIELD_LIST)
 
m_aFormfieldSprms-push_back(make_pair(NS_ooxml::LN_CT_FFDDList_result, 
pIntValue));
 break;
 case RTF_EDMINS:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: test/inc

2012-02-13 Thread Tor Lillqvist 
 test/inc/test/container/xelementaccess.hxx |2 ++
 test/inc/test/container/xnamecontainer.hxx |2 ++
 test/inc/test/container/xnamereplace.hxx   |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 976cc2360d4e2c2060cbc82714017f3179f50a5c
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 12:24:22 2012 +0200

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

diff --git a/test/inc/test/container/xelementaccess.hxx 
b/test/inc/test/container/xelementaccess.hxx
index a9b897e..6ec106a 100644
--- a/test/inc/test/container/xelementaccess.hxx
+++ b/test/inc/test/container/xelementaccess.hxx
@@ -43,6 +43,8 @@ public:
 
 virtual uno::Reference uno::XInterface  init() = 0;
 
+virtual ~XElementAccess() {}
+
 private:
 uno::Type maType;
 };
diff --git a/test/inc/test/container/xnamecontainer.hxx 
b/test/inc/test/container/xnamecontainer.hxx
index 6f296d7..152edca 100644
--- a/test/inc/test/container/xnamecontainer.hxx
+++ b/test/inc/test/container/xnamecontainer.hxx
@@ -46,6 +46,8 @@ public:
 
 void testRemoveByName();
 
+virtual ~XNameContainer() {}
+
 private:
 rtl::OUString maNameToRemove;
 };
diff --git a/test/inc/test/container/xnamereplace.hxx 
b/test/inc/test/container/xnamereplace.hxx
index e91d5a7..71000c7 100644
--- a/test/inc/test/container/xnamereplace.hxx
+++ b/test/inc/test/container/xnamereplace.hxx
@@ -46,6 +46,8 @@ public:
 
 virtual uno::Any getAnyElementForNameReplace() = 0;
 
+virtual ~XNameReplace() {}
+
 private:
 rtl::OUString maName;
 
___
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

2012-02-13 Thread Cédric Bosdonnat 
 sw/source/ui/lingu/olmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fe67dc40760b4ff7cdc1325bb4e97a3ce259ccb
Author: László Németh nem...@numbertext.org
Date:   Tue Dec 13 21:35:25 2011 +0100

Fix FullCommentURL for grammar checking (local menu)

Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr

diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 0e1a7cd..b85dfaa 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -589,7 +589,7 @@ aInfo16( SW_RES(IMG_INFO_16) )
 beans::PropertyValues  aProperties = rResult.aErrors[ nErrorInResult 
].aProperties;
 {
 sal_Int32 i = 0;
-while ( !sExplanationLink.isEmpty()  i  aProperties.getLength() )
+while ( sExplanationLink.isEmpty()  i  aProperties.getLength() )
 {
 if ( aProperties[i].Name.equalsAscii( FullCommentURL ) )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - basic/inc basic/source comphelper/source l10ntools/inc l10ntools/source solenv/bin solenv/gbuild solenv/inc toolkit/source tools/inc tools/source unusedcode.easy

2012-02-13 Thread Caolán McNamara 
 basic/inc/basic/global.hxx |3 -
 basic/source/basmgr/basmgr.cxx |6 +-
 basic/source/classes/global.cxx|   36 
 basic/source/comp/exprtree.cxx |   17 -
 basic/source/inc/expr.hxx  |1 
 comphelper/source/misc/string.cxx  |   30 --
 l10ntools/inc/l10ntools/directory.hxx  |6 --
 l10ntools/source/directory.cxx |   20 --
 solenv/bin/install-gdb-printers|2 
 solenv/gbuild/gbuild.mk|8 ++
 solenv/inc/unitools.mk |8 ++
 toolkit/source/helper/registerservices.cxx |   14 
 tools/inc/tools/fsys.hxx   |1 
 tools/inc/tools/stream.hxx |1 
 tools/inc/tools/string.hxx |8 +-
 tools/source/fsys/dirent.cxx   |   28 -
 tools/source/stream/stream.cxx |8 --
 tools/source/string/strimp.cxx |   26 
 tools/source/string/strucvt.cxx|   25 
 unusedcode.easy|   84 ++---
 20 files changed, 114 insertions(+), 218 deletions(-)

New commits:
commit c3b59c3da7bf9e13a07620987aa85b633c7ec9c8
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 10:45:59 2012 +

preserve timestamps for .py files

.pyc and .pyo binary caches contain the timestamp of the .py file, so for
fedora multilib if the .py files get different times on different arch then 
the
.py[o|c] files end up being different for the same content

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 99686cf..df327a0 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -165,7 +165,7 @@ fi
 
 if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 mkdir -p ${DESTDIR}${pythondir} || die cannot create dir 
'${DESTDIR}${pythondir}'
-cp -r ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
+cp -pr ${GDBDIR}/libreoffice ${DESTDIR}${pythondir}
 fi
 
 make_autoload cppu ure-link/lib libuno_cppu.$DYLIB.3
commit 3b4786b6b7eec79b29f604cffc1cd708244e90b3
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 10:20:39 2012 +

callcatcher: regenerate list

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index fabb700..ef4ee5d 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -737,23 +737,6 @@ SbiExprNode* SbiExpression::VBA_And()
 return pNd;
 }
 
-SbiExprNode* SbiExpression::VBA_Or()
-{
-SbiExprNode* pNd = VBA_And();
-if( m_eMode != EXPRMODE_EMPTY_PAREN )
-{
-for( ;; )
-{
-SbiToken eTok = pParser-Peek();
-if( eTok != OR )
-break;
-eTok = pParser-Next();
-pNd = new SbiExprNode( pParser, pNd, eTok, VBA_And() );
-}
-}
-return pNd;
-}
-
 SbiExprNode* SbiExpression::Like()
 {
 SbiExprNode* pNd = pParser-IsVBASupportOn() ? VBA_Not() : Comp();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index 33ee938..eb03504 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -190,7 +190,6 @@ protected:
 SbiExprNode* Like();
 SbiExprNode* VBA_Not();
 SbiExprNode* VBA_And();
-SbiExprNode* VBA_Or();
 SbiExprNode* Comp();
 SbiExprNode* Boolean();
 public:
diff --git a/comphelper/source/misc/string.cxx 
b/comphelper/source/misc/string.cxx
index 13a1236..8514a83 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -511,16 +511,6 @@ namespace
 }
 }
 
-bool isalnumAsciiString(const rtl::OString rString)
-{
-return tmpl_is_OPER_AsciiStringisalnumAscii(rString);
-}
-
-bool isalnumAsciiString(const rtl::OUString rString)
-{
-return tmpl_is_OPER_AsciiStringisalnumAscii(rString);
-}
-
 bool isdigitAsciiString(const rtl::OString rString)
 {
 return tmpl_is_OPER_AsciiStringisdigitAscii(rString);
@@ -531,26 +521,6 @@ bool isdigitAsciiString(const rtl::OUString rString)
 return tmpl_is_OPER_AsciiStringisdigitAscii(rString);
 }
 
-bool islowerAsciiString(const rtl::OString rString)
-{
-return tmpl_is_OPER_AsciiStringislowerAscii(rString);
-}
-
-bool islowerAsciiString(const rtl::OUString rString)
-{
-return tmpl_is_OPER_AsciiStringislowerAscii(rString);
-}
-
-bool isupperAsciiString(const rtl::OString rString)
-{
-return tmpl_is_OPER_AsciiStringisupperAscii(rString);
-}
-
-bool isupperAsciiString(const rtl::OUString rString)
-{
-return tmpl_is_OPER_AsciiStringisupperAscii(rString);
-}
-
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/l10ntools/directory.hxx 
b/l10ntools/inc/l10ntools/directory.hxx
index ba2590f..d70e5fe 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -24,7 +24,6 @@ class Directory
 private:
 rtl::OUString

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

2012-02-13 Thread Caolán McNamara 
 binfilter/bf_svtools/source/misc/tl_strucvt.cxx |   16 
 binfilter/inc/bf_tools/string.hxx   |2 --
 2 files changed, 18 deletions(-)

New commits:
commit 34eccca5a0c9f2f7e0e1bc655ad0195a5d69c1ed
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 10:20:54 2012 +

drop InitStringRes

diff --git a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx 
b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
index d5bc082..00d2869 100644
--- a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
@@ -31,22 +31,6 @@ namespace binfilter
 
 // ===
 
-void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
-{
-DBG_CTOR( UniString, DbgCheckUniString );
-OSL_ENSURE(nLen = STRING_MAXLEN, Overflowing UniString);
-
-mpData = NULL;
-rtl_string2UString( (rtl_uString **)(mpData),
-pUTF8Str, nLen,
-RTL_TEXTENCODING_UTF8,
-RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
-RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
-RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-}
-
-// ===
-
 UniString::UniString( const ByteString rByteStr, rtl_TextEncoding 
eTextEncoding, sal_uInt32 nCvtFlags )
 {
 DBG_CTOR( UniString, DbgCheckUniString );
diff --git a/binfilter/inc/bf_tools/string.hxx 
b/binfilter/inc/bf_tools/string.hxx
index 3c2cd96..cb28021 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -354,8 +354,6 @@ class TOOLS_DLLPUBLIC UniString
 {
 friend  class ByteString;
 
-TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32 
nLen );
-
 private:
 UniStringData*  mpData;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/bf_svtools

2012-02-13 Thread Caolán McNamara 
 binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4b0ad93aedebfb86cbdc93a1a1d761eb6f65d20a
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 11:07:30 2012 +

adapt hidden windows-only uses of toLower

diff --git a/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx 
b/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx
index 2e6..77c7594 100644
--- a/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx
@@ -54,7 +54,7 @@ namespace binfilter
 #ifdef WNT
 // on windows, assume that the relevant file systems are case 
insensitive,
 // thus normalize the URL
-m_sCheckURL = m_aSysLocale.GetCharClass().toLower( m_sCheckURL, 0, 
m_sCheckURL.Len() );
+m_sCheckURL = m_aSysLocale.GetCharClass().lowercase(m_sCheckURL);
 #endif
 }
 
@@ -63,7 +63,7 @@ namespace binfilter
 #ifdef WNT
 // on windows, assume that the relevant file systems are case 
insensitive,
 // thus normalize the URL
-String sApprovedURL( m_aSysLocale.GetCharClass().toLower( 
_rApprovedURL, 0, _rApprovedURL.Len() ) );
+String sApprovedURL( 
m_aSysLocale.GetCharClass().lowercase(_rApprovedURL) );
 #else
 String sApprovedURL( _rApprovedURL );
 #endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Caolán McNamara 
 binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx |   18 +-
 binfilter/bf_sw/source/core/inc/swcache.hxx  |2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 29eeaf67aac144238cc6f28b7af66ac2e63e9a7c
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 11:29:24 2012 +

fix windows ambiguities post binfilter-string move

diff --git a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx 
b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
index 65babe6..7634440 100644
--- a/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
+++ b/binfilter/bf_svtools/source/svdde/svt_ddesvr.cxx
@@ -108,7 +108,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 USHORT n = 0;
 while( STRING_NOTFOUND != n )
 {
-String s( sTopics.GetToken( 0, '\t', n ));
+rtl::OUString s( sTopics.GetToken( 0, '\t', n 
));
 if( s == reinterpret_castconst 
sal_Unicode*(chTopicBuf) )
 ++nTopics;
 }
@@ -138,7 +138,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 String s( sTopics.GetToken( 0, '\t', n ));
 s = comphelper::string::remove(s, '\n');
 s = comphelper::string::remove(s, '\r');
-if( !hText1 || s == reinterpret_castconst 
sal_Unicode*(chTopicBuf) )
+if( !hText1 || s == String(reinterpret_castconst 
sal_Unicode*(chTopicBuf)) )
 {
 DdeString aDStr( pInst-hDdeInstSvr, s );
 pTopic = FindTopic( *pService, (HSZ)aDStr );
@@ -238,15 +238,15 @@ found:
 String aRes;  // darf erst am Ende freigegeben werden!!
 if ( pTopic-IsSystemTopic() )
 {
-if ( pTopic-aItem == reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_TOPICS) )
+if ( pTopic-aItem == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_TOPICS)) )
 aRes = pService-Topics();
-else if ( pTopic-aItem == reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_SYSITEMS) )
+else if ( pTopic-aItem == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_SYSITEMS)) )
 aRes = pService-SysItems();
-else if ( pTopic-aItem == reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_STATUS) )
+else if ( pTopic-aItem == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_STATUS)) )
 aRes = pService-Status();
-else if ( pTopic-aItem == reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_FORMATS) )
+else if ( pTopic-aItem == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_FORMATS)) )
 aRes = pService-Formats();
-else if ( pTopic-aItem ==  reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_HELP) )
+else if ( pTopic-aItem ==  String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_ITEM_HELP)) )
 aRes = pService-GetHelp();
 else
 aRes = pService-SysTopicGet( pTopic-aItem );
@@ -619,7 +619,7 @@ const String DdeTopic::GetName() const
 
 BOOL DdeTopic::IsSystemTopic()
 {
-return BOOL (GetName() == reinterpret_castconst 
sal_Unicode*(SZDDESYS_TOPIC));
+return BOOL (GetName() == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_TOPIC)));
 }
 
 // --- DdeTopic::AddItem() -
@@ -913,7 +913,7 @@ String DdeService::SysItems()
 DdeTopic* t;
 for ( t = aTopics.First(); t; t = aTopics.Next() )
 {
-if ( t-GetName() == reinterpret_castconst 
sal_Unicode*(SZDDESYS_TOPIC) )
+if ( t-GetName() == String(reinterpret_castconst 
sal_Unicode*(SZDDESYS_TOPIC)) )
 {
 short n = 0;
 DdeItem* pi;
commit 101a6853e968e22187c4d2aba395ff13e76ae7d7
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 11:09:45 2012 +

WaE: need a virtual dtor

diff --git a/binfilter/bf_sw/source/core/inc/swcache.hxx 
b/binfilter/bf_sw/source/core/inc/swcache.hxx
index e706781..b1c6048 100644
--- a/binfilter/bf_sw/source/core/inc/swcache.hxx
+++ b/binfilter/bf_sw/source/core/inc/swcache.hxx
@@ -220,7 +220,7 @@ protected:
 inline SwCacheAccess( SwCache rCache, const void *pOwner, const USHORT 
nIndex );
 
 public:
-~SwCacheAccess() { if ( pObj ) pObj-Unlock(); }
+virtual ~SwCacheAccess() { if ( pObj ) pObj-Unlock(); }
 
 
 //Abkuerzung fuer diejenigen, die wissen, das die Ableitung das IsAvailable
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org

[Libreoffice-commits] .: sfx2/source

2012-02-13 Thread Tor Lillqvist 
 sfx2/source/notify/eventsupplier.cxx |4 ++--
 sfx2/source/view/ipclient.cxx|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eb676d0a9c6ce1d6fc50a595f3353f60d377e507
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 13:28:30 2012 +0200

WaE: unreferenced local variable

diff --git a/sfx2/source/notify/eventsupplier.cxx 
b/sfx2/source/notify/eventsupplier.cxx
index c5a6d6b..1af00d5 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -810,7 +810,7 @@ void SfxGlobalEvents_Impl::implts_notifyJobExecution(const 
css::document::EventO
 if (xJobExecutor.is())
 xJobExecutor-notifyEvent(aEvent);
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
@@ -832,7 +832,7 @@ void 
SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const css::docume
 aAny = xEvents-getByName(aEvent.EventName);
 Execute(aAny, aEvent, 0);
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index ac7dea2..3dbacca 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -279,7 +279,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
 xStatusIndicator = 
xStatusIndicatorFactory-createStatusIndicator();
 xPropSet-setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( IndicatorInterception )), uno::makeAny( 
xStatusIndicator ));
 }
-catch ( const uno::RuntimeException e )
+catch ( const uno::RuntimeException )
 {
 throw;
 }
@@ -309,7 +309,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
 xPropSet-setPropertyValue( rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( IndicatorInterception )), uno::makeAny( 
xStatusIndicator ));
 }
 }
-catch ( const uno::RuntimeException e )
+catch ( const uno::RuntimeException )
 {
 throw;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-13 Thread Caolán McNamara 
 configure.in |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 3d1f1c43a0cb6efb5bee3490ce90c63debf2d27b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 11:44:00 2012 +

allow java 1.7, or any future version

diff --git a/configure.in b/configure.in
index 2dbdd4e..b7c8d1d 100644
--- a/configure.in
+++ b/configure.in
@@ -4679,17 +4679,6 @@ if test $SOLAR_JAVA != ; then
 fi
 fi
 
-if ! test -z $_java_target_ver -o \
-$_java_target_ver = 1.1 -o \
-$_java_target_ver = 1.2 -o \
-$_java_target_ver = 1.3 -o \
-$_java_target_ver = 1.4 -o \
-$_java_target_ver = 1.5 -o \
-$_java_target_ver = 1.6 -o \
-$_java_target_ver = 5 ; then
-AC_MSG_ERROR([$_java_target_ver is not a supported Java bytecode 
version!])
-fi
-
 JAVA_SOURCE_VER=$_java_target_ver
 JAVA_TARGET_VER=$_java_target_ver
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2012-02-13 Thread Thorsten Behrens 
 solenv/bin/mkdocs.sh |  171 +++
 1 file changed, 134 insertions(+), 37 deletions(-)

New commits:
commit af54a1b8b1b04860302e8a743f512d01a87f6b9c
Author: Thorsten Behrens tbehr...@suse.com
Date:   Mon Feb 13 12:44:47 2012 +0100

Integrate Josh Heidenreich's nice README parser as start page.

From https://github.com/TheJosh/tdf-misc's scrape.php, ported the
concept over to bash, to have it run with the doxygen generation.

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index dbf4c46..a0ad6e4 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -1,27 +1,114 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
-# Doxygen Doc generation
+# Doxygen / README doc generation
 #
+# See git for contributors
+#
+
+function header {
+  title=$1
+  breadcrumb=$2
+  output=$3
+
+  cat -  $output EOF
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+   title$title/title
+
+   style
+   * { margin: 0; padding: 0; }
+   body { font-family: sans-serif; font-size: 12px; }
+   #head { padding: 20px; background: #18A303; }
+   #head a { color: #000; }
+   #body { padding: 20px; }
+   #foot { padding: 10px; font-size: 9px; border-top: 1px #18A303 solid; 
margin-top: 25px; }
+   p { line-height: 1.7em; margin-bottom: 1em; }
+   pre { margin-bottom: 0.5em; }
+   .multi-col { -moz-column-width: 13em; -webkit-column-width: 13em; 
-moz-column-gap: 1em; -webkit-column-gap: 1em; }
+   h1 {margin-bottom: 0.5em;}
+   h2,h3,h4 { margin: 1.3em 0 0.5em 0; }
+   ul, ol { margin: 0.5em 1.5em; }
+   /style
+/head
+body
+   div id=head
+   h1$title/h1
+   p$breadcrumb/p
+   /div
+   div id=body
+EOF
+}
+
+function footer {
+  output=$1
+
+  cat -  $output EOF
+
+/div
+div id=foot
+  small
+pGenerated by Libreoffice a 
href=http://cgit.freedesktop.org/libreoffice/core/plain/solenv/bin/mkdocs.sh;Module
 Description Tool/a/p
+pLast updated:
+EOF
+LANG= date  $output
+cat -  $output EOF
+/p
+  /small
+/div
+/body
+/html
+EOF
+
+}
+
+function proc_text {
+  # Local links: [[...]]
+  # Git links: [git:...]
+  # Other remote links: [...]
+  # Headings: == bleh ==
+  # Paragraphs: \n\n
+  sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/a href=\1.html\1\/a/g' - \
+  | sed -re ' s/\[git:([^]]+)\]/a 
href=http:\/\/cgit.freedesktop.org\/libreoffice\/core\/tree\/\1\1\/a/g' \
+  | sed -re ' s/\[([^]]+)\]/a href=\1\1\/a/g' \
+  | sed -re ' s/([^=]+)/h4\1\/h4/g' \
+  | sed -re ' s/===([^=]+)===/h3\1\/h3/g' \
+  | sed -re ' s/==([^=]+)==/h2\1\/h2/g' \
+  | sed -re ':a;N;$!ba;s/\n\n/\/pp/g' \
+  | awk 'BEGIN { print p } { print } END { print /p }'
+}
+
+function setup {
+  parm=$1
+  if [ -z ${!parm} ] ; then
+   echo grep \${parm}=\ ./config_host.mk | sed -re \ s/${parm}=//\)  
+echo $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \ 
s/${parm}=//\)
+eval $parm=$(grep \${parm}=\ ./config_host.mk | sed -re \ 
s/${parm}=//\)
+  fi
+  if [ -z ${!parm} ] ; then
+echo could not determine $parm 2
+exit 1
+  fi
+}
 
 # binaries that we need
 which doxygen  /dev/null 21 || {
-echo You need doxygen for doc generation
+echo You need doxygen for doc generation 2
 exit 1
 }
 which dot  /dev/null 21 || {
-echo You need the graphviz tools to create the nice inheritance graphs
+echo You need the graphviz tools to create the nice inheritance graphs 
2
 exit 1
 }
 
-# otherwise, aliases are not expanded below
-shopt -s expand_aliases
+# suck setup
+setup INPATH
+setup SOLARINC
+shopt -s nullglob
 
 # Title of the documentation
 DOXYGEN_PROJECT_PREFIX=LibreOffice
 
-# suck setup
-. ./Env.Host.sh
-
 # get list of modules in build order - bah, blows RAM  disk, static list below
 INPUT_PROJECTS=o3tl basegfx basebmp basic comphelper svl vcl canvas cppcanvas 
oox svtools goodies drawinglayer xmloff slideshow sfx2 editeng svx writerfilter 
cui chart2 dbaccess sd starmath sc sw
 
@@ -44,7 +131,7 @@ fi
 DOXYGEN_INCLUDE_PATH=`echo $SOLARINC | sed -e ' s/-I\.//'g | sed -e ' s/ -I/ 
/'g | sed -e ' s|/usr/[^ ]*| |g'`
 
 # setup version string
-DOXYGEN_VERSION=$GITTAG
+DOXYGEN_VERSION=master
 
 
 ###
@@ -54,12 +141,13 @@ DOXYGEN_VERSION=$GITTAG
 ###
 
 # cleanup
-rm -rf $BASE_OUTPUT/*
+echo cleaning up  rm -rf $BASE_OUTPUT/*
 
 # make the stuff world-readable
 umask 022
 
 # generate docs
+echo generating doxygen docs
 DOXYGEN_REF_TAGFILES=
 for PROJECT in `echo $INPUT_PROJECTS|tr ' ' '\n'|sort|tr '\n' ' '`;
 do
@@ -89,39 +177,48 @@ do
   echo Ref-Tags:   $DOXYGEN_REF_TAGFILES
   echo Title:  $DOXYGEN_PROJECTNAME
 
-  nice -15 doxygen $DOXYGEN_CFG || exit 1
+  #nice -15 doxygen $DOXYGEN_CFG || exit 1
 
   # setup referenced tagfiles for next round
   DOXYGEN_REF_TAGFILES=$DOXYGEN_REF_TAGFILES 
$DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html
 done
 
 # generate entry page
-cat -

[Libreoffice-commits] .: writerfilter/source

2012-02-13 Thread Miklos Vajna 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e0328096dc21ce12d15db2045074e7860872570f
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 13 12:52:21 2012 +0100

n#695479 fix RTF import of text frames with exact height

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8f3f311..bd02037 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3385,6 +3385,7 @@ RTFSprms RTFFrame::getSprms()
 {
 NS_ooxml::LN_CT_FramePr_x,
 NS_ooxml::LN_CT_FramePr_y,
+NS_ooxml::LN_CT_FramePr_hRule, // Make sure nHRule is processed before 
nH
 NS_sprm::LN_PWHeightAbs,
 NS_sprm::LN_PDxaWidth,
 NS_sprm::LN_PDxaFromText,
@@ -3395,8 +3396,7 @@ RTFSprms RTFFrame::getSprms()
 NS_ooxml::LN_CT_FramePr_yAlign,
 NS_sprm::LN_PWr,
 NS_ooxml::LN_CT_FramePr_dropCap,
-NS_ooxml::LN_CT_FramePr_lines,
-NS_ooxml::LN_CT_FramePr_hRule
+NS_ooxml::LN_CT_FramePr_lines
 };
 
 for ( int i = 0, len = sizeof( pNames ) / sizeof( Id ); i  len; ++i )
@@ -3448,7 +3448,10 @@ RTFSprms RTFFrame::getSprms()
 {
 sal_Int32 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto;
 if ( nH  0 )
+{
 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
+nH = -nH; // The negative value just sets nHRule
+}
 else if ( nH  0 )
 nHRule = 
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
 pValue.reset(new RTFValue(nHRule));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - cui/source lotuswordpro/source

2012-02-13 Thread Tor Lillqvist 
 cui/source/customize/acccfg.cxx  |   12 ++--
 lotuswordpro/source/filter/lwpfilter.cxx |1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit f9595ad5153ff3f98f9a36f3307aef4ecb62110d
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 14:00:29 2012 +0200

WaE: unreferenced local variable

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 5c79188..9ed0741 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -884,7 +884,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
 css::uno::Reference css::ui::XUIConfigurationManager  xUICfgManager 
= xModuleCfgSupplier-getUIConfigurationManager(m_sModuleLongName);
 m_xModule = css::uno::Reference css::ui::XAcceleratorConfiguration 
(xUICfgManager-getShortCutManager(), css::uno::UNO_QUERY_THROW);
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 { m_xSMGR.clear(); }
@@ -1020,7 +1020,7 @@ void SfxAcceleratorConfigPage::Apply(const 
css::uno::Reference css::ui::XAccele
 else
 xAccMgr-removeKeyEvent(aAWTKey);
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
@@ -1298,7 +1298,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, 
sfx2::FileDialogHelper*, EMPTYARG
 xComponent-dispose();
 }
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
@@ -1400,7 +1400,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl, 
sfx2::FileDialogHelper*, EMPTYARG
 xComponent-dispose();
 }
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
@@ -1437,7 +1437,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( 
SfxItemSet )
 {
 m_xAct-store();
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw;  }
 catch(const css::uno::Exception)
 { return sal_False; }
@@ -1526,7 +1526,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const 
String sCommand)
 return sLabel;
 }
 }
-catch(const css::uno::RuntimeException exRun)
+catch(const css::uno::RuntimeException)
 { throw; }
 catch(const css::uno::Exception)
 {}
commit a52f348700adec5ede76a62381f8d54cb5588da8
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 13:54:25 2012 +0200

WaE: unreachable code

diff --git a/lotuswordpro/source/filter/lwpfilter.cxx 
b/lotuswordpro/source/filter/lwpfilter.cxx
index f28493a..1f66f94 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -421,7 +421,6 @@ int ReadWordproFile(SvStream rStream, 
uno::ReferenceXDocumentHandler xHandle
 {
 return 1;
 }
-return 1;
 }
 
 void ErrorMsg(int /*iErrCode*/)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/README

2012-02-13 Thread Michael Meeks 
 sfx2/README |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 86a624ea2d0cdf8e8f549c8ac8378c8fe9aa6b53
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Feb 13 12:13:04 2012 +

sfx2's README: clarify and slightly expand

diff --git a/sfx2/README b/sfx2/README
index 948346d..367eb26 100755
--- a/sfx2/README
+++ b/sfx2/README
@@ -1,6 +1,8 @@
-This is the gui code, much of which is now deprecated.
+This is core gui code, contining base-classes for documents
 
-List of documents open would be tracked - raw C__ code.
-Gutsy core of document management and loading.
+Document load/save code is maintained in [git:sfx2/source/doc/docfile.cxx]
+SfxMedium class, which handles all the twisty load and save corner cases.
 
-[git:sfx2/source/applappl/sfxhelp.cxx] Start procedure for the online help 
viewer top level window; handling of help URL creation and dispatch.
+[git:sfx2/source/applappl/sfxhelp.cxx] Start procedure for the online
+help viewer top level window; handling of help URL creation and
+dispatch.
___
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

2012-02-13 Thread Jan Holesovsky 
 sw/source/core/layout/paintfrm.cxx |3 +
 sw/source/ui/docvw/HeaderFooterWin.cxx |   97 +++--
 sw/source/ui/docvw/PageBreakWin.cxx|   46 +++
 sw/source/ui/inc/HeaderFooterWin.hxx   |1 
 4 files changed, 70 insertions(+), 77 deletions(-)

New commits:
commit de03d27c597b1f56d5d68d1a8181e2889dc5b1cb
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Mon Feb 13 11:20:22 2012 +0100

Header/Footer, Page Break: don't show them in RO mode (fdo#45548)

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index dced1b7..f7be549 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3341,6 +3341,7 @@ void SwPageFrm::PaintBreak( ) const
 {
 if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER  
  !pGlobalShell-GetViewOptions()-IsPDFExport() 
+ !pGlobalShell-GetViewOptions()-IsReadonly() 
  !pGlobalShell-IsPreView() )
 {
 const SwFrm* pBodyFrm = Lower();
@@ -3377,6 +3378,7 @@ void SwColumnFrm::PaintBreak( ) const
 {
 if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER  
  !pGlobalShell-GetViewOptions()-IsPDFExport() 
+ !pGlobalShell-GetViewOptions()-IsReadonly() 
  !pGlobalShell-IsPreView() )
 {
 const SwFrm* pBodyFrm = Lower();
@@ -3486,6 +3488,7 @@ void SwPageFrm::PaintDecorators( ) const
 if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER 
  !pGlobalShell-GetViewOptions()-IsPDFExport() 
  !pGlobalShell-IsPreView() 
+ !pGlobalShell-GetViewOptions()-IsReadonly() 
  ( pGlobalShell-IsShowHeaderFooterSeparator( Header ) ||
pGlobalShell-IsShowHeaderFooterSeparator( Footer ) ) )
 {
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx 
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 330c1ff..32e8767 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -148,7 +148,6 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, 
const SwPageFrm* pPag
 SwFrameControl( pEditWin, pPageFrm ),
 m_sLabel( ),
 m_bIsHeader( bHeader ),
-m_bReadonly( false ),
 m_pPopupMenu( NULL ),
 m_pLine( NULL ),
 m_bIsAppearing( false ),
@@ -329,57 +328,54 @@ void SwHeaderFooterWin::Paint( const Rectangle )
 com::sun::star::lang::Locale(),
 aLineColor ) );
 
-// Create the 'plus' or 'arrow' primitive if not readonly
-if ( !m_bReadonly )
-{
-B2DRectangle aSignArea( B2DPoint( aRect.Right() - BUTTON_WIDTH, 0.0 ),
-B2DSize( aRect.Right(), aRect.getHeight() ) );
+// Create the 'plus' or 'arrow' primitive
+B2DRectangle aSignArea( B2DPoint( aRect.Right() - BUTTON_WIDTH, 0.0 ),
+B2DSize( aRect.Right(), aRect.getHeight() ) );
 
-B2DPolygon aSign;
-if ( IsEmptyHeaderFooter( ) )
-{
-// Create the + polygon
-double nLeft = aSignArea.getMinX() + TEXT_PADDING;
-double nRight = aSignArea.getMaxX() - TEXT_PADDING;
-double nHalfW = ( nRight - nLeft ) / 2.0;
-
-double nTop = aSignArea.getCenterY() - nHalfW;
-double nBottom = aSignArea.getCenterY() + nHalfW;
-
-aSign.append( B2DPoint( nLeft, aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, 
aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, nTop ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, nTop ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, 
aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( nRight, aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( nRight, aSignArea.getCenterY() + 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, 
aSignArea.getCenterY() + 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, nBottom ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, nBottom ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, 
aSignArea.getCenterY() + 1.0  ) );
-aSign.append( B2DPoint( nLeft, aSignArea.getCenterY() + 1.0  ) );
-aSign.setClosed( true );
-}
-else
-{
-// Create the v polygon
-B2DPoint aLeft( aSignArea.getMinX() + TEXT_PADDING, 
aSignArea.getCenterY() );
-B2DPoint aRight( aSignArea.getMaxX() - TEXT_PADDING, 
aSignArea.getCenterY() );
-B2DPoint aBottom( ( aLeft.getX() + aRight.getX() ) / 2.0, 
aLeft.getY() + 4.0 );
-aSign.append( aLeft );
-aSign.append( aRight );
-aSign.append( aBottom );
-

[Libreoffice-commits] .: config_host.mk.in configure.in

2012-02-13 Thread Caolán McNamara 
 config_host.mk.in |1 +
 configure.in  |8 
 2 files changed, 9 insertions(+)

New commits:
commit 013076d6a858712151766131d8a2cccdf39e7f18
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 12:32:11 2012 +

add check for xmllint

diff --git a/config_host.mk.in b/config_host.mk.in
index 23c758e..8d38959 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -514,3 +514,4 @@ export XRANDR_CFLAGS=@XRANDR_CFLAGS@
 export XRANDR_DLOPEN=@XRANDR_DLOPEN@
 export XRANDR_LIBS=@XRANDR_LIBS@
 export XSLTPROC=@XSLTPROC@
+export XMLLINT=@XMLLINT@
diff --git a/configure.in b/configure.in
index b7c8d1d..0f5ba8a 100644
--- a/configure.in
+++ b/configure.in
@@ -5828,6 +5828,13 @@ if test $with_system_libxml = yes; then
 else
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 = 2.0)
 fi
+
+dnl Check for xmllint
+AC_PATH_PROG(XMLLINT, xmllint, no)
+if test $XMLLINT = no; then
+AC_MSG_ERROR([xmllint is required])
+fi
+
 MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll
 else
 AC_MSG_RESULT([internal])
@@ -5837,6 +5844,7 @@ fi
 AC_SUBST(SYSTEM_LIBXML)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
+AC_SUBST(XMLLINT)
 
 dnl ===
 dnl Checks for Python
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Caolán McNamara 
 unusedcode.easy |1 -
 vcl/inc/vcl/settings.hxx|8 +---
 vcl/source/app/settings.cxx |6 ++
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 507a5d0eb718bcd6c294029775008e0f99d70e0f
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 13:12:41 2012 +

manual override of ATToolSupport is a windows-only feature

diff --git a/unusedcode.easy b/unusedcode.easy
index 61b121e..2382401 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -89,7 +89,6 @@ MetaCommentAction::MetaCommentAction(unsigned char const*, 
unsigned int)
 MetricBox::RemoveValue(long, FieldUnit)
 MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
 MiscSettings::SetDisablePrinting(unsigned char)
-MiscSettings::SetEnableATToolSupport(unsigned char)
 MoreButton::RemoveWindow(Window*)
 MultiLineEdit::GetHScrollBar() const
 MultiLineEdit::GetLeftMargin() const
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 2494f4f..ba961b1 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -990,12 +990,14 @@ public:
 MiscSettings( const MiscSettings rSet );
 ~MiscSettings();
 
+#ifdef WNT
 voidSetEnableATToolSupport( sal_Bool bEnable );
-sal_BoolGetEnableATToolSupport() const;
+#endif
+sal_BoolGetEnableATToolSupport() const;
 voidSetDisablePrinting( sal_Bool bEnable );
-sal_BoolGetDisablePrinting() const;
+sal_BoolGetDisablePrinting() const;
 voidSetEnableLocalizedDecimalSep( sal_Bool 
bEnable );
-sal_BoolGetEnableLocalizedDecimalSep() const;
+sal_BoolGetEnableLocalizedDecimalSep() const;
 const MiscSettings operator =( const MiscSettings rSet );
 
 sal_Booloperator ==( const MiscSettings rSet 
) const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 2a3a5ca..1502d06 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1230,8 +1230,7 @@ void MiscSettings::SetDisablePrinting( sal_Bool bEnable )
 }
 }
 
-// ---
-
+#ifdef WNT
 void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
 {
 if ( bEnable != mpData-mnEnableATT )
@@ -1240,7 +1239,6 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool 
bEnable )
 if( bEnable  !ImplInitAccessBridge(false, bDummy) )
 return;
 
-#ifdef WNT
 HKEY hkey;
 
 // If the accessibility key in the Windows registry exists, change it 
synchronously
@@ -1277,7 +1275,6 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool 
bEnable )
 RegCloseKey(hkey);
 }
 
-#endif
 vcl::SettingsConfigItem::get()-
 setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
Accessibility ) ),
   rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
EnableATToolSupport ) ),
@@ -1285,6 +1282,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool 
bEnable )
 mpData-mnEnableATT = bEnable ? 1 : 0;
 }
 }
+#endif
 
 void MiscSettings::SetEnableLocalizedDecimalSep( sal_Bool bEnable )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Caolán McNamara 
 binfilter/inc/bf_svx/unoipset.hxx |2 +-
 binfilter/inc/bf_sw/docary.hxx|   10 +-
 binfilter/inc/bf_tools/string.hxx |   15 +++
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 829fc92ccf918b81f6f6a1fa60aa7c5ac07bc172
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 12:57:48 2012 +

reduce warnings spew

diff --git a/binfilter/inc/bf_svx/unoipset.hxx 
b/binfilter/inc/bf_svx/unoipset.hxx
index aec50b2..1ec41d6 100644
--- a/binfilter/inc/bf_svx/unoipset.hxx
+++ b/binfilter/inc/bf_svx/unoipset.hxx
@@ -34,8 +34,8 @@
 
 namespace binfilter {
 struct SfxItemPropertyMap;
+struct SvxIDPropertyCombine;
 class SfxItemSet;
-class SvxIDPropertyCombine;
 class SdrItemPool;
 
 typedef ::std::vector SvxIDPropertyCombine*  SvxIDPropertyCombineList;
diff --git a/binfilter/inc/bf_sw/docary.hxx b/binfilter/inc/bf_sw/docary.hxx
index 2721aa7..2871e61 100644
--- a/binfilter/inc/bf_sw/docary.hxx
+++ b/binfilter/inc/bf_sw/docary.hxx
@@ -110,11 +110,11 @@ public:
 // Mit dem Lookahead kann die Suche eingeschraenkt werden. 0 oder
 // USHRT_MAX suchen im gesamten Array.
 
-_SwRedlineTbl::Count;
-_SwRedlineTbl::operator[];
-_SwRedlineTbl::GetObject;
-_SwRedlineTbl::Seek_Entry;
-_SwRedlineTbl::GetPos;
+using _SwRedlineTbl::Count;
+using _SwRedlineTbl::operator[];
+using _SwRedlineTbl::GetObject;
+using _SwRedlineTbl::Seek_Entry;
+using _SwRedlineTbl::GetPos;
 };
 
 typedef SwUnoCrsr* SwUnoCrsrPtr;
commit 6fd3480b596c232ad14afb9013f64e2f275ea55b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 12:57:35 2012 +

fix windows build

diff --git a/binfilter/inc/bf_tools/string.hxx 
b/binfilter/inc/bf_tools/string.hxx
index cb28021..0b4c00e 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -35,7 +35,6 @@
 #include rtl/textcvt.h
 #include rtl/string.hxx
 #include rtl/ustring.hxx
-#include tools/toolsdllapi.h
 #include tools/string.hxx
 
 // ---
@@ -107,15 +106,15 @@ typedef struct _ByteStringData
 // - ByteString -
 // --
 
-class TOOLS_DLLPUBLIC ByteString
+class ByteString
 {
 friend  class UniString;
 
 private:
 ByteStringData* mpData;
 
-TOOLS_DLLPRIVATE inline void ImplCopyData();
-TOOLS_DLLPRIVATE inline char * ImplCopyStringData(char *);
+inline void ImplCopyData();
+inline char * ImplCopyStringData(char *);
 
 ByteString( const int* pDummy ); // not implemented: 
to prevent ByteString( NULL )
 ByteString(int); // not implemented; to detect misuses
@@ -350,15 +349,15 @@ typedef struct _UniStringData
 // - UniString -
 // -
 
-class TOOLS_DLLPUBLIC UniString
+class UniString
 {
 friend  class ByteString;
 
 private:
 UniStringData*  mpData;
 
-TOOLS_DLLPRIVATE inline void ImplCopyData();
-TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
+inline void ImplCopyData();
+inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
 
 UniString( const int* pDummy );// not implemented: 
to prevent UniString( NULL )
 UniString(int); // not implemented; to detect misuses 
of
@@ -373,7 +372,7 @@ private:
   // of operator +=(sal_Unicode)
 
 //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of 
RTL_CONSTASCII_USTRINGPARAM
-TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
+UniString( const sal_Char*, sal_Int32 );
 public:
 UniString();
 UniString( const UniString rStr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/inc l10ntools/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source

2012-02-13 Thread Caolán McNamara 
 l10ntools/inc/export.hxx   |1 
 l10ntools/source/merge.cxx |   16 -
 tools/inc/tools/multisel.hxx   |2 -
 tools/source/memtools/multisel.cxx |   45 -
 unusedcode.easy|   10 
 vcl/inc/vcl/field.hxx  |3 --
 vcl/inc/vcl/metaact.hxx|3 --
 vcl/inc/vcl/morebtn.hxx|1 
 vcl/inc/vcl/msgbox.hxx |1 
 vcl/inc/vcl/settings.hxx   |1 
 vcl/source/app/settings.cxx|   14 ---
 vcl/source/control/field.cxx   |   20 
 vcl/source/control/morebtn.cxx |   17 -
 vcl/source/gdi/metaact.cxx |   19 ---
 vcl/source/window/msgbox.cxx   |8 --
 15 files changed, 161 deletions(-)

New commits:
commit 8f1270db7d871df1a6155c1e4f51568753a54b04
Author: Alexander Bergmann myadd...@gmx.de
Date:   Mon Feb 13 13:17:19 2012 +

unusedcode.easy: Removed unused code

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ff6a960..5e08239 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -463,7 +463,6 @@ class MergeDataFile
 const rtl::OString nLang, const rtl::OString rTEXT,
 const rtl::OString rQHTEXT, const rtl::OString rTITLE,
 const rtl::OString sFilename, bool bCaseSensitive);
-rtl::OString Dump();
 public:
 explicit MergeDataFile(const rtl::OString rFileName,
 const rtl::OString rFile, bool bErrLog, bool bCaseSensitive = 
false);
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 65c720a..c56bdaf 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -222,22 +222,6 @@ MergeDataFile::~MergeDataFile()
 delete aI-second;
 }
 
-rtl::OString MergeDataFile::Dump()
-{
-rtl::OString sRet(RTL_CONSTASCII_STRINGPARAM(MergeDataFile\n));
-
-printf(MergeDataFile\n);
-MergeDataHashMap::const_iterator idbg;
-for( idbg = aMap.begin() ; idbg != aMap.end(); ++idbg )
-{
-printf(aMap[ %s ] = ,idbg-first.getStr());
-idbg-second-Dump();
-printf(\n);
-}
-printf(\n);
-return sRet;
-}
-
 std::vectorrtl::OString MergeDataFile::GetLanguages()
 {
 return std::vectorrtl::OString(aLanguageSet.begin(),aLanguageSet.end());
diff --git a/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 20f1c63..8410019 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.hxx
@@ -91,7 +91,6 @@ public:
 voidSetTotalRange( const Range rTotRange );
 voidInsert( long nIndex, long nCount = 1 );
 voidRemove( long nIndex );
-voidAppend( long nCount = 1 );
 
 const RangeGetTotalRange() const { return aTotRange; }
 sal_BoolIsCurValid() const { return bCurValid; }
@@ -99,7 +98,6 @@ public:
 longFirstSelected( sal_Bool bInverse = sal_False );
 longLastSelected();
 longNextSelected();
-longPrevSelected();
 
 size_t  GetRangeCount() const { return aSels.size(); }
 const RangeGetRange( size_t nRange ) const {
diff --git a/tools/source/memtools/multisel.cxx 
b/tools/source/memtools/multisel.cxx
index 3853fe4..fd61bcb 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -521,21 +521,6 @@ void MultiSelection::Remove( long nIndex )
 
 // ---
 
-void MultiSelection::Append( long nCount )
-{
-long nPrevLast = aTotRange.Max();
-aTotRange.Max() += nCount;
-if ( bSelectNew )
-{
-nSelCount += nCount;
-aSels.push_back( new Range( nPrevLast+1, nPrevLast + nCount ) );
-if ( aSels.size()  1 )
-ImplMergeSubSelections( aSels.size() - 2, aSels.size() );
-}
-}
-
-// ---
-
 long MultiSelection::ImplFwdUnselected()
 {
 if ( !bCurValid )
@@ -637,36 +622,6 @@ long MultiSelection::NextSelected()
 
 // ---
 
-long MultiSelection::PrevSelected()
-{
-if ( !bCurValid )
-return SFX_ENDOFSELECTION;
-
-if ( bInverseCur )
-{
---nCurIndex;
-return ImplBwdUnselected();
-}
-else
-{
-// is the previous index in the current sub selection too?
-if ( nCurIndex  aSels[ nCurSubSel ]-Min() )
-return --nCurIndex;
-
-// are there previous sub selections?
-if ( nCurSubSel  0 )
-{
---nCurSubSel;
-return nCurIndex = aSels[ nCurSubSel ]-Max();
-}
-
-// we are at the beginning!
-return SFX_ENDOFSELECTION;
-}
-}
-
-// ---
-
 void

[Libreoffice-commits] .: sw/CppunitTest_sw_subsequent_rtftok.mk sw/Module_sw.mk sw/qa

2012-02-13 Thread Miklos Vajna 
 sw/CppunitTest_sw_subsequent_rtftok.mk |   83 +++
 sw/Module_sw.mk|4 
 sw/qa/extras/rtftok/data/fdo45553.rtf  |2 
 sw/qa/extras/rtftok/data/n192129.rtf   |3 
 sw/qa/extras/rtftok/rtftok.cxx |  143 +
 5 files changed, 235 insertions(+)

New commits:
commit 3cd8d8c27d7c4a13f58c4930ee14b1d862e73ea1
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Feb 11 17:06:42 2012 +0100

sw: add rtf slowcheck test that checks the resulting document model

Having it as a subsequent test in wrifterfilter would be less useful;
having it as a unit test in writerfilter is not possible, since
writerfilter does not depend on sw.

diff --git a/sw/CppunitTest_sw_subsequent_rtftok.mk 
b/sw/CppunitTest_sw_subsequent_rtftok.mk
new file mode 100644
index 000..1de0d64
--- /dev/null
+++ b/sw/CppunitTest_sw_subsequent_rtftok.mk
@@ -0,0 +1,83 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Miklos Vajna vmik...@suse.cz (SUSE, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2012 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \
+sw/qa/extras/rtftok/rtftok \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_subsequent_rtftok, \
+cppu \
+sal \
+test \
+unotest \
+vcl \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_api,sw_subsequent_rtftok,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_subsequent_rtftok))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_subsequent_rtftok,\
+types \
+))
+
+$(eval $(call gb_CppunitTest_add_components,sw_subsequent_rtftok,\
+configmgr/source/configmgr \
+fileaccess/source/fileacc \
+filter/source/config/cache/filterconfig1 \
+framework/util/fwk \
+i18npool/util/i18npool \
+package/util/package2 \
+sw/util/sw \
+sw/util/swd \
+sfx2/util/sfx \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
+unoxml/source/service/unoxml \
+   writerfilter/util/writerfilter \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_subsequent_rtftok,\
+--headless \
+--protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector \
+-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry) module:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/xml/registry/spool) xcsxcu:$(call 
gb_CppunitTarget__make_url,$(OUTDIR)/unittest/registry) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 7f48bc3..d9477e9 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -53,6 +53,10 @@ $(eval $(call gb_Module_add_check_targets,sw,\
 CppunitTest_sw_swdoc_test \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets,sw,\
+CppunitTest_sw_subsequent_rtftok \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
 JunitTest_sw_complex \
 JunitTest_sw_unoapi \
diff --git a/sw/qa/extras/rtftok/data/fdo45553.rtf 
b/sw/qa/extras/rtftok/data/fdo45553.rtf
new file mode 100644
index 000..38b9d36
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo45553.rtf
@@ -0,0 +1,2 @@
+{\rtf1 \sa240 space-after\par\pard
+\sb120 space-before\par}
diff --git a/sw/qa/extras/rtftok/data/n192129.rtf 
b/sw/qa/extras/rtftok/data/n192129.rtf
new file mode 100644
index 000..1451b36
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/n192129.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+{\pict \pngblip \picw-64 \pich-1061137057 \picwgoal0 \pichgoal0

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

2012-02-13 Thread Caolán McNamara 
 xmloff/source/text/txtparai.cxx |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 15fe1596b265aff57264145c0e69d36607cc15a5
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Feb 10 17:54:03 2012 +0100

fdo#42771: Fix crash when loading an invalid .fodt.

createTextCursorByRange() likes to throw runtime exception, even though it
just means 'we were unable to create the cursor'.

Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 3a73309..fb775a7 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2034,10 +2034,16 @@ XMLParaContext::~XMLParaContext()
 xTxtImport-InsertControlCharacter( ControlCharacter::APPEND_PARAGRAPH );
 
 // create a cursor that select the whole last paragraph
-Reference  XTextCursor  xAttrCursor(
-xTxtImport-GetText()-createTextCursorByRange( xStart ));
-if( !xAttrCursor.is() )
-return; // Robust (defect file)
+Reference  XTextCursor  xAttrCursor;
+try {
+xAttrCursor = xTxtImport-GetText()-createTextCursorByRange( xStart );
+if( !xAttrCursor.is() )
+return; // Robust (defect file)
+} catch (uno::Exception ) {
+// createTextCursorByRange() likes to throw runtime exception, even
+// though it just means 'we were unable to create the cursor'
+return;
+}
 xAttrCursor-gotoRange( xEnd, sal_True );
 
 // xml:id for RDF metadata
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Cédric Bosdonnat 
 sw/source/core/frmedt/tblsel.cxx   |2 -
 sw/source/core/inc/flowfrm.hxx |   28 ++
 sw/source/core/layout/flowfrm.cxx  |   37 ++---
 sw/source/core/layout/laycache.cxx |1 
 sw/source/core/layout/sectfrm.cxx  |   11 ---
 sw/source/core/layout/ssfrm.cxx|3 --
 sw/source/core/layout/tabfrm.cxx   |1 
 sw/source/core/text/frmform.cxx|5 +--
 sw/source/core/text/xmldump.cxx|   12 
 sw/source/filter/ww8/rtfattributeoutput.cxx|   28 --
 sw/source/filter/ww8/rtfattributeoutput.hxx|6 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   14 -
 12 files changed, 96 insertions(+), 52 deletions(-)

New commits:
commit 47ce6dc0ecb4503d87564d08d3f86fb3e01c39ac
Author: Michael Stahl mst...@redhat.com
Date:   Sun Feb 12 22:16:53 2012 +0100

fdo#41712: sw: remove superfluous flag:

This removes SwFlowFrm::bIsFollow, which is pointless duplication of
m_pPrecede; this fixes lots of assertions (probably some real problem as
well).

Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 1848a02..4d18a40 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2208,7 +2208,7 @@ void _FndBox::SetTableLines( const SwTable rTable )
 
 inline void UnsetFollow( SwFlowFrm *pTab )
 {
-pTab-bIsFollow = sal_False;
+pTab-m_pPrecede = 0;
 }
 
 void _FndBox::DelFrms( SwTable rTable )
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 99e12a1..d0aad08 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -117,7 +117,6 @@ protected:
 SwFlowFrm *m_pFollow;
 SwFlowFrm *m_pPrecede;
 
-sal_Bool bIsFollow  :1; //Ist's ein Follow
 sal_Bool bLockJoin  :1; //Join (und damit deleten) verboten wenn sal_True!
 sal_Bool bUndersized:1; // wir sind kleiner als gewuenscht
 sal_Bool bFlyLock   :1; //  Stop positioning of at-character flyframes
@@ -163,8 +162,7 @@ public:
 void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 );
 
sal_Bool   HasFollow() const{ return m_pFollow ? sal_True : 
sal_False; }
-   sal_Bool   IsFollow() const { return bIsFollow; }
-inline void   _SetIsFollow( sal_Bool bSet ) { bIsFollow = bSet; }
+   sal_Bool   IsFollow() const { return 0 != m_pPrecede; }
 const  SwFlowFrm *GetFollow() const{ return m_pFollow;   }
SwFlowFrm *GetFollow()  { return m_pFollow;   }
sal_Bool   IsAnFollow( const SwFlowFrm *pFlow ) const;
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index a7ef489..9b25c4b 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -81,7 +81,6 @@ SwFlowFrm::SwFlowFrm( SwFrm rFrm ) :
 rThis( rFrm ),
 m_pFollow( 0 ),
 m_pPrecede( 0 ),
-bIsFollow( false ),
 bLockJoin( false ),
 bUndersized( false ),
 bFlyLock( false )
diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index b04de85..d5f041d 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -924,7 +924,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
 {
 SwTxtFrm *pNew = new SwTxtFrm( ((SwTxtFrm*)rpFrm)-
 GetTxtNode(), 
rpFrm );
-pNew-_SetIsFollow( sal_True );
 pNew-ManipOfst( nOfst );
 pNew-SetFollow( ((SwTxtFrm*)rpFrm)-GetFollow() );
 ((SwTxtFrm*)rpFrm)-SetFollow( pNew );
diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index 4ff80e1..3f2ea28 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -102,15 +102,11 @@ SwSectionFrm::SwSectionFrm( SwSectionFrm rSect, sal_Bool 
bMaster ) :
 {
 SwSectionFrm* pMaster = rSect.FindMaster();
 pMaster-SetFollow( this );
-bIsFollow = sal_True;
 }
-else
-rSect.bIsFollow = sal_True;
 SetFollow( rSect );
 }
 else
 {
-bIsFollow = sal_True;
 SetFollow( rSect.GetFollow() );
 rSect.SetFollow( this );
 if( !GetFollow() )
@@ -171,7 +167,6 @@ SwSectionFrm::~SwSectionFrm()
 else if( HasFollow() )
 {
 PROTOCOL( this, PROT_SECTION, ACT_DEL_MASTER, GetFollow() )
-GetFollow()-bIsFollow = sal_False;
 }
 }
 }
@@ -218,10 +213,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove )
 // freigeben, deshalb wird die Size des

[Libreoffice-commits] .: 2 commits - l10ntools/source xmloff/source

2012-02-13 Thread Caolán McNamara 
 l10ntools/source/xmlparse.cxx  |2 -
 xmloff/source/draw/animationexport.cxx |   36 -
 xmloff/source/draw/animationimport.cxx |   14 ++--
 xmloff/source/draw/animexp.cxx |8 +++
 xmloff/source/draw/animimp.cxx |4 +--
 xmloff/source/draw/ximppage.cxx|4 +--
 xmloff/source/style/xmlnumi.cxx|4 +--
 xmloff/source/text/txtparai.cxx|4 +--
 8 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit f7b2d16b013fce20455a558dc37eb3eb79c5bc0d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 13:58:05 2012 +

WaE: keep msvc happy

diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index f44b6f4..51e38e6 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1139,7 +1139,7 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString 
rFullFileName , const rt
 
 sal_uInt64 s;
 oslFileError e = osl_getFileSize(h, s);
-void * p;
+void * p = NULL;
 if (e == osl_File_E_None) {
 e = osl_mapFile(h, p, s, 0, 0);
 }
commit 541631684027242eeb397ac6805936e8ba411055
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 13:26:31 2012 +

catched - caught

diff --git a/xmloff/source/draw/animationexport.cxx 
b/xmloff/source/draw/animationexport.cxx
index 8d893d0..9c8594b 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -554,9 +554,9 @@ AnimationsExporterImpl::AnimationsExporterImpl( 
SvXMLExport rExport, const Refe
 {
 mxExport = static_cast ::com::sun::star::document::XFilter 
*(rExport);
 }
-catch( RuntimeException )
+catch (const RuntimeException)
 {
-OSL_FAIL( xmloff::AnimationsExporterImpl::AnimationsExporterImpl(), 
RuntimeException catched! );
+OSL_FAIL( xmloff::AnimationsExporterImpl::AnimationsExporterImpl(), 
RuntimeException caught! );
 }
 
 mpSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(), 
mrExport );
@@ -688,7 +688,7 @@ void AnimationsExporterImpl::prepareTransitionNode()
 mrExport.getInterfaceToIdentifierMapper().registerReference( xInt 
);
 }
 }
-catch( Exception )
+catch (const Exception)
 {
 OSL_FAIL( xmloff::AnimationsExporterImpl::prepareNode(), Exception 
caught! );
 }
@@ -769,9 +769,9 @@ void AnimationsExporterImpl::prepareNode( const Reference 
XAnimationNode  xNo
 }
 }
 }
-catch( Exception )
+catch (const Exception)
 {
-OSL_FAIL( xmloff::AnimationsExporterImpl::prepareNode(), 
RuntimeException catched! );
+OSL_FAIL( xmloff::AnimationsExporterImpl::prepareNode(), 
RuntimeException caught! );
 }
 }
 
@@ -1016,9 +1016,9 @@ void AnimationsExporterImpl::exportNode( const Reference 
XAnimationNode  xNod
 OSL_FAIL( xmloff::AnimationsExporterImpl::exportNode(), invalid 
AnimationNodeType! );
 }
 }
-catch( RuntimeException )
+catch (const RuntimeException)
 {
-OSL_FAIL( xmloff::AnimationsExporterImpl::exportNode(), 
RuntimeException catched! );
+OSL_FAIL( xmloff::AnimationsExporterImpl::exportNode(), 
RuntimeException caught! );
 }
 
 // if something goes wrong, its always a good idea to clear the attribute 
list
@@ -1100,9 +1100,9 @@ void AnimationsExporterImpl::exportContainer( const 
Reference XTimeContainer 
 exportNode( xChildNode );
 }
 }
-catch( RuntimeException )
+catch (const RuntimeException)
 {
-OSL_FAIL( xmloff::AnimationsExporterImpl::exportContainer(), 
RuntimeException catched! );
+OSL_FAIL( xmloff::AnimationsExporterImpl::exportContainer(), 
RuntimeException caught! );
 }
 }
 
@@ -1364,7 +1364,7 @@ void AnimationsExporterImpl::exportAnimate( const 
Reference XAnimate  xAnimat
 SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, 
eElementToken, sal_True, sal_True );
 
 }
-catch( const Exception )
+catch (const Exception)
 {
 OSL_FAIL( xmloff::AnimationsExporterImpl::exportAnimate(), Exception 
cought! );
 }
@@ -1396,7 +1396,7 @@ void AnimationsExporterImpl::exportAudio( const 
Reference XAudio  xAudio )
 SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, 
XML_AUDIO, sal_True, sal_True );
 
 }
-catch( const Exception )
+catch (const Exception)
 {
 OSL_FAIL( xmloff::AnimationsExporterImpl::exportAudio(), exception 
caught! );
 }
@@ -1423,7 +1423,7 @@ void AnimationsExporterImpl::exportCommand( const 
Reference XCommand  xComman
 SvXMLElementExport aElement( mrExport, XML_NAMESPACE_ANIMATION, 
XML_COMMAND, sal_True, sal_True );
 
 }
-catch( const Exception )
+catch (const Exception)
 {
 OSL_FAIL( xmloff::AnimationsExporterImpl::exportCommand(), exception 
caught! );
 }
@@ -1445,9 +1445,9 @@ Reference

[Libreoffice-commits] .: 2 commits - svl/source sw/source

2012-02-13 Thread Caolán McNamara 
 svl/source/svdde/ddesvr.cxx  |2 +-
 sw/source/ui/uiview/viewport.cxx |4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2e92ad18466d235864df82dc2a3a729d144736c3
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 14:13:20 2012 +

fix windows build, String::GetTokenCount is gone

diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index e4fc303..916823c 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -110,7 +110,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
 }
 }
 else
-nTopics += sTopics.GetTokenCount( '\t' );
+nTopics += 
comphelper::string::getTokenCount(sTopics, '\t');
 }
 }
 }
commit 2ad3b48ce59723842d77f5eeed4fd4336c9d8362
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Feb 9 21:06:06 2012 +0400

always use the *real* visibility of the SwScrollbar

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 2591b50..0e09076 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -840,9 +840,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder rToFill, 
sal_Bool /*bInner*/ )
 else
 rToFill.Right()  = nTmp;
 }
-//#i32913# in browse mode the visibility of the horizontal scrollbar
-// depends on the content (fixed width tables may require a scrollbar)
-if ( pHScrollbar-IsVisible(pWrtShell-GetViewOptions()-getBrowseMode()) )
+if ( pHScrollbar-IsVisible(sal_True) )
 rToFill.Bottom() = nTmp;
 
 SetBorderPixel( rToFill );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-13 Thread Kohei Yoshida 
 sc/source/core/tool/callform.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit acbb997eda4702ae42b0d73134252d21745a19c3
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 09:12:55 2012 -0500

Move it down a bit, to hopefully get Norbert's Mac tinderbox to build.

diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index 949e642..4fa3d1d 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -161,8 +161,6 @@ public:
 void clear();
 };
 
-ModuleCollection aModuleCollection;
-
 const ModuleData* ModuleCollection::findByName(const rtl::OUString rName) 
const
 {
 MapType::const_iterator it = maData.find(rName);
@@ -183,6 +181,8 @@ void ModuleCollection::clear()
 maData.clear();
 }
 
+ModuleCollection aModuleCollection;
+
 }
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: smoketest/makefile.mk smoketestoo_native/makefile.mk

2012-02-13 Thread Caolán McNamara 
 smoketest/makefile.mk  |2 --
 smoketestoo_native/makefile.mk |1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d22bfbbc6712aa364f680626369ce5e61443188d
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 14:28:57 2012 +

move ABORT_ON_ASSERTION from smoketest to smoketestoo_native

diff --git a/smoketest/makefile.mk b/smoketest/makefile.mk
index 2f474b2..ef21870 100755
--- a/smoketest/makefile.mk
+++ b/smoketest/makefile.mk
@@ -30,8 +30,6 @@ TARGET = smoketest
 ENABLE_EXCEPTIONS = TRUE
 VISIBILITY_HIDDEN = TRUE
 
-ABORT_ON_ASSERTION = TRUE
-
 .INCLUDE: settings.mk
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 0e11d61..e970162 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -26,6 +26,7 @@
 PRJ = .
 PRJNAME = smoketestoo_native
 TARGET = smoketest
+ABORT_ON_ASSERTION = TRUE
 
 .INCLUDE: settings.mk
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: external/gcc3_specific

2012-02-13 Thread Fridrich Strba 
 external/gcc3_specific/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9a51a7ae7153fee17013867bd7bbaacedee1980a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Mon Feb 13 15:39:43 2012 +0100

Copy the gcc's stdlibs to solver even if not packaging them

diff --git a/external/gcc3_specific/makefile.mk 
b/external/gcc3_specific/makefile.mk
index 501acfa..b6211c4 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -6,7 +6,7 @@ TARGET=gcc3_specific
 .INCLUDE: settings.mk
 # --
 
-.IF $(SYSTEM_STDLIBS) != YES  $(COMID)==gcc3
+.IF $(COMID)==gcc3
 
 .IF $(OS)!=MACOSX  $(OS)!=IOS  $(OS)!=ANDROID  
$(OS)!=FREEBSD  $(OS)!=NETBSD  $(OS)!=OPENBSD  
$(OS)!=DRAGONFLY
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

2012-02-13 Thread Petr Mladek 
 cui/source/dialogs/about.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 516905788436c386caac8ae5288ae0619bc032d1
Author: Petr Mladek pmla...@suse.cz
Date:   Mon Feb 13 15:34:35 2012 +0100

Use Close instead of Cancel button in the about dialog

Thanks to Stefan Knorr (Astron) for hint.

diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 6cedf59..cee5330 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -131,5 +131,6 @@ ModalDialog RID_DEFAULTABOUT
 DefButton = TRUE ;
 Pos = MAP_APPFONT ( 174 , 6 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
+Text [ en-US ] = ~Close;
 };
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2012-02-13 Thread Takeshi Abe 
 basic/source/classes/propacc.cxx |3 +--
 basic/source/comp/dim.cxx|1 -
 basic/source/comp/io.cxx |   10 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit ebba94a9572b4154a4106380d949be3d83a68fa5
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Feb 13 23:39:50 2012 +0900

Replaced String by rtl::OUString

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 80b0c72..ce9c027 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -29,7 +29,6 @@
 
 #include propacc.hxx
 
-#include tools/errcode.hxx
 #include svl/svarray.hxx
 #include basic/sbstar.hxx
 #include sbunoobj.hxx
@@ -316,7 +315,7 @@ void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, 
SbxArray rPar, sal_Bool bWr
 }
 
 // Get class names of struct
-String aServiceName( 
RTL_CONSTASCII_USTRINGPARAM(stardiv.uno.beans.PropertySet) );
+::rtl::OUString aServiceName( 
RTL_CONSTASCII_USTRINGPARAM(stardiv.uno.beans.PropertySet) );
 
 Reference XInterface  xInterface = (OWeakObject*) new SbPropertyValues();
 
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 4571f9c..5263d42 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -86,7 +86,6 @@ void SbiParser::TypeDecl( SbiSymDef rDef, sal_Bool 
bAsNewAlreadyParsed )
 if( !bAsNewAlreadyParsed )
 Next();
 rDef.SetDefinedAs();
-String aType;
 SbiToken eTok = Next();
 if( !bAsNewAlreadyParsed  eTok == NEW )
 {
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 038f200..df02a4e 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -26,9 +26,6 @@
  *
  /
 
-
-
-#include tools/stream.hxx
 #include sbcomp.hxx
 #include iosys.hxx
 
@@ -127,7 +124,7 @@ void SbiParser::Line()
 aGen.Statement();
 
 KeywordSymbolInfo aInfo;
-aInfo.m_aKeywordSymbol = String( RTL_CONSTASCII_USTRINGPARAM( line ) 
);
+aInfo.m_aKeywordSymbol = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
line ) );
 aInfo.m_eSbxDataType = GetType();
 aInfo.m_eTok = SYMBOL;
 
@@ -258,8 +255,7 @@ void SbiParser::Open()
 if( Peek() == SYMBOL )
 {
 Next();
-String aLen( aSym );
-if( aLen.EqualsIgnoreCaseAscii( LEN ) )
+if( 
aSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(LEN)) )
 {
 TestToken( EQ );
 pLen = new SbiExpression( this );
@@ -289,7 +285,7 @@ void SbiParser::Name()
 aGen.Statement();
 
 KeywordSymbolInfo aInfo;
-aInfo.m_aKeywordSymbol = String( RTL_CONSTASCII_USTRINGPARAM( name ) 
);
+aInfo.m_aKeywordSymbol = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
name ) );
 aInfo.m_eSbxDataType = GetType();
 aInfo.m_eTok = SYMBOL;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 4 commits - android/qa Library_merged.mk sfx2/source solenv/gbuild

2012-02-13 Thread Tor Lillqvist 
 Library_merged.mk  |   10 --
 android/qa/sc/Makefile |3 +++
 sfx2/source/appl/appbas.cxx|   17 +
 solenv/gbuild/extensions/pre_MergedLibsList.mk |6 ++
 solenv/gbuild/platform/com_GCC_defs.mk |5 +
 5 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 71fb61b77a548ac8b0b499f7c6039e197c994842
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 15:55:46 2012 +0200

Need libfastsax.uno

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a55083c..a57ecab 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -61,6 +61,7 @@ copy-stuff:
  configmgr.uno \
  datelo \
  expwrap.uno \
+ fastsax.uno \
  fileacc \
  fontconfig \
  forlo \
commit 49675b89cc08cb065fe4dc7bd53dd9422ae4e8d4
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 13:57:42 2012 +0200

Need libdatelo

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index aa8f59f..a55083c 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -59,6 +59,7 @@ copy-stuff:
  bootstrap.uno \
  comphelpgcc3 \
  configmgr.uno \
+ datelo \
  expwrap.uno \
  fileacc \
  fontconfig \
commit 2b455134b0bc9b2632f095503b87ec90158b24b5
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Feb 9 15:22:30 2012 +0200

Need also libintrospection.uno

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 997bcf7..aa8f59f 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -77,6 +77,7 @@ copy-stuff:
  icui18nlo \
  iculelo \
  icuuclo \
+ introspection.uno \
  jvmaccessgcc3 \
  jvmfwk \
  localedata_en \
commit 7edb4c739332432b11b5d31df9dc7bba3761f4f1
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 9 22:31:30 2012 +0200

Add fw* and sfx to libmerged

diff --git a/Library_merged.mk b/Library_merged.mk
index b2e49b0..ac55cdc 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -28,14 +28,12 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
comphelper \
cppu \
cppuhelper \
-   fwe \
i18nisolang1 \
i18npaper \
sal \
salhelper \
sax \
sb \
-   sfx \
sot \
svl \
svt \
@@ -50,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
icuuc \
+   libxml2 \
zlib \
 ))
 
@@ -76,4 +75,11 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,merged,\
+objc \
+Cocoa \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 1f28ec8..8516a90 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -86,10 +86,27 @@
 #include svl/srchitem.hxx
 #include osl/socket.hxx
 
+#ifdef LIBO_MERGELIBS
+/* Avoid clash with the ones from svx/source/form/typemap.cxx */
+#define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl
+#define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl
+#define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl
+#define aSfxUInt32Item_Impl sfx2_source_appl_appbas_aSfxUInt32Item_Impl
+#define aSfxVoidItem_Impl sfx2_source_appl_appbas_aSfxVoidtem_Impl
+#endif
+
 #define SFX_TYPEMAP
 #define Selection
 #include sfxslots.hxx
 
+#ifdef LIBO_MERGELIBS
+#undef aSfxBoolItem_Impl
+#undef aSfxStringItem_Impl
+#undef aSfxUInt16Item_Impl
+#undef aSfxUInt32Item_Impl
+#undef aSfxVoidItem_Impl
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e39e6f4..ebd70a3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -36,8 +36,14 @@ gb_MERGEDLIBS := \
drawinglayer \
editeng \
filterconfig \
+   fwe \
+   fwi \
+   fwk \
+   fwl \
+   fwm \
lng \
package2 \
+   sfx \
sofficeapp \
spl \
svx \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f2bf866..80ed26c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,11 @@ gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
 gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
+ifeq ($(MERGELIBS),TRUE)
+gb_CFLAGS_COMMON += -DLIBO_MERGELIBS
+gb_CXXFLAGS_COMMON

[Libreoffice-commits] .: 2 commits - oox/source toolkit/inc toolkit/source

2012-02-13 Thread Noel Power 
 oox/source/ole/axcontrol.cxx   |1 
 toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx |1 
 toolkit/inc/toolkit/controls/dialogcontrol.hxx |4 +
 toolkit/inc/toolkit/controls/unocontrols.hxx   |   13 +++
 toolkit/source/controls/controlmodelcontainerbase.cxx  |   25 ---
 toolkit/source/controls/dialogcontrol.cxx  |   35 --
 toolkit/source/controls/unocontrols.cxx|   44 -
 7 files changed, 89 insertions(+), 34 deletions(-)

New commits:
commit 58255c47b1d540fd2493b4ed132aa7fa82da156e
Author: Noel Power noel.po...@novell.com
Date:   Mon Feb 13 14:50:09 2012 +

handle imported picture attribute from MSO Dialog ( fdo#45995 )

diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 791920d..81a1f0e 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2496,6 +2496,7 @@ void AxUserFormModel::convertProperties( PropertyMap 
rPropMap, const ControlCon
 {
 rPropMap.setProperty( PROP_Title, maCaption );
 rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
+rConv.convertAxPicture( rPropMap, maPictureData, AX_PICPOS_CENTER  );
 AxContainerModelBase::convertProperties( rPropMap, rConv );
 }
 
commit 468c588875b4858711b708bbc66e0740263bb1f3
Author: Noel Power noel.po...@novell.com
Date:   Mon Feb 13 14:19:22 2012 +

fix support for embedded images for basic Dialogs ( fdo#45992 )

diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx 
b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 9e99968..d307c2a 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -234,7 +234,6 @@ protected:
 virtual voidImplSetPosSize( ::com::sun::star::uno::Reference 
::com::sun::star::awt::XControl  rxCtrl );
 voidImplUpdateResourceResolver();
 voidImplStartListingForResourceEvents();
-::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic  
Impl_getGraphicFromURL_nothrow( const ::rtl::OUString _rURL );
 
 ControlContainerBase();
 
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx 
b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 961d449..7c9a674 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -34,6 +34,7 @@
 #include com/sun/star/awt/XDialog2.hpp
 #include com/sun/star/awt/XSimpleTabController.hpp
 #include com/sun/star/resource/XStringResourceResolver.hpp
+#include com/sun/star/graphic/XGraphicObject.hpp
 #include toolkit/helper/servicenames.hxx
 #include toolkit/helper/macros.hxx
 #include toolkit/controls/unocontrolcontainer.hxx
@@ -48,8 +49,11 @@
 class UnoControlDialogModel :   public ControlModelContainerBase
 {
 protected:
+::com::sun::star::uno::Reference 
::com::sun::star::graphic::XGraphicObject  mxGrfObj;
 ::com::sun::star::uno::Any  ImplGetDefaultValue( sal_uInt16 
nPropId ) const;
 ::cppu::IPropertyArrayHelper   SAL_CALL getInfoHelper();
+// ::cppu::OPropertySetHelper
+   void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, 
const ::com::sun::star::uno::Any rValue ) throw 
(::com::sun::star::uno::Exception);
 public:
 UnoControlDialogModel( const 
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory 
 i_factory );
 UnoControlDialogModel( const UnoControlDialogModel 
rModel );
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx 
b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 201858d..2ed2cf7 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,6 +72,19 @@
 #define UNO_NAME_GRAPHOBJ_URLPREFIX 
vnd.sun.star.GraphicObject:
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  vnd.sun.star.Package:
 
+class ImageHelper
+{
+public:
+// The routine will always attempt to return a valid XGraphic for the
+// passed _rURL, additionallly xOutGraphicObject will contain the
+// associated XGraphicObject ( if url is valid for that ) and is set
+// appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid
+// object if the rURL points to a valid object
+static ::com::sun::star::uno::Reference 
::com::sun::star::graphic::XGraphic  
getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference 
::com::sun::star::graphic::XGraphicObject  xOutGraphicObject, const 
::rtl::OUString _rURL );
+static ::com::sun::star::uno::Reference 
::com::sun::star::graphic::XGraphic  getGraphicFromURL_nothrow( const 
::rtl::OUString _rURL );
+
+};
+
 //  
 //  class UnoControlEditModel
 //  
diff --git

[Libreoffice-commits] .: Makefile

2012-02-13 Thread Michael Stahl 
 Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15a6211803a28fd88b33b89a3f13455665360ce9
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 13 15:49:21 2012 +0100

Makefile: don't build everything twice on make check

diff --git a/Makefile b/Makefile
index 815959f..30f13b0 100644
--- a/Makefile
+++ b/Makefile
@@ -442,7 +442,7 @@ check: subsequentcheck_after_build
 
 subsequentcheck_after_build: build dev-install-link
@cd smoketestoo_native  unset MAKEFLAGS  \
-   $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
+   $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile 
subsequentcheck
 
 subsequentcheck: smoketestoo_native
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Noel Power 
 sc/source/ui/inc/tpdefaults.hxx|7 -
 sc/source/ui/optdlg/tpdefaults.cxx |   49 +++--
 sc/source/ui/src/optdlg.src|6 ++--
 3 files changed, 46 insertions(+), 16 deletions(-)

New commits:
commit 0c998c462aa553f52b849a26e3ca8df077fb5622
Author: Noel Power noel.po...@novell.com
Date:   Mon Feb 13 15:20:58 2012 +

some very minor tweak(s) to Improvment-of-Custom-Sheet-Prefix-Option

a) allow blank default prefix
b) select the entire last good prefix is some illegal character used

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index ec29550..ba294c5 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -127,10 +127,12 @@ void ScTpDefaultsOptions::CheckPrefix(Edit* pEdit)
 
 OUString aSheetPrefix = pEdit-GetText();
 
-if ( !ScDocument::ValidTabName( aSheetPrefix ) )
+if ( !aSheetPrefix.isEmpty()  !ScDocument::ValidTabName( aSheetPrefix ) )
 {
-// Revert to last good Prefix
-pEdit-SetText( maOldPrefixValue );
+// Revert to last good Prefix and also select it to
+// indicate something illegal was typed
+Selection aSel( 0,  maOldPrefixValue.getLength() );
+pEdit-SetText( maOldPrefixValue, aSel );
 }
 else
 {
commit afeb347c909fa2deb37694d4b9fd6509ec305366
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date:   Thu Feb 9 15:26:27 2012 +0100

Improvment of Custom Sheet Prefix Option

diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 606d174..7369988 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -53,10 +53,12 @@ private:
 virtual ~ScTpDefaultsOptions();
 
 void CheckNumSheets();
-void CheckPrefix();
+void CheckPrefix(Edit* pEdit);
+void OnFocusPrefixInput(Edit* pEdit);
 
 DECL_LINK( NumModifiedHdl, NumericField* );
 DECL_LINK( PrefixModifiedHdl, Edit* );
+DECL_LINK( PrefixEditOnFocusHdl, Edit* );
 
 private:
 FixedLine aFLInitSpreadSheet;
@@ -65,6 +67,9 @@ private:
 FixedText aFtSheetPrefix;
 Edit  aEdSheetPrefix;
 
+// Stores old Sheet Prefix
+::rtl::OUString maOldPrefixValue;
+
 ::boost::shared_ptrScDocOptions mpOldOptions;
 ::boost::shared_ptrScDocOptions mpNewOptions;
 };
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index 8c97c83..ec29550 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -29,8 +29,6 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-#include vcl/msgbox.hxx
-
 #include tpdefaults.hxx
 #include optdlg.hrc
 #include scresid.hxx
@@ -49,9 +47,9 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet rCor
 SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreAttrs),
 aFLInitSpreadSheet ( this, ScResId( FL_INIT_SPREADSHEET ) ),
 aFtNSheets ( this, ScResId( FT_NSHEETS ) ),
-aEdNSheets( this, ScResId( ED_NSHEETS ) ),
-aFtSheetPrefix( this, ScResId( FT_SHEETPREFIX ) ),
-aEdSheetPrefix( this, ScResId( ED_SHEETPREFIX ) )
+aEdNSheets ( this, ScResId( ED_NSHEETS ) ),
+aFtSheetPrefix ( this, ScResId( FT_SHEETPREFIX ) ),
+aEdSheetPrefix ( this, ScResId( ED_SHEETPREFIX ) )
 {
 FreeResource();
 
@@ -70,9 +68,10 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet rCor
 Point aNewPoint = aEdNSheets.GetPosPixel();
 aNewPoint.X() += ( nTxtW - nCtrlW );
 aEdNSheets.SetPosPixel( aNewPoint );
-}
+   }
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 aEdSheetPrefix.SetModifyHdl( LINK(this, ScTpDefaultsOptions, 
PrefixModifiedHdl) );
+aEdSheetPrefix.SetGetFocusHdl( LINK(this, ScTpDefaultsOptions, 
PrefixEditOnFocusHdl) );
 }
 
 ScTpDefaultsOptions::~ScTpDefaultsOptions()
@@ -121,14 +120,31 @@ void ScTpDefaultsOptions::CheckNumSheets()
 aEdNSheets.SetValue(INIT_SHEETS_MIN);
 }
 
-void ScTpDefaultsOptions::CheckPrefix()
+void ScTpDefaultsOptions::CheckPrefix(Edit* pEdit)
 {
-OUString aSheetPrefix = aEdSheetPrefix.GetText();
+if (!pEdit)
+return;
+
+OUString aSheetPrefix = pEdit-GetText();
 
 if ( !ScDocument::ValidTabName( aSheetPrefix ) )
 {
- ErrorBox(this,WinBits(WB_OK|WB_DEF_OK), 
ScGlobal::GetRscString(STR_INVALIDTABNAME) ).Execute();
+// Revert to last good Prefix
+pEdit-SetText( maOldPrefixValue );
 }
+else
+{
+OnFocusPrefixInput(pEdit);
+}
+}
+
+void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit)
+{
+if (!pEdit)
+return;
+
+// Store Prefix in case we need to revert
+maOldPrefixValue = pEdit-GetText();
 }
 
 
@@ -138,10 +154,17 @@ IMPL_LINK( ScTpDefaultsOptions, NumModifiedHdl, 
NumericField*, EMPTYARG )
 return 0;
 }
 
-IMPL_LINK(

[Libreoffice-commits] .: 3 commits - sdext/source unusedcode.easy

2012-02-13 Thread Michael Meeks 
 sdext/source/pdfimport/pdfiadaptor.cxx   |   16 
 sdext/source/pdfimport/pdfiadaptor.hxx   |3 ---
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   12 
 sdext/source/pdfimport/tree/drawtreevisiting.hxx |1 -
 sdext/source/pdfimport/tree/pdfiprocessor.cxx|   10 --
 sdext/source/pdfimport/tree/pdfiprocessor.hxx|1 -
 unusedcode.easy  |3 ---
 7 files changed, 46 deletions(-)

New commits:
commit 4001370ba5900dd0a0ec04c62f5aeb347bde025a
Author: Kate Goss katherine.g...@gmail.com
Date:   Sat Feb 11 16:56:17 2012 +

Remove unused pdfi::PDFIRawAdaptor::odfConvert

diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx 
b/sdext/source/pdfimport/pdfiadaptor.cxx
index 1fc25d8..1d1a3ad 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -260,22 +260,6 @@ bool PDFIRawAdaptor::parse( const 
uno::Referenceio::XInputStream   xInput
 return bSuccess;
 }
 
-bool PDFIRawAdaptor::odfConvert( const rtl::OUString  
rURL,
- const uno::Referenceio::XOutputStream  
xOutput,
- const uno::Referencetask::XStatusIndicator 
xStatus )
-{
-XmlEmitterSharedPtr pEmitter = createOdfEmitter(xOutput);
-const bool bSuccess = parse(uno::Referenceio::XInputStream(),
-uno::Referencetask::XInteractionHandler(),
-rtl::OUString(),
-xStatus,pEmitter,rURL);
-
-// tell input stream that it is no longer needed
-xOutput-closeOutput();
-
-return bSuccess;
-}
-
 // XImportFilter
 sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence 
beans::PropertyValue rSourceData,
 const uno::Reference 
xml::sax::XDocumentHandler  rHdl,
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx 
b/sdext/source/pdfimport/pdfiadaptor.hxx
index d9d6d71..d2b2943 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -121,9 +121,6 @@ namespace pdfi
 @param xStatus
 Optional status indicator
  */
-bool odfConvert( const rtl::OUString  
rURL,
- const 
com::sun::star::uno::Referencecom::sun::star::io::XOutputStream  xOutput,
- const 
com::sun::star::uno::Referencecom::sun::star::task::XStatusIndicator xStatus 
);
 
 // XImportFilter
 virtual sal_Bool SAL_CALL importer( const 
com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue  
rSourceData,
diff --git a/unusedcode.easy b/unusedcode.easy
index 777b6e1..b28ead7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1420,7 +1420,6 @@ oox::xls::WorksheetHelper::getRow(int) const
 oox::xls::WorksheetHelper::getRows(oox::ValueRange const) const
 oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress 
const, rtl::OUString const) const
 oox::xls::Xf::hasAnyUsedFlags() const
-pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const, 
com::sun::star::uno::Referencecom::sun::star::io::XOutputStream const, 
com::sun::star::uno::Referencecom::sun::star::task::XStatusIndicator const)
 psp::GetCommandLineTokenCount(rtl::OString const)
 psp::PrinterGfx::DrawBitmap(Rectangle const, Rectangle const, 
psp::PrinterBmp const, psp::PrinterBmp const)
 psp::PrinterGfx::DrawMask(Rectangle const, Rectangle const, psp::PrinterBmp 
const, psp::PrinterColor)
commit c424b5dc32bd9313d725f3689696ff63847cf487
Author: Kate Goss katherine.g...@gmail.com
Date:   Sat Feb 11 16:44:09 2012 +

Remove unused pdfi::PDFIProcessor::sortDocument(bool)

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 2e933e5..985e5f0 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -908,16 +908,6 @@ void PDFIProcessor::endIndicator()
 m_xStatusIndicator-end();
 }
 
-void PDFIProcessor::sortDocument( bool bDeep )
-{
-for( std::list Element* ::iterator it = m_pDocument-Children.begin();
- it != m_pDocument-Children.end(); ++it )
-{
-if( dynamic_castPageElement*(*it) != NULL )
-sortElements( *it, bDeep );
-}
-}
-
 static bool lr_tb_sort( Element* pLeft, Element* pRight )
 {
 // first: top-bottom sorting
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 349a4a9..314988d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -109,7 +109,6 @@ namespace pdfi
 sal_Int32 getFontId( const FontAttributes rAttr ) const;
 
 void sortElements( Element* pElement, bool bDeep = false );
-void sortDocument(

[Libreoffice-commits] .: Makefile

2012-02-13 Thread Miklos Vajna 
 Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f689658056a3473f9698c21edb3fb14a2541d3a7
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 13 16:33:32 2012 +0100

make build a pre-req of deliver

diff --git a/Makefile b/Makefile
index 30f13b0..99cae26 100644
--- a/Makefile
+++ b/Makefile
@@ -273,7 +273,7 @@ $(1).all: bootstrap fetch
cd $(1)  unset MAKEFLAGS  \
 $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- 
-P$(GMAKE_PARALLELISM)
 
-$(1).deliver:
+$(1).deliver: $(1)
cd $(1)  $(SOLARENV)/bin/deliver.pl
 
 $(1).clean:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Radek Doulík 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d951032005eabd1beb49b3c4c47ab560143e9ae9
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Feb 9 18:34:04 2012 +0100

fdo#45249 declare support for Core SQL - Base allows user aggregate 
functions

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index d2e4927..b2afc79 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -724,7 +724,12 @@ sal_Bool DatabaseMetaData::supportsMinimumSQLGrammar(  ) 
throw (SQLException, Ru
 sal_Bool DatabaseMetaData::supportsCoreSQLGrammar(  ) throw (SQLException, 
RuntimeException)
 {
 // LEM: jdbc driver says not, although the comments in it seem old
-return sal_False;
+//  fdo#45249 Base query design won't use any aggregate function
+//  (except COUNT(*) unless we say yes, so say yes.
+//  Actually, Base assumes *also* support for aggregate functions 
collect, fusion, intersection
+//  as soon as supportsCoreSQLGrammar() returns true.
+//  Those are *not* Core SQL, though. They are in optional feature 
S271 Basic multiset support
+return sal_True;
 }
 
 sal_Bool DatabaseMetaData::supportsExtendedSQLGrammar(  ) throw (SQLException, 
RuntimeException)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2012-02-13 Thread Ivan Timofeev 
 sw/source/core/layout/paintfrm.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19d80a257b0e5c9d45985e49f33493f38c5d5f10
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Feb 13 19:34:58 2012 +0400

Header/Footer: don't show in web layout mode

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 74abd70..206bdc9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3489,6 +3489,7 @@ void SwPageFrm::PaintDecorators( ) const
  !pGlobalShell-GetViewOptions()-IsPDFExport() 
  !pGlobalShell-IsPreView() 
  !pGlobalShell-GetViewOptions()-IsReadonly() 
+ !pGlobalShell-GetViewOptions()-getBrowseMode() 
  ( pGlobalShell-IsShowHeaderFooterSeparator( Header ) ||
pGlobalShell-IsShowHeaderFooterSeparator( Footer ) ) )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Caolán McNamara 
 svx/inc/svx/sdr/overlay/overlaybitmapex.hxx |2 -
 svx/inc/svx/sdr/overlay/overlayhatchrect.hxx|1 
 svx/inc/svx/sdr/overlay/overlayline.hxx |1 
 svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx  |1 
 svx/inc/svx/sdr/overlay/overlayobjectlist.hxx   |3 -
 svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx  |1 
 svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx |2 -
 svx/inc/svx/sdr/overlay/overlaytriangle.hxx |2 -
 svx/source/sdr/overlay/overlaybitmapex.cxx  |   32 
 svx/source/sdr/overlay/overlayhatchrect.cxx |   12 ---
 svx/source/sdr/overlay/overlayline.cxx  |   12 ---
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx   |8 -
 svx/source/sdr/overlay/overlayobjectlist.cxx|   12 ---
 svx/source/sdr/overlay/overlaypolypolygon.cxx   |   12 ---
 svx/source/sdr/overlay/overlayrollingrectangle.cxx  |   24 ---
 svx/source/sdr/overlay/overlaytriangle.cxx  |   24 ---
 16 files changed, 1 insertion(+), 148 deletions(-)

New commits:
commit a092057d2b8ff8abd1172b4163979ecf799d5888
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Sun Feb 12 23:54:41 2012 +

Removed unused code.

diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx 
b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
index 1892ff2..2183cbf 100644
--- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx
@@ -61,11 +61,9 @@ namespace sdr
 virtual ~OverlayBitmapEx();
 
 const BitmapEx getBitmapEx() const { return maBitmapEx; }
-void setBitmapEx(const BitmapEx rNew);
 
 sal_uInt16 getCenterX() const { return mnCenterX; }
 sal_uInt16 getCenterY() const { return mnCenterY; }
-void setCenterXY(sal_uInt16 nNewX, sal_uInt16 nNewY);
 };
 } // end of namespace overlay
 } // end of namespace sdr
diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx 
b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
index cd1bcb4..4003214 100644
--- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx
@@ -64,7 +64,6 @@ namespace sdr
 double fRotation);
 
 const basegfx::B2DPoint getSecondPosition() const { return 
maSecondPosition; }
-void setSecondPosition(const basegfx::B2DPoint);
 
 // data read access
 double getDiscreteGrow() const { return mfDiscreteGrow; }
diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx 
b/svx/inc/svx/sdr/overlay/overlayline.hxx
index fc235b7..4777218 100644
--- a/svx/inc/svx/sdr/overlay/overlayline.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayline.hxx
@@ -54,7 +54,6 @@ namespace sdr
 
 // change second position
 const basegfx::B2DPoint getSecondPosition() const { return 
maSecondPosition; }
-void setSecondPosition(const basegfx::B2DPoint rNew);
 
 // react on stripe definition change
 virtual void stripeDefinitionHasChanged();
diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx 
b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 0d0a1a5..8264f23 100644
--- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -102,7 +102,6 @@ namespace sdr
 
 // access to RefreshWithPreRendering Flag
 bool DoRefreshWithPreRendering() const { return 
mbRefreshWithPreRendering; }
-void SetRefreshWithPreRendering(bool bNew);
 };
 } // end of namespace overlay
 } // end of namespace sdr
diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx 
b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
index 43374b9..dcc641e 100644
--- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx
@@ -59,9 +59,8 @@ namespace sdr
 // clear list, this includes deletion of all contained objects
 void clear();
 
-// append/remove objects
+// append objects
 void append(OverlayObject rOverlayObject) { 
maVector.push_back(rOverlayObject); }
-void remove(OverlayObject rOverlayObject);
 
 // access to objects
 sal_uInt32 count() const { return maVector.size(); }
diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx 
b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
index 3622e73..adf4816 100644
--- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -53,7 +53,6 @@ namespace sdr
 
 // change geometry
 basegfx::B2DPolyPolygon getPolyPolygon() const { return 
maPolyPolygon; }
-void setPolyPolygon(const basegfx::B2DPolyPolygon rNew);
 
 // react on stripe definition change
 virtual void stripeDefinitionHasChanged();
diff --git

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

2012-02-13 Thread Caolán McNamara 
 sw/source/core/layout/paintfrm.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b7c1826f1babea87835f082a86ff9209fd9e614a
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Feb 13 19:34:58 2012 +0400

Header/Footer: don't show in web layout mode
(cherry picked from commit 19d80a257b0e5c9d45985e49f33493f38c5d5f10)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index f7be549..4de8650 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3489,6 +3489,7 @@ void SwPageFrm::PaintDecorators( ) const
  !pGlobalShell-GetViewOptions()-IsPDFExport() 
  !pGlobalShell-IsPreView() 
  !pGlobalShell-GetViewOptions()-IsReadonly() 
+ !pGlobalShell-GetViewOptions()-getBrowseMode() 
  ( pGlobalShell-IsShowHeaderFooterSeparator( Header ) ||
pGlobalShell-IsShowHeaderFooterSeparator( Footer ) ) )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Library_merged.mk sfx2/source solenv/gbuild

2012-02-13 Thread Tor Lillqvist 
 Library_merged.mk  |   10 --
 sfx2/source/appl/appbas.cxx|   17 +
 solenv/gbuild/extensions/pre_MergedLibsList.mk |6 ++
 solenv/gbuild/platform/WNT_INTEL_MSC.mk|5 +
 solenv/gbuild/platform/com_GCC_defs.mk |5 +
 5 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 25f8330004409edf8007df0cc80ef540c03d18da
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Feb 9 22:31:30 2012 +0200

Add fw* and sfx to libmerged

diff --git a/Library_merged.mk b/Library_merged.mk
index 742a6fb..6d2d908 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -28,14 +28,12 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
comphelper \
cppu \
cppuhelper \
-   fwe \
i18nisolang1 \
i18npaper \
sal \
salhelper \
sax \
sb \
-   sfx \
sot \
svl \
svt \
@@ -50,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
icuuc \
+   libxml2 \
zlib \
 ))
 
@@ -77,4 +76,11 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 ))
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,merged,\
+objc \
+Cocoa \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index c16338b..5e7ac14 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -85,10 +85,27 @@
 #include svl/srchitem.hxx
 #include osl/socket.hxx
 
+#ifdef LIBO_MERGELIBS
+/* Avoid clash with the ones from svx/source/form/typemap.cxx */
+#define aSfxBoolItem_Impl sfx2_source_appl_appbas_aSfxBoolItem_Impl
+#define aSfxStringItem_Impl sfx2_source_appl_appbas_aSfxStringItem_Impl
+#define aSfxUInt16Item_Impl sfx2_source_appl_appbas_aSfxUInt16Item_Impl
+#define aSfxUInt32Item_Impl sfx2_source_appl_appbas_aSfxUInt32Item_Impl
+#define aSfxVoidItem_Impl sfx2_source_appl_appbas_aSfxVoidtem_Impl
+#endif
+
 #define SFX_TYPEMAP
 #define Selection
 #include sfxslots.hxx
 
+#ifdef LIBO_MERGELIBS
+#undef aSfxBoolItem_Impl
+#undef aSfxStringItem_Impl
+#undef aSfxUInt16Item_Impl
+#undef aSfxUInt32Item_Impl
+#undef aSfxVoidItem_Impl
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk 
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index e39e6f4..ebd70a3 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -36,8 +36,14 @@ gb_MERGEDLIBS := \
drawinglayer \
editeng \
filterconfig \
+   fwe \
+   fwi \
+   fwk \
+   fwl \
+   fwm \
lng \
package2 \
+   sfx \
sofficeapp \
spl \
svx \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index c106845..d542017 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -191,6 +191,11 @@ gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
 gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
 endif
 
+ifeq ($(MERGELIBS),TRUE)
+gb_CFLAGS += -DLIBO_MERGELIBS
+gb_CXXFLAGS += -DLIBO_MERGELIBS
+endif
+
 gb_LinkTarget_EXCEPTIONFLAGS := \
-DEXCEPTIONS_ON \
-EHa \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f2bf866..80ed26c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -107,6 +107,11 @@ gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
 gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
 endif
 
+ifeq ($(MERGELIBS),TRUE)
+gb_CFLAGS_COMMON += -DLIBO_MERGELIBS
+gb_CXXFLAGS_COMMON += -DLIBO_MERGELIBS
+endif
+
 ifeq ($(ENABLE_LTO),TRUE)
 gb_Library_LTOFLAGS := -flto
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - oox/inc oox/source unusedcode.easy xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source

2012-02-13 Thread Michael Meeks 
 oox/inc/oox/xls/addressconverter.hxx   |2 
 oox/inc/oox/xls/formulabase.hxx|4 -
 oox/inc/oox/xls/unitconverter.hxx  |2 
 oox/source/xls/addressconverter.cxx|   18 -
 oox/source/xls/formulabase.cxx |   11 ---
 oox/source/xls/unitconverter.cxx   |6 -
 unusedcode.easy|   16 -
 xmloff/inc/xmloff/txtimp.hxx   |7 --
 xmloff/source/text/txtimp.cxx  |   36 ---
 xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx |   11 ---
 xmlsecurity/source/helper/xmlsignaturehelper.cxx   |   47 ---
 xmlsecurity/source/helper/xsecctl.cxx  |   64 -
 xmlsecurity/source/helper/xsecctl.hxx  |   10 ---
 xmlsecurity/source/helper/xsecsign.cxx |   30 -
 14 files changed, 264 deletions(-)

New commits:
commit f1c162967f032fcc5e4859f67c5b614c5dd19642
Author: Elton Chung el...@layerjet.com
Date:   Mon Feb 13 15:54:26 2012 +

Remove unused code

diff --git a/oox/inc/oox/xls/addressconverter.hxx 
b/oox/inc/oox/xls/addressconverter.hxx
index ce2c876..681c2bb 100644
--- a/oox/inc/oox/xls/addressconverter.hxx
+++ b/oox/inc/oox/xls/addressconverter.hxx
@@ -178,8 +178,6 @@ class BinRangeList : public ::std::vector BinRange 
 public:
 inline explicit BinRangeList() {}
 
-BinRangegetEnclosingRange() const;
-
 voidread( SequenceInputStream rStrm );
 voidread( BiffInputStream rStrm, bool bCol16Bit = true, 
bool bRow32Bit = false );
 voidwrite( BiffOutputStream rStrm, bool bCol16Bit = true, 
bool bRow32Bit = false ) const;
diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx
index 0a3b35a..610b227 100644
--- a/oox/inc/oox/xls/formulabase.hxx
+++ b/oox/inc/oox/xls/formulabase.hxx
@@ -532,7 +532,6 @@ class FunctionParamInfoIterator
 public:
 explicitFunctionParamInfoIterator( const FunctionInfo 
rFuncInfo );
 
-const FunctionParamInfo getParamInfo() const;
 boolisCalcOnlyParam() const;
 boolisExcelOnlyParam() const;
 FunctionParamInfoIterator operator++();
@@ -555,9 +554,6 @@ public:
 explicitFunctionProvider( FilterType eFilter, BiffType eBiff, 
bool bImportFilter );
 virtual ~FunctionProvider();
 
-/** Returns the function info for an ODF function name, or 0 on error. */
-const FunctionInfo* getFuncInfoFromOdfFuncName( const ::rtl::OUString 
rFuncName ) const;
-
 /** Returns the function info for an OOXML function name, or 0 on error. */
 const FunctionInfo* getFuncInfoFromOoxFuncName( const ::rtl::OUString 
rFuncName ) const;
 
diff --git a/oox/inc/oox/xls/unitconverter.hxx 
b/oox/inc/oox/xls/unitconverter.hxx
index fe14e0f..a6ae756 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/oox/inc/oox/xls/unitconverter.hxx
@@ -94,8 +94,6 @@ public:
 /** Returns the datetime of the passed serial value, based on current 
nulldate. */
 ::com::sun::star::util::DateTime calcDateTimeFromSerial( double fSerial ) 
const;
 
-/** Returns an error string from the passed BIFF error code. */
-::rtl::OUString calcOoxErrorCode( sal_uInt8 nErrorCode ) const;
 /** Returns a BIFF error code from the passed error string. */
 sal_uInt8   calcBiffErrorCode( const ::rtl::OUString rErrorCode ) 
const;
 
diff --git a/oox/source/xls/addressconverter.cxx 
b/oox/source/xls/addressconverter.cxx
index 8a5a670..9fd9c38 100644
--- a/oox/source/xls/addressconverter.cxx
+++ b/oox/source/xls/addressconverter.cxx
@@ -181,24 +181,6 @@ void BinRange::write( BiffOutputStream rStrm, bool 
bCol16Bit, bool bRow32Bit )
 
 // 
 
-BinRange BinRangeList::getEnclosingRange() const
-{
-BinRange aRange;
-if( !empty() )
-{
-const_iterator aIt = begin(), aEnd = end();
-aRange = *aIt;
-for( ++aIt; aIt != aEnd; ++aIt )
-{
-aRange.maFirst.mnCol = ::std::min( aRange.maFirst.mnCol, 
aIt-maFirst.mnCol );
-aRange.maFirst.mnRow = ::std::min( aRange.maFirst.mnRow, 
aIt-maFirst.mnRow );
-aRange.maLast.mnCol  = ::std::max( aRange.maLast.mnCol, 
aIt-maLast.mnCol );
-aRange.maLast.mnRow  = ::std::max( aRange.maLast.mnRow, 
aIt-maLast.mnRow );
-}
-}
-return aRange;
-}
-
 void BinRangeList::read( SequenceInputStream rStrm )
 {
 sal_Int32 nCount = rStrm.readInt32();
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index e9ffa95..0b10950 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -797,12 +797,6 @@ FunctionParamInfoIterator::FunctionParamInfoIterator( 
const FunctionInfo rFuncI

[Libreoffice-commits] .: svl/source

2012-02-13 Thread Caolán McNamara 
 svl/source/svdde/ddecli.cxx |2 +-
 svl/source/svdde/ddesvr.cxx |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit acddd09bc2e635a63c3d924eec6026c5254cd576
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Feb 13 15:53:52 2012 +

WaE: NULL vs 0 with mingw

diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index fba0c25..fd7b09c 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -211,7 +211,7 @@ DdeConnection::~DdeConnection()
 {
 if( DdeUninitialize( pInst-hDdeInstCli ) )
 {
-pInst-hDdeInstCli = NULL;
+pInst-hDdeInstCli = 0;
 if( pInst-nRefCount == 0 )
 ImpDeinitInstData();
 }
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 916823c..d47a6c0 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -290,7 +290,7 @@ found:
 else
 bRes = pTopic-Put( d );
 }
-pInst-hCurConvSvr = NULL;
+pInst-hCurConvSvr = 0;
 if ( bRes )
 return (HDDEDATA)DDE_FACK;
 else
@@ -332,7 +332,7 @@ found:
 if (pItem)
 {
 pItem-IncMonitor( (long)hConv );
-pInst-hCurConvSvr = NULL;
+pInst-hCurConvSvr = 0;
 }
 }
 return (HDDEDATA)sal_True;
@@ -341,7 +341,7 @@ found:
 pItem-DecMonitor( (long)hConv );
 if( !pItem-pImpData )
 pTopic-StopAdviseLoop();
-pInst-hCurConvSvr = NULL;
+pInst-hCurConvSvr = 0;
 return (HDDEDATA)sal_True;
 
 case XTYP_EXECUTE:
@@ -359,7 +359,7 @@ found:
 else
 bRes = pTopic-Execute( aName );
 }
-pInst-hCurConvSvr = NULL;
+pInst-hCurConvSvr = 0;
 if ( bRes )
 return (HDDEDATA)DDE_FACK;
 else
@@ -513,7 +513,7 @@ DdeService::~DdeService()
 {
 if( DdeUninitialize( pInst-hDdeInstSvr ) )
 {
-pInst-hDdeInstSvr = NULL;
+pInst-hDdeInstSvr = 0;
 delete pInst-pServicesSvr;
 pInst-pServicesSvr = NULL;
 if( pInst-nRefCount == 0)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy

2012-02-13 Thread Michael Meeks 
 sc/inc/chgtrack.hxx  |3 ---
 sc/source/core/tool/chgtrack.cxx |   15 ---
 sc/source/ui/inc/output.hxx  |1 -
 sc/source/ui/view/output2.cxx|8 
 unusedcode.easy  |4 
 5 files changed, 31 deletions(-)

New commits:
commit 952b46570c175dda8b975ad3bc8ef56e747796be
Author: Elton Chung el...@layerjet.com
Date:   Sat Feb 11 00:16:26 2012 +0800

Remove unused code

diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 16b8698..1c0b664 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -377,7 +377,6 @@ public:
 ScChangeAction* GetPrev() const { return pPrev; }
 
 bool IsDeletedIn() const;
-bool IsDeleted() const;
 bool IsDeletedIn( const ScChangeAction* ) const;
 bool IsDeletedInDelType( ScChangeActionType ) const;
 void RemoveAllDeletedIn();
@@ -833,9 +832,7 @@ public:
 
 // NewCell
 bool IsMatrixOrigin() const;
-bool IsMatrixReference() const;
 // OldCell
-bool IsOldMatrixOrigin() const;
 bool IsOldMatrixReference() const;
 };
 
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 82fbd93..9a2ccb5 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -345,11 +345,6 @@ bool ScChangeAction::IsDeletedIn() const
 return GetDeletedIn() != NULL;
 }
 
-bool ScChangeAction::IsDeleted() const
-{
-return IsDeleteType() || IsDeletedIn();
-}
-
 bool ScChangeAction::IsDeletedIn( const ScChangeAction* p ) const
 {
 ScChangeActionLinkEntry* pL = GetDeletedIn();
@@ -2155,16 +2150,6 @@ bool ScChangeActionContent::IsMatrixOrigin() const
 return GetContentCellType(GetNewCell()) == SC_CACCT_MATORG;
 }
 
-bool ScChangeActionContent::IsMatrixReference() const
-{
-return GetContentCellType(GetNewCell()) == SC_CACCT_MATREF;
-}
-
-bool ScChangeActionContent::IsOldMatrixOrigin() const
-{
-return GetContentCellType(GetOldCell()) == SC_CACCT_MATORG;
-}
-
 bool ScChangeActionContent::IsOldMatrixReference() const
 {
 return GetContentCellType(GetOldCell()) == SC_CACCT_MATREF;
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index 9a81555..f9a14a7 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -123,7 +123,6 @@ private:
 void calcMargins(long rTop, long rLeft, long rBottom, long rRight, 
double nPPTX, double nPPTY) const;
 void calcPaperSize(Size rPaperSize, const Rectangle rAlignRect, 
double nPPTX, double nPPTY) const;
 void getEngineSize(ScFieldEditEngine* pEngine, long rWidth, long 
rHeight) const;
-long getEngineWidth(ScFieldEditEngine* pEngine) const;
 bool hasLineBreak() const;
 bool isHyperlinkCell() const;
 
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 82a9905..8122c94 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -2327,14 +2327,6 @@ void 
ScOutputData::DrawEditParam::getEngineSize(ScFieldEditEngine* pEngine, long
 rHeight = nEngineHeight;
 }
 
-long ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine* pEngine) 
const
-{
-if (mbBreak  meOrient != SVX_ORIENTATION_STACKED  !mbAsianVertical)
-return 0;
-else
-return static_castlong(pEngine-CalcTextWidth());
-}
-
 bool ScOutputData::DrawEditParam::hasLineBreak() const
 {
 return (mbBreak || (meOrient == SVX_ORIENTATION_STACKED) || 
mbAsianVertical);
diff --git a/unusedcode.easy b/unusedcode.easy
index 540da7c..bf8ac97 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -127,9 +127,6 @@ ScAddInDocs::Insert(ScAddInDocs const*, unsigned short, 
unsigned short)
 ScAddInDocs::Insert(ScDocument* const, unsigned short)
 ScAddInDocs::Insert(ScDocument* const*, unsigned short)
 ScAddInDocs::Remove(ScDocument* const, unsigned short)
-ScChangeAction::IsDeleted() const
-ScChangeActionContent::IsMatrixReference() const
-ScChangeActionContent::IsOldMatrixOrigin() const
 ScChangeActionContent::SetNewValue(rtl::OUString const, ScDocument*)
 ScChartListener::ScChartListener(rtl::OUString const, ScDocument*, ScRange 
const)
 ScChartListener::SetName(rtl::OUString const)
@@ -168,7 +165,6 @@ ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned 
short, unsigned char (*)(
 ScMyCellInfo::ScMyCellInfo()
 ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
 
ScNamedRangeObj::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface)
-ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
 ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
 ScRTFColTwips::Insert(unsigned long const, unsigned short)
 ScRTFColTwips::Insert(unsigned long const*, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/inc editeng/source filter/inc filter/source linguistic/source svtools/inc svtools/source sw/source unusedcode.easy vcl/inc vcl/source

2012-02-13 Thread Michael Meeks 
 editeng/inc/editeng/editview.hxx|3 ---
 editeng/source/editeng/editdoc.cxx  |8 
 editeng/source/editeng/editdoc.hxx  |1 -
 editeng/source/editeng/editview.cxx |   19 ---
 filter/inc/filter/msfilter/msdffimp.hxx |1 -
 filter/source/msfilter/msdffimp.cxx |   10 --
 linguistic/source/lngsvcmgr.cxx |   15 ---
 linguistic/source/lngsvcmgr.hxx |3 ---
 svtools/inc/svtools/ctrlbox.hxx |1 -
 svtools/inc/svtools/filectrl.hxx|1 -
 svtools/source/control/ctrlbox.cxx  |   22 --
 svtools/source/control/filectrl.cxx |9 -
 sw/source/filter/ww8/ww8par.hxx |1 -
 sw/source/filter/ww8/ww8par5.cxx|5 -
 unusedcode.easy |   10 --
 vcl/inc/vcl/metric.hxx  |1 -
 vcl/source/gdi/metric.cxx   |7 ---
 17 files changed, 117 deletions(-)

New commits:
commit abc235e73e70ffba83240759a8500a08becc9d71
Author: Elton Chung el...@layerjet.com
Date:   Mon Feb 13 16:08:52 2012 +

Remove unused code

diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index ef02fa9..7f3dd4c 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -103,7 +103,6 @@ public:
 voidShowCursor( sal_Bool bGotoCursor = sal_True, sal_Bool 
bForceVisCursor = sal_True );
 voidHideCursor();
 
-EESelectionMode GetSelectionMode() const;
 voidSetSelectionMode( EESelectionMode eMode );
 
 voidSetReadOnly( sal_Bool bReadOnly );
@@ -133,10 +132,8 @@ public:
 voidSetVisArea( const Rectangle rRec );
 const RectangleGetVisArea() const;
 
-voidSetPointer( const Pointer rPointer );
 const Pointer  GetPointer() const;
 
-voidSetCursor( const Cursor rCursor );
 Cursor* GetCursor() const;
 
 voidInsertText( const String rNew, sal_Bool bSelect = 
sal_False );
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 0161eaa..50f96a2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1169,14 +1169,6 @@ ItemList::ItemList() : CurrentItem( 0 )
 {
 }
 
-const SfxPoolItem* ItemList::FindAttrib( sal_uInt16 nWhich )
-{
-for ( size_t i = 0, n = aItemPool.size(); i  n; ++i )
-if ( aItemPool[ i ]-Which() == nWhich )
-return aItemPool[ i ];
-return NULL;
-}
-
 const SfxPoolItem* ItemList::First()
 {
 CurrentItem = 0;
diff --git a/editeng/source/editeng/editdoc.hxx 
b/editeng/source/editeng/editdoc.hxx
index 2b35c3e..32bfb24 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -187,7 +187,6 @@ private:
 
 public:
 ItemList();
-const SfxPoolItem*  FindAttrib( sal_uInt16 nWhich );
 const SfxPoolItem*  First();
 const SfxPoolItem*  Next();
 size_t  Count() { return aItemPool.size(); };
diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index ee9f749..bff5f04 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -362,25 +362,12 @@ const Rectangle EditView::GetOutputArea() const
 return pImpEditView-GetOutputArea();
 }
 
-void EditView::SetPointer( const Pointer rPointer )
-{
-DBG_CHKTHIS( EditView, 0 );
-pImpEditView-SetPointer( rPointer );
-}
-
 const Pointer EditView::GetPointer() const
 {
 DBG_CHKTHIS( EditView, 0 );
 return pImpEditView-GetPointer();
 }
 
-void EditView::SetCursor( const Cursor rCursor )
-{
-DBG_CHKTHIS( EditView, 0 );
-delete pImpEditView-pCursor;
-pImpEditView-pCursor = new Cursor( rCursor );
-}
-
 Cursor* EditView::GetCursor() const
 {
 DBG_CHKTHIS( EditView, 0 );
@@ -629,12 +616,6 @@ Point EditView::GetWindowPosTopLeft( sal_uInt16 nParagraph 
)
 return pImpEditView-GetWindowPos( aDocPos );
 }
 
-EESelectionMode EditView::GetSelectionMode() const
-{
-DBG_CHKTHIS( EditView, 0 );
-return pImpEditView-GetSelectionMode();
-}
-
 void EditView::SetSelectionMode( EESelectionMode eMode )
 {
 DBG_CHKTHIS( EditView, 0 );
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx 
b/filter/inc/filter/msfilter/msdffimp.hxx
index 88a009e..e2d6ced 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -129,7 +129,6 @@ public:
 boolGetPropertyBool( sal_uInt32 nId, bool bDefault = false ) 
const;
 /** Returns a string property. */
 ::rtl::OUString GetPropertyString( sal_uInt32 nId, SvStream rStrm ) const;
-voidSetPropertyValue( sal_uInt32 nId, sal_uInt32 nValue ) 
const;
 sal_BoolSeekToContent( sal_uInt32 nRecType, SvStream rSt ) const;
 voidMerge( DffPropSet rMasterPropSet ) const;
 void

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

2012-02-13 Thread Michael Meeks 
 oox/inc/oox/core/filterbase.hxx |8 
 oox/inc/oox/core/relations.hxx  |2 -
 oox/inc/oox/drawingml/chart/objectformatter.hxx |8 
 oox/inc/oox/drawingml/drawingmltypes.hxx|   10 --
 oox/inc/oox/dump/dumperbase.hxx |1 
 oox/inc/oox/helper/binaryinputstream.hxx|7 
 oox/inc/oox/ole/vbahelper.hxx   |7 
 oox/inc/oox/ole/vbaproject.hxx  |4 --
 oox/inc/oox/xls/addressconverter.hxx|   20 
 oox/inc/oox/xls/stylesbuffer.hxx|4 --
 oox/source/core/filterbase.cxx  |   10 --
 oox/source/core/relations.cxx   |6 ---
 oox/source/drawingml/chart/objectformatter.cxx  |   11 --
 oox/source/drawingml/diagram/diagram.cxx|   10 --
 oox/source/drawingml/diagram/diagram.hxx|1 
 oox/source/drawingml/drawingmltypes.cxx |   39 
 oox/source/dump/dumperbase.cxx  |6 ---
 oox/source/helper/binaryinputstream.cxx |5 ---
 oox/source/ole/vbahelper.cxx|   14 
 oox/source/ole/vbaproject.cxx   |   10 --
 oox/source/xls/addressconverter.cxx |8 
 oox/source/xls/stylesbuffer.cxx |   11 --
 unusedcode.easy |   17 --
 23 files changed, 219 deletions(-)

New commits:
commit 0536df54d531e2d5e45dfea52c8377701a6a1fda
Author: Elton Chung el...@layerjet.com
Date:   Mon Feb 13 16:16:34 2012 +

Remove unused code

diff --git a/oox/inc/oox/drawingml/chart/objectformatter.hxx 
b/oox/inc/oox/drawingml/chart/objectformatter.hxx
index 8c24abc..e13cef8 100644
--- a/oox/inc/oox/drawingml/chart/objectformatter.hxx
+++ b/oox/inc/oox/drawingml/chart/objectformatter.hxx
@@ -142,20 +142,12 @@ public:
 const NumberFormat rNumberFormat,
 bool bPercentFormat = false );
 
-/** Sets automatic line properties to the passed property set. */
-voidconvertAutomaticLine(
-PropertySet rPropSet,
-ObjectType eObjType,
-sal_Int32 nSeriesIdx = -1 );
-
 /** Sets automatic fill properties to the passed property set. */
 voidconvertAutomaticFill(
 PropertySet rPropSet,
 ObjectType eObjType,
 sal_Int32 nSeriesIdx = -1 );
 
-/** Returns true, if the passed shape properties have automatic line mode. 
*/
-static bool isAutomaticLine( const ModelRef Shape  rxShapeProp 
);
 /** Returns true, if the passed shape properties have automatic fill mode. 
*/
 static bool isAutomaticFill( const ModelRef Shape  rxShapeProp 
);
 
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 8debfa5..7cba7ae 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1405,7 +1405,6 @@ protected:
 voidwriteCharItem( const String rName, sal_Unicode cData 
);
 voidwriteStringItem( const String rName, const 
::rtl::OUString rData );
 voidwriteArrayItem( const String rName, const sal_uInt8* 
pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-voidwriteBoolItem( const String rName, bool bData );
 double  writeRkItem( const String rName, sal_Int32 nRk );
 voidwriteColorABGRItem( const String rName, sal_Int32 
nColor );
 voidwriteDateTimeItem( const String rName, const 
::com::sun::star::util::DateTime rDateTime );
diff --git a/oox/inc/oox/ole/vbahelper.hxx b/oox/inc/oox/ole/vbahelper.hxx
index 1f67a77..ad227aa 100644
--- a/oox/inc/oox/ole/vbahelper.hxx
+++ b/oox/inc/oox/ole/vbahelper.hxx
@@ -64,13 +64,6 @@ const sal_uInt16 VBA_ID_PROJECTVERSION  = 0x0009;
 class VbaHelper
 {
 public:
-/** Returns the full Basic script URL from a VBA module and macro name.
-The script is assumed to be in a document library. */
-static ::rtl::OUString getBasicScriptUrl(
-const ::rtl::OUString rLibraryName,
-const ::rtl::OUString rModuleName,
-const ::rtl::OUString rMacroName );
-
 /** Reads the next record from the VBA directory stream 'dir'.
 
 @param rnRecId  (out parameter) The record identifier of the new 
record.
diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx
index ca6c8ad..f4af24a 100644
--- a/oox/inc/oox/ole/vbaproject.hxx
+++ b/oox/inc/oox/ole/vbaproject.hxx
@@ -140,13 +140,9 @@ public:
 
 /** Returns true, if the document contains at least one code module. */
 boolhasModules() const;
-/** Returns true, if

[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy

2012-02-13 Thread Michael Meeks 
 canvas/inc/canvas/canvastools.hxx   |   15 ---
 canvas/source/tools/canvastools.cxx |   35 ---
 unusedcode.easy |3 ---
 3 files changed, 53 deletions(-)

New commits:
commit dac6e46f293581cba76556966f830ffeb9173596
Author: Elton Chung el...@layerjet.com
Date:   Sat Feb 11 19:42:30 2012 +0800

Remove unused code

diff --git a/canvas/inc/canvas/canvastools.hxx 
b/canvas/inc/canvas/canvastools.hxx
index 9138ea4..a1bee2d 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -183,18 +183,10 @@ namespace canvas
 setRenderStateTransform( ::com::sun::star::rendering::RenderState 
 renderState,
  const ::basegfx::B2DHomMatrix
 transform );
 
-CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState
-appendToViewState( ::com::sun::star::rendering::ViewState 
 viewState,
-   const ::basegfx::B2DHomMatrix  
 transform );
-
 CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState
 appendToRenderState( ::com::sun::star::rendering::RenderState 
 renderState,
  const ::basegfx::B2DHomMatrix
 transform );
 
-CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState
-prependToViewState( ::com::sun::star::rendering::ViewState
 viewState,
-const ::basegfx::B2DHomMatrix 
 transform );
-
 CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState
 prependToRenderState( ::com::sun::star::rendering::RenderState
 renderState,
   const ::basegfx::B2DHomMatrix   
 transform );
@@ -204,13 +196,6 @@ namespace canvas
  const 
::com::sun::star::rendering::ViewState  viewState,
  const 
::com::sun::star::rendering::RenderStaterenderState );
 
-CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState
-mergeViewAndRenderState( ::com::sun::star::rendering::ViewState   
 resultViewState,
- const 
::com::sun::star::rendering::ViewState  viewState,
- const 
::com::sun::star::rendering::RenderStaterenderState,
- const ::com::sun::star::uno::Reference
- ::com::sun::star::rendering::XCanvas 
xCanvas );
-
 
 // Matrix utilities
 // ===
diff --git a/canvas/source/tools/canvastools.cxx 
b/canvas/source/tools/canvastools.cxx
index c663d43..a089f54 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -181,15 +181,6 @@ namespace canvas
 return setRenderStateTransform( renderState, transform * 
rTransform );
 }
 
-rendering::ViewState appendToViewState( rendering::ViewState 
 viewState,
- const 
::basegfx::B2DHomMatrix rTransform )
-{
-::basegfx::B2DHomMatrix transform;
-
-getViewStateTransform( transform, viewState );
-return setViewStateTransform( viewState, transform * rTransform );
-}
-
 rendering::RenderState prependToRenderState( rendering::RenderState  
 renderState,
   const 
::basegfx::B2DHomMatrixrTransform )
 {
@@ -199,15 +190,6 @@ namespace canvas
 return setRenderStateTransform( renderState, rTransform * 
transform );
 }
 
-rendering::ViewState prependToViewState( rendering::ViewState
 viewState,
-  const 
::basegfx::B2DHomMatrixrTransform )
-{
-::basegfx::B2DHomMatrix transform;
-
-getViewStateTransform( transform, viewState );
-return setViewStateTransform( viewState, rTransform * transform );
-}
-
 ::basegfx::B2DHomMatrix mergeViewAndRenderTransform( 
::basegfx::B2DHomMatrix  combinedTransform,
   const 
rendering::ViewState   viewState,
   const 
rendering::RenderState renderState )
@@ -223,23 +205,6 @@ namespace canvas
 return combinedTransform;
 }
 
-rendering::ViewState mergeViewAndRenderState( rendering::ViewState   
 resultViewState,
-   const

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

2012-02-13 Thread Ivan Timofeev 
 oox/inc/oox/xls/unitconverter.hxx |1 -
 oox/source/xls/formulabase.cxx|3 ---
 oox/source/xls/unitconverter.cxx  |1 -
 3 files changed, 5 deletions(-)

New commits:
commit c2ad01cc22d79aeed31d97220430d9a9fd4fd2b1
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Feb 13 20:12:57 2012 +0400

remove unused fields

diff --git a/oox/inc/oox/xls/unitconverter.hxx 
b/oox/inc/oox/xls/unitconverter.hxx
index a6ae756..e3cd263 100644
--- a/oox/inc/oox/xls/unitconverter.hxx
+++ b/oox/inc/oox/xls/unitconverter.hxx
@@ -110,7 +110,6 @@ private:
 
 DoubleVectormaCoeffs;   /// Coefficients for unit 
conversion.
 OoxErrorCodeMap maOoxErrCodes;  /// Maps error code strings to 
BIFF error constants.
-BiffErrorCodeMapmaBiffErrCodes; /// Maps BIFF error constants to 
error code strings.
 sal_Int32   mnNullDate; /// Nulldate of this workbook 
(number of days since -01-01).
 };
 
diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx
index 0b10950..98925d7 100644
--- a/oox/source/xls/formulabase.cxx
+++ b/oox/source/xls/formulabase.cxx
@@ -833,7 +833,6 @@ struct FunctionProviderImpl
 typedef RefMap sal_uInt16, FunctionInfo   FuncIdMap;
 
 FunctionInfoVector  maFuncs;/// All function infos in one list.
-FuncNameMap maOdfFuncs; /// Maps ODF function names to 
function data.
 FuncNameMap maOoxFuncs; /// Maps OOXML function names to 
function data.
 FuncIdMap   maBiff12Funcs;  /// Maps BIFF12 function indexes 
to function data.
 FuncIdMap   maBiffFuncs;/// Maps BIFF2-BIFF8 function 
indexes to function data.
@@ -931,8 +930,6 @@ void FunctionProviderImpl::initFunc( const FunctionData 
rFuncData, sal_uInt8 nM
 
 // insert the function info into the member maps
 maFuncs.push_back( xFuncInfo );
-if( !xFuncInfo-maOdfFuncName.isEmpty() )
-maOdfFuncs[ xFuncInfo-maOdfFuncName ] = xFuncInfo;
 if( !xFuncInfo-maOoxFuncName.isEmpty() )
 maOoxFuncs[ xFuncInfo-maOoxFuncName ] = xFuncInfo;
 if( xFuncInfo-mnBiff12FuncId != NOID )
diff --git a/oox/source/xls/unitconverter.cxx b/oox/source/xls/unitconverter.cxx
index 2438023..636fb72 100644
--- a/oox/source/xls/unitconverter.cxx
+++ b/oox/source/xls/unitconverter.cxx
@@ -239,7 +239,6 @@ sal_uInt8 UnitConverter::calcBiffErrorCode( const OUString 
rErrorCode ) const
 void UnitConverter::addErrorCode( sal_uInt8 nErrorCode, const OUString 
rErrorCode )
 {
 maOoxErrCodes[ rErrorCode ]  = nErrorCode;
-maBiffErrCodes[ nErrorCode ] = rErrorCode;
 }
 
 double UnitConverter::getCoefficient( Unit eUnit ) const
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Radek Doulík 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |   57 
++
 1 file changed, 38 insertions(+), 19 deletions(-)

New commits:
commit 994429954aadbfce3a744391dbcd31dabf045633
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Feb 1 17:18:48 2012 +0100

postgres getColumns: skip dropped columns, make ORDINAL_POSITION consecutive

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index b2afc79..d58cdbe 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1408,6 +1408,9 @@ static bool isSystemColumn( const OUString columnName )
 // is not exported by the postgres header
 const static int PQ_VARHDRSZ = sizeof( sal_Int32 );
 
+// Oh, quelle horreur
+// LEM TODO: Need to severely rewrite that!
+// should probably just do the same as ODBC or JDBC drivers...
 static void extractPrecisionAndScale(
 sal_Int32 dataType, sal_Int32 atttypmod, sal_Int32 *precision, sal_Int32 
*scale )
 {
@@ -1511,7 +1514,6 @@ static void columnMetaData2DatabaseTypeDescription(
 {
 (void) catalog;
 // LEM TODO: review in comparison with JDBC driver
-//   OK, confirmed it does not return consecutive values in 
ORDINAL_POSITION; needs to be fixed.
 Statics statics = getStatics();
 
 // continue !
@@ -1531,7 +1533,9 @@ static void columnMetaData2DatabaseTypeDescription(
 }
 
 // ignore catalog, as a single pq connection
-// does not support multiple catalogs eitherway
+// does not support multiple catalogs anyway
+// We don't use information_schema.columns because it contains
+// only the columns the current user has any privilege over.
 
 //  1. TABLE_CAT string = table catalog (may be NULL)
 //   = not supported
@@ -1562,9 +1566,7 @@ static void columnMetaData2DatabaseTypeDescription(
 //  NULLABLE_UNKNOWN - nullability unknown
 //   = pg_attribute.attnotnull
 //  12. REMARKS string = comment describing column (may be NULL )
-//   = Don't know, there does not seem to exist something like
-//  that in postgres
-//   LEM TODO: comments exist, find how to retrieve them easily
+//   = pg_description.description
 //  13. COLUMN_DEF string = default value (may be NULL)
 //   = pg_type.typdefault
 //  14. SQL_DATA_TYPE long = unused
@@ -1592,11 +1594,10 @@ static void columnMetaData2DatabaseTypeDescription(
 pg_attribute.atttypmod,// 5
 pg_attribute.attnotnull,   // 6
 pg_type.typdefault,// 7
-pg_attribute.attnum,   // 8
-pg_type.typtype,   // 9
-pg_attrdef.adsrc,  // 10
-pg_description.description, // 11
-pg_type.typbasetype// 12
+pg_type.typtype,   // 8
+pg_attrdef.adsrc,  // 9
+pg_description.description,// 10
+pg_type.typbasetype// 11
 FROM pg_class, 
  pg_attribute LEFT JOIN pg_attrdef ON pg_attribute.attrelid = 
pg_attrdef.adrelid AND pg_attribute.attnum = pg_attrdef.adnum 
   LEFT JOIN pg_description ON 
pg_attribute.attrelid = pg_description.objoid AND 
pg_attribute.attnum=pg_description.objsubid,
@@ -1604,6 +1605,7 @@ static void columnMetaData2DatabaseTypeDescription(
 WHERE pg_attribute.attrelid = pg_class.oid 
AND pg_attribute.atttypid = pg_type.oid 
AND pg_class.relnamespace = pg_namespace.oid 
+   AND NOT pg_attribute.attisdropped 
AND pg_namespace.nspname LIKE ? 
AND pg_class.relname LIKE ? 
AND pg_attribute.attname LIKE ? 
@@ -1623,31 +1625,47 @@ static void columnMetaData2DatabaseTypeDescription(
 Reference XStatement  domainTypeStmt = m_origin-createStatement();
 columnMetaData2DatabaseTypeDescription( domainMap, rs, domainTypeStmt );
 
+unsigned int colNum;
+OUString sSchema( ASCII_STR(#invalid#) );
+OUString sTable(  ASCII_STR(#invalid#) );
+
 while( rs-next() )
 {
 OUString columnName = xRow-getString(3);
 if( m_pSettings-showSystemColumns || ! isSystemColumn( columnName ) )
 {
+OUString sNewSchema( xRow-getString(1) );
+OUString sNewTable(  xRow-getString(2) );
+if ( sNewSchema != sSchema || sNewTable != sTable )
+{
+colNum = 1;
+sSchema = sNewSchema;
+sTable = sNewTable;
+}
+else
+++colNum;
 sal_Int32 precision, scale, type;
 Sequence Any  row( 18 );

[Libreoffice-commits] .: svtools/inc

2012-02-13 Thread Michael Meeks 
 svtools/inc/svtools/ctrlbox.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d6916216c5844ff3dd8313d99e361a419a66f6c6
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Feb 13 16:51:28 2012 +

WaE: unused code thinko

diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 7143d3c..d13455f 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -560,7 +560,6 @@ public:
 virtual voidSetValue( sal_Int64 nNewValue  );
 virtual sal_Int64   GetValue( FieldUnit eOutUnit ) const;
 virtual sal_Int64   GetValue() const;
-voidSetUserValue( sal_Int64 nNewValue ) { SetUserValue( 
nNewValue, FUNIT_NONE ); }
 
 private:
 // declared as private because some compilers would generate the default 
functions
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - extensions/source tools/source

2012-02-13 Thread Lionel Elie Mamane 
 extensions/source/abpilot/typeselectionpage.cxx |   12 +---
 tools/source/rc/resmgr.cxx  |   17 ++---
 2 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit bbeb0f7a82945e8d7b98e5d5da9f69dfc5c6fabe
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Feb 13 17:53:19 2012 +0100

ResMgr::TestStack more robust

diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8d83533..8af6da3 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1012,18 +1012,29 @@ void ResMgr::TestStack( const Resource* pResObj )
 {
 osl::Guardosl::Mutex aGuard( getResMgrMutex() );
 
+int upperLimit = nCurStack;
+
+if ( upperLimit  0 )
+{
+OSL_FAIL( resource stack underrun! );
+upperLimit = aStack.size() - 1;
+}
+else if ( upperLimit =  static_castint(aStack.size()) )
+{
+OSL_FAIL( stack occupation index  allocated stack size );
+upperLimit = aStack.size() - 1;
+}
+
 if ( DbgIsResource() )
 {
-for( int i = 1; i = nCurStack; ++i )
+for( int i = 1; i = upperLimit; ++i )
 {
 if ( aStack[i].pResObj == pResObj )
 {
-#ifdef DBG_UTIL
 RscError_Impl( Resource not freed! , this,
aStack[i].pResource-GetRT(),
aStack[i].pResource-GetId(),
aStack, i-1 );
-#endif
 }
 }
 }
commit 8eb33ee13519bd3059cdb2019ef843fbb9a7fbd7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Feb 13 17:36:23 2012 +0100

fdo#43399 hidden radio button should also gets unset

diff --git a/extensions/source/abpilot/typeselectionpage.cxx 
b/extensions/source/abpilot/typeselectionpage.cxx
index 711159e..aee5219 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -110,9 +110,13 @@ namespace abp
 m_aAllTypes.push_back( ButtonItem( m_aOE, AST_OE, bWithMozilla  
!bUnx ) );
 m_aAllTypes.push_back( ButtonItem( m_aOther, AST_OTHER, true ) );
 
-bool bFirstVisible = true;
 Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, 
OnTypeSelected );
 const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
+if ( ! m_aAllTypes.empty() )
+{
+ButtonItem aItem = m_aAllTypes[0];
+aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() | WB_GROUP );
+}
 for ( ::std::vector ButtonItem ::const_iterator loop = 
m_aAllTypes.begin();
   loop != m_aAllTypes.end(); ++loop )
 {
@@ -125,12 +129,6 @@ namespace abp
 aTopLeft.Y() += aItemSize.Height() + aSpacing.Height();
 aItem.m_pItem-SetClickHdl( aTypeSelectionHandler );
 aItem.m_pItem-Show();
-
-if ( bFirstVisible )
-{
-aItem.m_pItem-SetStyle( aItem.m_pItem-GetStyle() | 
WB_GROUP );
-bFirstVisible = false;
-}
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Radek Doulík 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5bd15f28b8abd2f452773422265a7f7166812b1
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Feb 1 18:38:13 2012 +0100

pgsql getColumns: order by columns, not by their concatenation...

diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index d58cdbe..7f8249c 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1609,7 +1609,7 @@ static void columnMetaData2DatabaseTypeDescription(
AND pg_namespace.nspname LIKE ? 
AND pg_class.relname LIKE ? 
AND pg_attribute.attname LIKE ? 
-ORDER BY pg_namespace.nspname || pg_class.relname || 
pg_attribute.attnum
+ORDER BY pg_namespace.nspname, pg_class.relname, 
pg_attribute.attnum
 ) );
 
 Reference XParameters  parameters( statement, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppcanvas/source hwpfilter/source Mesa/inc np_sdk/inc sal/inc sal/osl slideshow/source svl/inc sw/inc

2012-02-13 Thread Michael Meeks 
 Mesa/inc/gl.h  |2 +-
 cppcanvas/source/mtfrenderer/textaction.cxx|5 +
 cppcanvas/source/uno/uno_mtfrenderer.cxx   |6 
--
 hwpfilter/source/grammar.cxx   |6 
++
 np_sdk/inc/npapi.h |2 +-
 np_sdk/inc/npfunctions.h   |3 +--
 np_sdk/inc/nptypes.h   |   10 
--
 sal/inc/sal/types.h|4 ++--
 sal/osl/unx/file_stat.cxx  |8 

 sal/osl/unx/process_impl.cxx   |2 +-
 sal/osl/unx/system.h   |3 ---
 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm  |6 
--
 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx |6 
--
 slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx |8 
+---
 slideshow/source/engine/slideshowimpl.cxx  |8 
+---
 svl/inc/svl/svarray.hxx|4 ++--
 sw/inc/fmtfollowtextflow.hxx   |4 
 17 files changed, 13 insertions(+), 74 deletions(-)

New commits:
commit 8963cc01f5267f3afc4e4a4ff5a65a67520f447b
Author: Alexander Bergmann myadd...@gmx.de
Date:   Thu Feb 9 13:15:27 2012 +0100

EasyHack: Removed gcc conditionals

diff --git a/Mesa/inc/gl.h b/Mesa/inc/gl.h
index b427637..4945c03 100644
--- a/Mesa/inc/gl.h
+++ b/Mesa/inc/gl.h
@@ -62,7 +62,7 @@
 #elif defined(__CYGWIN__)  defined(USE_OPENGL32) /* use native windows 
opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif defined(__GNUC__)  (__GNUC__ * 100 + __GNUC_MINOR__) = 303
+#elif defined(__GNUC__)
 #  define GLAPI __attribute__((visibility(default)))
 #  define GLAPIENTRY
 #endif /* WIN32  !CYGWIN */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx 
b/cppcanvas/source/mtfrenderer/textaction.cxx
index 71c29ca..d6da081 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -2284,12 +2284,9 @@ namespace cppcanvas
 rState ) );
 }
 }
-#if defined __GNUC__
-#if __GNUC__ == 4
-// Unreachable; to avoid bogus warning:
+#if defined(__GNUC__)
 return ActionSharedPtr();
 #endif
-#endif
 }
 }
 }
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx 
b/cppcanvas/source/uno/uno_mtfrenderer.cxx
index 596b5e7..dacaeab 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.cxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx
@@ -66,14 +66,8 @@ MtfRenderer::MtfRenderer (uno::Sequenceuno::Any const 
aArgs, uno::Referenceu
 }
 
 namespace sdecl = comphelper::service_decl;
-#if defined (__GNUC__)  (__GNUC__ == 3  __GNUC_MINOR__ = 3)
- sdecl::class_MtfRenderer, sdecl::with_argstrue  serviceImpl;
- const sdecl::ServiceDecl MtfRendererDecl(
- serviceImpl,
-#else
  const sdecl::ServiceDecl MtfRendererDecl(
  sdecl::class_MtfRenderer, sdecl::with_argstrue (),
-#endif
 com.sun.star.comp.rendering.MtfRenderer,
 com.sun.star.rendering.MtfRenderer );
 
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 2afc1d8..2285aab 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -539,11 +539,9 @@ int yydebug;/*  nonzero means print parse 
trace */
definitions require.  With GCC, __builtin_memcpy takes an arg
of type size_t, but it can handle unsigned int.  */
 
-#if defined __GNUC__
-#if __GNUC__  1/* GNU C and GNU C++ define this.  */
+#if defined(__GNUC__)
 #define __yy_memcpy(TO,FROM,COUNT)  __builtin_memcpy(TO,FROM,COUNT)
-#endif
-#else   /* not GNU C or C++ */
+#else
 #ifndef __cplusplus
 
 /* This is the most reliable way to avoid incompatibilities
diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h
index d67dcd3..7db9981 100644
--- a/np_sdk/inc/npapi.h
+++ b/np_sdk/inc/npapi.h
@@ -310,7 +310,7 @@ typedef enum {
  *   gcc 3.x generated vtables on UNIX and OSX are incompatible with
  *   previous compilers.
  */
-#if (defined(XP_UNIX)  defined(__GNUC__)  (__GNUC__ = 3))
+#if defined(XP_UNIX)  defined(__GNUC__)
 #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK
 #else
 #define _NP_ABI_MIXIN_FOR_GCC3 0
diff --git a/np_sdk/inc/npfunctions.h b/np_sdk/inc/npfunctions.h
index abc1473..90faa3c 100644
--- a/np_sdk/inc/npfunctions.h
+++ b/np_sdk/inc/npfunctions.h
@@ -247,8 +247,7 @@ typedef OSErr 
(*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32);
 #endif
 
 #if defined(XP_UNIX)
-/* GCC 3.3 and later support the visibility attribute. */
-#if defined(__GNUC__)  ((__GNUC__ = 4) || (__GNUC__ == 3

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

2012-02-13 Thread Cédric Bosdonnat 
 sw/source/core/frmedt/tblsel.cxx   |2 -
 sw/source/core/inc/flowfrm.hxx |   28 +--
 sw/source/core/layout/flowfrm.cxx  |   38 +
 sw/source/core/layout/laycache.cxx |1 
 sw/source/core/layout/sectfrm.cxx  |   11 --
 sw/source/core/layout/ssfrm.cxx|3 --
 sw/source/core/layout/tabfrm.cxx   |1 
 sw/source/core/text/frmform.cxx|5 +---
 sw/source/core/text/xmldump.cxx|   12 +--
 9 files changed, 54 insertions(+), 47 deletions(-)

New commits:
commit 4c36086e3a8b546d906e0dd9f0472abd7013852e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 13 18:36:28 2012 +0100

fdo#41712: sw: remove superfluous flag:

This removes SwFlowFrm::bIsFollow, which is pointless duplication of
m_pPrecede; this fixes lots of assertions (probably some real problem as
well).

Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 34fd69d..4397073 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2250,7 +2250,7 @@ void _FndBox::SetTableLines( const SwTable rTable )
 
 inline void UnsetFollow( SwFlowFrm *pTab )
 {
-pTab-bIsFollow = sal_False;
+pTab-m_pPrecede = 0;
 }
 
 void _FndBox::DelFrms( SwTable rTable )
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 9617988..8facb39 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -117,7 +117,6 @@ protected:
 SwFlowFrm *m_pFollow;
 SwFlowFrm *m_pPrecede;
 
-sal_Bool bIsFollow :1; //Ist's ein Follow
 sal_Bool bLockJoin :1; //Join (und damit deleten) verboten wenn 
sal_True!
 sal_Bool bUndersized:1; // wir sind kleiner als gewuenscht
 sal_Bool bFtnAtEnd :1; // For sectionfrms only: footnotes at the end of 
section
@@ -168,8 +167,7 @@ public:
 void MoveSubTree( SwLayoutFrm* pParent, SwFrm* pSibling = 0 );
 
sal_Bool  HasFollow() const{ return m_pFollow ? sal_True : 
sal_False; }
-   sal_Bool  IsFollow() const { return bIsFollow; }
-inline void  _SetIsFollow( sal_Bool bSet ) { bIsFollow = 
bSet; }
+   sal_Bool  IsFollow() const { return 0 != 
m_pPrecede; }
 const  SwFlowFrm *GetFollow() const   { return m_pFollow;   }
SwFlowFrm *GetFollow() { return m_pFollow;   }
sal_Bool  IsAnFollow( const SwFlowFrm *pFlow ) const;
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index c5e083f..5b4a588 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -84,7 +84,7 @@ SwFlowFrm::SwFlowFrm( SwFrm rFrm ) :
 m_pFollow( 0 ),
 m_pPrecede( 0 )
 {
-bLockJoin = bIsFollow = bCntntLock = bOwnFtnNum =
+bLockJoin = bCntntLock = bOwnFtnNum =
 bFtnLock = bFlyLock = sal_False;
 }
 
diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 850e38b..61b40ce 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -934,7 +934,6 @@ sal_Bool SwLayHelper::CheckInsert( sal_uLong nNodeIndex )
 {
 SwTxtFrm *pNew = new SwTxtFrm( ((SwTxtFrm*)rpFrm)-
 GetTxtNode(), 
rpFrm );
-pNew-_SetIsFollow( sal_True );
 pNew-ManipOfst( nOfst );
 pNew-SetFollow( ((SwTxtFrm*)rpFrm)-GetFollow() );
 ((SwTxtFrm*)rpFrm)-SetFollow( pNew );
diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index eee5a68..60e6d2d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -102,15 +102,11 @@ SwSectionFrm::SwSectionFrm( SwSectionFrm rSect, sal_Bool 
bMaster ) :
 {
 SwSectionFrm* pMaster = rSect.FindMaster();
 pMaster-SetFollow( this );
-bIsFollow = sal_True;
 }
-else
-rSect.bIsFollow = sal_True;
 SetFollow( rSect );
 }
 else
 {
-bIsFollow = sal_True;
 SetFollow( rSect.GetFollow() );
 rSect.SetFollow( this );
 if( !GetFollow() )
@@ -171,7 +167,6 @@ SwSectionFrm::~SwSectionFrm()
 else if( HasFollow() )
 {
 PROTOCOL( this, PROT_SECTION, ACT_DEL_MASTER, GetFollow() )
-GetFollow()-bIsFollow = sal_False;
 }
 }
 }
@@ -219,10 +214,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove )
 // freigeben, deshalb wird die Size des Masters invalidiert.
 if( !GetFollow()  !pMaster-IsColLocked() )
 pMaster-InvalidateSize();
-bIsFollow = sal_False;
 }
-else if( HasFollow() )
-

[Libreoffice-commits] .: writerfilter/source

2012-02-13 Thread Miklos Vajna 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   27 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |6 +++--
 2 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit d7baacd81bbcfaa35b7fbf9981fa3fa7c9fb1cb4
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 13 18:42:56 2012 +0100

fdo#45543 fix RTF import of ms932-encoded characters

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bd02037..4c39947 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -297,7 +297,8 @@ 
RTFDocumentImpl::RTFDocumentImpl(uno::Referenceuno::XComponentContext const x
 m_bWasInFrame(false),
 m_bIsInFrame(false),
 m_bHasPage(false),
-m_aUnicodeBuffer()
+m_aUnicodeBuffer(),
+m_aHexBuffer()
 {
 OSL_ASSERT(xInputStream.is());
 m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, 
sal_True));
@@ -727,6 +728,9 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 
 int RTFDocumentImpl::resolveChars(char ch)
 {
+if (m_aStates.top().nInternalState != INTERNAL_HEX)
+checkUnicode(false, true);
+
 OStringBuffer aBuf;
 
 bool bUnicodeChecked = false;
@@ -738,7 +742,7 @@ int RTFDocumentImpl::resolveChars(char ch)
 {
 if (!bUnicodeChecked)
 {
-checkUnicode();
+checkUnicode(true, false);
 bUnicodeChecked = true;
 }
 aBuf.append(ch);
@@ -753,6 +757,13 @@ int RTFDocumentImpl::resolveChars(char ch)
 }
 if (m_aStates.top().nInternalState != INTERNAL_HEX  !Strm().IsEof())
 Strm().SeekRel(-1);
+
+if (m_aStates.top().nInternalState == INTERNAL_HEX)
+{
+m_aHexBuffer.append(ch);
+return 0;
+}
+
 if (m_aStates.top().nDestinationState == DESTINATION_SKIP)
 return 0;
 OString aStr = aBuf.makeStringAndClear();
@@ -1980,8 +1991,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 
 int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 {
-if (nKeyword != RTF_U)
-checkUnicode();
+checkUnicode(nKeyword != RTF_U, true);
 RTFSkipDestination aSkip(*this);
 int nSprm = 0;
 RTFValue::Pointer_t pIntValue(new RTFValue(nParam));
@@ -3290,13 +3300,18 @@ void RTFDocumentImpl::setSkipUnknown(bool bSkipUnknown)
 m_bSkipUnknown = bSkipUnknown;
 }
 
-void RTFDocumentImpl::checkUnicode()
+void RTFDocumentImpl::checkUnicode(bool bUnicode, bool bHex)
 {
-if (m_aUnicodeBuffer.getLength()  0)
+if (bUnicode  m_aUnicodeBuffer.getLength()  0)
 {
 OUString aString = m_aUnicodeBuffer.makeStringAndClear();
 text(aString);
 }
+if (bHex  m_aHexBuffer.getLength()  0)
+{
+OUString aString = 
OStringToOUString(m_aHexBuffer.makeStringAndClear(), 
m_aStates.top().nCurrentEncoding);
+text(aString);
+}
 }
 
 RTFParserState::RTFParserState()
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 90ecc98..6242973 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -352,8 +352,8 @@ namespace writerfilter {
 void replayBuffer(RTFBuffer_t rBuffer);
 /// If we got tokens indicating we're in a frame.
 bool inFrame();
-/// If we have some unicode characters to send.
-void checkUnicode();
+/// If we have some unicode or hex characters to send.
+void checkUnicode(bool bUnicode = true, bool bHex = true);
 
 uno::Referenceuno::XComponentContext const m_xContext;
 uno::Referenceio::XInputStream const m_xInputStream;
@@ -442,6 +442,8 @@ namespace writerfilter {
 bool m_bHasPage;
 // Unicode characters are collected here so we don't have to 
send them one by one.
 rtl::OUStringBuffer m_aUnicodeBuffer;
+/// Same for hex characters.
+rtl::OStringBuffer m_aHexBuffer;
 };
 } // namespace rtftok
 } // namespace writerfilter
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-13 Thread Ivan Timofeev 
 sc/source/core/data/cell.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ee38b167c86c8f96aa41dca861cae327c6df5915
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 12:26:50 2012 -0500

fdo#45916: Ensure formula cell's pCode isn't NULL even when compilation 
fails.

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 2f3df26..b74f08e 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -777,6 +777,9 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress rPos,
 aPos( rPos )
 {
 Compile( rFormula, true, eGrammar );// bNoListening, Insert does that
+if (!pCode)
+// We need to have a non-NULL token array instance at all times.
+pCode = new ScTokenArray;
 }
 
 // Wird von den Importfiltern verwendet
___
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

2012-02-13 Thread Ivan Timofeev 
 sc/source/core/data/cell.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 202019a7671ff9f4f1431513cd606a6bf1bcddef
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 12:26:50 2012 -0500

fdo#45916: Ensure formula cell's pCode isn't NULL even when compilation 
fails.

Signed-off-by: Ivan Timofeev timofeev@gmail.com

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 155f4bd..8ddc540 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -782,6 +782,9 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const 
ScAddress rPos,
 aPos( rPos )
 {
 Compile( rFormula, true, eGrammar );// bNoListening, Insert does that
+if (!pCode)
+// We need to have a non-NULL token array instance at all times.
+pCode = new ScTokenArray;
 }
 
 // Wird von den Importfiltern verwendet
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] calc/xls-import

2012-02-13 Thread Kohei Yoshida 
 calc/xls-import/pivot-layout-field-non-default.xls |binary
 1 file changed

New commits:
commit 25b17ec853e6226b834e437694ec4b3796c8a928
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 13:43:24 2012 -0500

New document with pivot table with layout column at non-default position.

The layout column appears when there is more than one data field, and it
is at the last row position by default.  You can drag this to non-default
position (both in Excel and in Calc), but Calc currently doesn't import
such table well.

diff --git a/calc/xls-import/pivot-layout-field-non-default.xls 
b/calc/xls-import/pivot-layout-field-non-default.xls
new file mode 100644
index 000..ebcd852
Binary files /dev/null and b/calc/xls-import/pivot-layout-field-non-default.xls 
differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-13 Thread Ivan Timofeev 
 sc/source/core/data/cell.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bf789d4a40711b7b04b969e3330373a2f947b994
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Feb 13 22:46:38 2012 +0400

make the return statement more visible

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index b74f08e..74e9330 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1056,7 +1056,8 @@ void ScFormulaCell::GetResultDimensions( SCSIZE rCols, 
SCSIZE rRows )
 void ScFormulaCell::Compile( const String rFormula, bool bNoListening,
 const FormulaGrammar::Grammar eGrammar )
 {
-if ( pDocument-IsClipOrUndo() ) return;
+if ( pDocument-IsClipOrUndo() )
+return;
 bool bWasInFormulaTree = pDocument-IsInFormulaTree( this );
 if ( bWasInFormulaTree )
 pDocument-RemoveFromFormulaTree( this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - android/qa sal/Library_sal.mk sal/Module_sal.mk sal/textenc

2012-02-13 Thread Tor Lillqvist 
 android/qa/sc/Makefile  |2 +-
 sal/Library_sal.mk  |   17 +
 sal/Module_sal.mk   |3 ++-
 sal/textenc/textenc.cxx |2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 6de864ee19f8e1465d43fc6325403f6bdcaa3bc9
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 21:35:57 2012 +0200

Need libtextinstream.uno

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 22318f0..0a6a5e8 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -100,6 +100,7 @@ copy-stuff:
  store \
  svllo \
  svtlo \
+ textinstream.uno \
  test \
  tklo \
  tllo \
commit 4866737a489d66fc2dc2153641390b609e1d5905
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 21:34:13 2012 +0200

Don't bother with a separate libsal_textenc when merging libs

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 6899483..22318f0 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,7 +91,6 @@ copy-stuff:
  ooxlo \
  reflection.uno \
  reg \
- sal_textenc \
  saxlo \
  sclo \
  scfiltlo \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cbdbc82..13a514f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -132,6 +132,23 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
 ))
 
+ifeq ($(MERGELIBS),TRUE)
+$(eval $(call gb_Library_add_exception_objects,sal,\
+   sal/textenc/context \
+   sal/textenc/convertbig5hkscs \
+   sal/textenc/converteuctw \
+   sal/textenc/convertgb18030 \
+   sal/textenc/convertiso2022cn \
+   sal/textenc/convertiso2022jp \
+   sal/textenc/convertiso2022kr \
+   sal/textenc/convertsinglebytetobmpunicode \
+   sal/textenc/tables \
+   sal/textenc/tcvtbyte \
+   sal/textenc/tcvtmb \
+   sal/textenc/tcvtutf7 \
+))
+endif
+
 ifeq ($(GUI),UNX)
 $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/conditn \
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 1260afd..c29ceac 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
Library_sal \
-   Library_sal_textenc \
+   $(if $(filter TRUE,$(MERGELIBS)),, \
+   Library_sal_textenc) \
$(if $(filter $(OS),WNT), \
Library_uwinapi) \
Package_inc \
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index 8d34920..b668492 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -364,7 +364,7 @@ static ImplTextEncodingData const 
aImplJavaUtf8TextEncodingData
 
 namespace {
 
-#if defined IOS
+#if defined IOS || defined LIBO_MERGELIBS
 
 extern C ImplTextEncodingData const * sal_getFullTextEncodingData(
 rtl_TextEncoding); // from tables.cxx in sal_textenc library
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - android/qa

2012-02-13 Thread Tor Lillqvist 
 android/qa/desktop/Makefile |4 
 android/qa/sc/Makefile  |4 
 2 files changed, 8 deletions(-)

New commits:
commit 5f1055eacd2517bad5b471e5c1eca47f9afb2b83
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Mon Feb 13 21:39:33 2012 +0200

Forgot to drop the merged fw* and sfx libs from here

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c9f4c61..b02ebd0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -120,9 +120,6 @@ copy-stuff: buildrcs
  forlo \
  foruilo \
  freetype \
- fwelo \
- fwilo \
- fwklo \
  fsstorage.uno \
  gcc3_uno \
  i18nisolang1gcc3 \
@@ -149,7 +146,6 @@ copy-stuff: buildrcs
  saxlo \
  sclo \
  scfiltlo \
- sfxlo \
  sotlo \
  stocservices.uno \
  store \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 0a6a5e8..054ba79 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -67,9 +67,6 @@ copy-stuff:
  forlo \
  foruilo \
  freetype \
- fwelo \
- fwilo \
- fwklo \
  gcc3_uno \
  i18nisolang1gcc3 \
  i18npaperlo \
@@ -94,7 +91,6 @@ copy-stuff:
  saxlo \
  sclo \
  scfiltlo \
- sfxlo \
  sotlo \
  stocservices.uno \
  store \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: icon-themes/galaxy

2012-02-13 Thread Andras Timar 
 icon-themes/galaxy/res/baswatr.png |binary
 1 file changed

New commits:
commit 7c3fab1be983241c61df2c871556ba3e7e35dec6
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 13 21:19:36 2012 +0100

better Galaxy icon for Remove Watchpoint in Basic IDE

diff --git a/icon-themes/galaxy/res/baswatr.png 
b/icon-themes/galaxy/res/baswatr.png
index c350fa8..cf4015d 100644
Binary files a/icon-themes/galaxy/res/baswatr.png and 
b/icon-themes/galaxy/res/baswatr.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/inc l10ntools/prj l10ntools/scripts l10ntools/source

2012-02-13 Thread Stephan Bergmann 
 l10ntools/inc/helpmerge.hxx|2 
 l10ntools/inc/xmlparse.hxx |3 
 l10ntools/prj/build.lst|2 
 l10ntools/scripts/propex   |4 -
 l10ntools/source/export.cxx|  126 ++-
 l10ntools/source/export2.cxx   |1 
 l10ntools/source/helper.hxx|   12 +++
 l10ntools/source/helpmerge.cxx |  163 +
 l10ntools/source/makefile.mk   |5 -
 l10ntools/source/srclex.l  |3 
 l10ntools/source/xmlparse.cxx  |5 -
 l10ntools/source/xrmmerge.cxx  |   62 ++-
 12 files changed, 139 insertions(+), 249 deletions(-)

New commits:
commit 2fce337212044d3d3a552c675fffe9bdc137eef9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 13 21:46:50 2012 +0100

l10ntools now only depends on sal and externals

Still room for further improvement.
Includes some fixes for regressions introduced with previous commits.

diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 6a34746..23523c7 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -70,8 +70,6 @@ public:
 , const std::vectorrtl::OString aLanguages , MergeDataFile 
aMergeDataFile , bool bCreateDir );
 
 private:
-static rtl::OString makeAbsolutePath(const rtl::OString sHelpFile , const 
rtl::OString rRoot_in);
-
 rtl::OString GetOutpath( const rtl::OString rPathX , const rtl::OString 
sCur , const rtl::OString rPathY );
 bool MergeSingleFile( XMLFile* file , MergeDataFile aMergeDataFile , 
const rtl::OString sLanguage , rtl::OString const  sPath );
 
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index af6b6d8..cd9bc2b 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -222,7 +222,6 @@ public:
 /// returns file name
 rtl::OUString GetName() { return sFileName; }
 void  SetName( const rtl::OUString rFilename ) { sFileName = 
rFilename; }
-void  SetFullName( const rtl::OUString rFullFilename ) { 
sFullName = rFullFilename; }
 const std::vectorrtl::OString getOrder(){ return order; }
 
 protected:
@@ -233,7 +232,6 @@ protected:
 
 // DATA
 rtl::OUString  sFileName;
-rtl::OUString  sFullName;
 
 const rtl::OString ID, OLDREF, XML_LANG;
 
@@ -487,7 +485,6 @@ public:
 
 /// parse a file, returns NULL on criticall errors
 XMLFile *Execute(
-const rtl::OUString rFullFileName,
 const rtl::OUString rFileName,// the file name
 XMLFile *pXMLFileIn // the XMLFile
 );
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
index 3cce7a3..ed919a5 100644
--- a/l10ntools/prj/build.lst
+++ b/l10ntools/prj/build.lst
@@ -1,4 +1,4 @@
-tr l10ntools   :   tools LIBXSLT:libxslt BERKELEYDB:berkeleydb 
LUCENE:lucene NULL
+tr l10ntools : BERKELEYDB:berkeleydb EXPAT:expat LIBXSLT:libxslt LUCENE:lucene 
sal NULL
 tr l10ntools   usr1-   
all tr_mkout NULL
 tr l10ntools\inc   nmake   -   all 
tr_inc NULL
 tr l10ntools\sourcenmake   -   
all tr_src tr_inc NULL
diff --git a/l10ntools/scripts/propex b/l10ntools/scripts/propex
index d7135cf..6a402a2 100755
--- a/l10ntools/scripts/propex
+++ b/l10ntools/scripts/propex
@@ -32,6 +32,7 @@ eval 'exec perl -S $0 ${1+$@}'
 #
 
 use strict;
+use File::Basename;
 use Getopt::Std;
 use Cwd;
 
@@ -40,7 +41,8 @@ getopts(ep:r:i:o:l:, \%options);
 
 unless ( $options{i} =~ m/en_US/ ) {exit 0;}
 
-my $file = substr ( Cwd::abs_path($options{i}), 
length(Cwd::abs_path($options{r})) + 1 );
+my ($unsued1, $dir, $unused2) = File::Basename::fileparse($options{i});
+my $file = substr ( Cwd::abs_path($options{i}), length(Cwd::abs_path($dir . 
$options{r})) + 1 );
 $file =~ s|/|\\|g;
 
 open (INFILE, $options{i}) || die propex: cannot open input file: 
$options{i};
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 746785a..c57591b 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -31,8 +31,6 @@
 #include cstddef
 #include cstring
 
-#include comphelper/string.hxx
-
 #include boost/scoped_ptr.hpp
 #include stdio.h
 #include stdlib.h
@@ -46,9 +44,6 @@
 extern C { int yyerror( const char * ); }
 extern C { int YYWarning( const char * ); }
 
-using comphelper::string::getToken;
-using comphelper::string::getTokenCount;
-
 namespace {
 
 rtl::OString sActFileName; //TODO
@@ -166,6 +161,8 @@ int Parse( int nTyp, const char *pTokenText ){
 }
 void Close(){
 global::exporter-pParseQueue-Close();
+global::exporter.reset();
+// avoid nontrivial Export dtor being executed during exit
 }
 
 int WorkOnTokenSet( int nTyp, char *pTokenText )
@@ -639,8 +636,9 @@ int Export::Execute( int nToken, const char * pToken )
 nListIndex = 0;
 nListLevel = 0;
 }
-

[Libreoffice-commits] .: sw/qa

2012-02-13 Thread Miklos Vajna 
 sw/qa/extras/rtftok/data/fdo45543.rtf |8 
 sw/qa/extras/rtftok/rtftok.cxx|   23 +++
 2 files changed, 31 insertions(+)

New commits:
commit c26d9befbab1f60b5b8c191c883569eae3d08c2d
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Feb 13 21:54:18 2012 +0100

testcase for fdo#45543

diff --git a/sw/qa/extras/rtftok/data/fdo45543.rtf 
b/sw/qa/extras/rtftok/data/fdo45543.rtf
new file mode 100644
index 000..43a8c89
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo45543.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+{\fonttbl
+{\fdbminor\f31505\fbidi \froman\fcharset128\fprq1\'82\'6c\'82\'72 
\'96\'be\'92\'a9;}
+}
+\pard\plain
+\f31505 \'82\'b1\'82\'cc\'95\'b6\'8f\'91\'82\'cd
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 2c2252e..df2966f 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -49,11 +49,13 @@ public:
 virtual void tearDown();
 void testFdo45553();
 void testN192129();
+void testFdo45543();
 
 CPPUNIT_TEST_SUITE(RtfModelTest);
 #if !defined(MACOSX)  !defined(WNT)
 CPPUNIT_TEST(testFdo45553);
 CPPUNIT_TEST(testN192129);
+CPPUNIT_TEST(testFdo45543);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -136,6 +138,27 @@ void RtfModelTest::testN192129()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(aExpectedSize.Height()), 
aActualSize.Height);
 }
 
+void RtfModelTest::testFdo45543()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo45543.rtf)));
+
+uno::Referencetext::XTextDocument xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess 
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum = 
xParaEnumAccess-createEnumeration();
+OUStringBuffer aBuf;
+while (xParaEnum-hasMoreElements())
+{
+uno::Referencecontainer::XEnumerationAccess 
xRangeEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xRangeEnum = 
xRangeEnumAccess-createEnumeration();
+while (xRangeEnum-hasMoreElements())
+{
+uno::Referencetext::XTextRange xRange(xRangeEnum-nextElement(), 
uno::UNO_QUERY);
+aBuf.append(xRange-getString());
+}
+}
+CPPUNIT_ASSERT_EQUAL(5, aBuf.getLength());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: comphelper/prj comphelper/source officecfg/Module_officecfg.mk officecfg/prj

2012-02-13 Thread Stephan Bergmann 
 comphelper/prj/build.lst   |2 +-
 comphelper/source/misc/mediadescriptor.cxx |   28 +++-
 officecfg/Module_officecfg.mk  |3 ++-
 officecfg/prj/build.lst|2 +-
 4 files changed, 7 insertions(+), 28 deletions(-)

New commits:
commit 765c6d9916b1959ff92811e80bf0fc4870e7ab29
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Feb 13 22:15:02 2012 +0100

Make simplified configuration API available down in comphelper

diff --git a/comphelper/prj/build.lst b/comphelper/prj/build.lst
index 7dde46c..722ac81 100644
--- a/comphelper/prj/build.lst
+++ b/comphelper/prj/build.lst
@@ -1,2 +1,2 @@
-ph comphelper  :   cppuhelper ucbhelper offapi salhelper 
LIBXSLT:libxslt NULL
+ph comphelper  :   cppuhelper ucbhelper offapi officecfg salhelper 
LIBXSLT:libxslt NULL
 ch comphelper\prj nmake - all ch_all NULL
diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index 038e718..d86bb08 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -47,13 +47,12 @@
 #include com/sun/star/uri/XUriReference.hpp
 #include com/sun/star/ucb/PostCommandArgument2.hpp
 #include com/sun/star/container/XNameAccess.hpp
-
+#include officecfg/Office/Common.hxx
 #include ucbhelper/interceptedinteraction.hxx
 #include ucbhelper/content.hxx
 #include ucbhelper/commandenvironment.hxx
 #include ucbhelper/activedatasink.hxx
 #include comphelper/processfactory.hxx
-#include comphelper/configurationhelper.hxx
 
 #include rtl/ustrbuf.hxx
 
@@ -445,29 +444,8 @@ sal_Bool MediaDescriptor::addInputStream()
 /*---*/
 sal_Bool MediaDescriptor::addInputStreamOwnLock()
 {
-// Own lock file implementation
-
-sal_Bool bUseLock = sal_True; // the system file locking is used per 
default
-try
-{
-
-css::uno::Reference css::uno::XInterface  xCommonConfig = 
::comphelper::ConfigurationHelper::openConfig(
-::comphelper::getProcessServiceFactory(),
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
/org.openoffice.Office.Common ) ),
-::comphelper::ConfigurationHelper::E_STANDARD );
-if ( !xCommonConfig.is() )
-throw css::uno::RuntimeException();
-
-::comphelper::ConfigurationHelper::readRelativeKey(
-xCommonConfig,
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Misc/ ) ),
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
UseDocumentSystemFileLocking ) ) ) = bUseLock;
-}
-catch( const css::uno::Exception )
-{
-}
-
-return impl_addInputStream( bUseLock );
+return impl_addInputStream(
+officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get());
 }
 
 /*---*/
diff --git a/officecfg/Module_officecfg.mk b/officecfg/Module_officecfg.mk
index 7621ecd..382992e 100644
--- a/officecfg/Module_officecfg.mk
+++ b/officecfg/Module_officecfg.mk
@@ -26,7 +26,8 @@ $(eval $(call gb_Module_add_targets,officecfg,\
Configuration_officecfg \
 ))
 
-$(eval $(call gb_Module_add_check_targets,officecfg,\
+# The cppheader test depends on comphelper so can only be a subsequentcheck:
+$(eval $(call gb_Module_add_subsequentcheck_targets,officecfg,\
 CppunitTest_officecfg_cppheader_test \
 ))
 
diff --git a/officecfg/prj/build.lst b/officecfg/prj/build.lst
index da5651f..f4a9142 100644
--- a/officecfg/prj/build.lst
+++ b/officecfg/prj/build.lst
@@ -1,2 +1,2 @@
-oc  officecfg   :TRANSLATIONS:translations comphelper soltools solenv 
LIBXSLT:libxslt NULL
+oc  officecfg   :TRANSLATIONS:translations soltools solenv LIBXSLT:libxslt 
NULL
 oc  officecfg\prj nmake - all oc_prj   NULL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

2012-02-13 Thread Andras Timar 
 basctl/source/basicide/baside2b.cxx |   38 +++-
 1 file changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 1f0784d2b877910b4a8ba3ed599333b5000ef7d0
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Mon Feb 13 16:06:03 2012 +0100

Wrong size of 'Remove watch' button at Basic IDE. fdo#44237

This patch resize the nVirtToolBoxHeight in WatchWindow::WatchWindow if
the aRemoveWatchButton plus some space is higher than nVirtToolBoxHeight. So
the aRemoveWatchButton doesn't go into aHeaderBar.

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index f74e134..d42a407 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1200,7 +1200,28 @@ WatchWindow::WatchWindow( Window* pParent ) :
 aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
 aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
 
+long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
+aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
+aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
+aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
+aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+aXEdit.Show();
+
+aRemoveWatchButton.Disable();
+aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
+aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
+Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
+aSz.Width() += 6;
+aSz.Height() += 6;
+aRemoveWatchButton.SetSizePixel( aSz );
+aRemoveWatchButton.Show();
+
+long nRWBtnSize = 
aRemoveWatchButton.GetModeImage().GetSizePixel().Height() + 10;
 nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
+
+if ( nRWBtnSize  nVirtToolBoxHeight )
+nVirtToolBoxHeight = nRWBtnSize;
+
 nHeaderBarHeight = 16;
 
 aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
@@ -1232,25 +1253,8 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 aHeaderBar.Show();
 
-aRemoveWatchButton.Disable();
-
 aTreeListBox.Show();
 
-long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER;
-aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
-aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
-aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
-aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-aXEdit.Show();
-
-aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
-aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
-Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
-aSz.Width() += 6;
-aSz.Height() += 6;
-aRemoveWatchButton.SetSizePixel( aSz );
-aRemoveWatchButton.Show();
-
 SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
 SetHelpId( HID_BASICIDE_WATCHWINDOW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-13 Thread Andras Timar 
 basctl/source/basicide/baside2b.cxx |   38 +++-
 1 file changed, 21 insertions(+), 17 deletions(-)

New commits:
commit b7570fce38cb5a7b4fc7042d7f8b0bde2c134913
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Mon Feb 13 16:06:03 2012 +0100

Wrong size of 'Remove watch' button at Basic IDE. fdo#44237

This patch resize the nVirtToolBoxHeight in WatchWindow::WatchWindow if
the aRemoveWatchButton plus some space is higher than nVirtToolBoxHeight. So
the aRemoveWatchButton doesn't go into aHeaderBar.

Signed-off-by: Andras Timar ati...@suse.com

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index dfef385..2c960bb 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1160,7 +1160,28 @@ WatchWindow::WatchWindow( Window* pParent ) :
 aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
 aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
 
+long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
+aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
+aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
+aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
+aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+aXEdit.Show();
+
+aRemoveWatchButton.Disable();
+aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
+aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
+Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
+aSz.Width() += 6;
+aSz.Height() += 6;
+aRemoveWatchButton.SetSizePixel( aSz );
+aRemoveWatchButton.Show();
+
+long nRWBtnSize = 
aRemoveWatchButton.GetModeImage().GetSizePixel().Height() + 10;
 nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
+
+if ( nRWBtnSize  nVirtToolBoxHeight )
+nVirtToolBoxHeight = nRWBtnSize;
+
 nHeaderBarHeight = 16;
 
 aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
@@ -1192,25 +1213,8 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 aHeaderBar.Show();
 
-aRemoveWatchButton.Disable();
-
 aTreeListBox.Show();
 
-long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER;
-aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
-aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
-aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
-aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-aXEdit.Show();
-
-aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
-aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
-Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
-aSz.Width() += 6;
-aSz.Height() += 6;
-aRemoveWatchButton.SetSizePixel( aSz );
-aRemoveWatchButton.Show();
-
 SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
 SetHelpId( HID_BASICIDE_WATCHWINDOW );
___
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

2012-02-13 Thread Jan Holesovsky 
 sw/source/ui/uiview/viewport.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 77249060109a68783358af87a2bcdfc4c710d760
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Feb 9 21:06:06 2012 +0400

always use the *real* visibility of the SwScrollbar

[this is a follow-up of fdo#30788]

Signed-off-by: Jan Holesovsky ke...@suse.cz

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index e4fc725..2ba6b0a 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -838,9 +838,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder rToFill, 
sal_Bool /*bInner*/ )
 else
 rToFill.Right()  = nTmp;
 }
-//#i32913# in browse mode the visibility of the horizontal scrollbar
-// depends on the content (fixed width tables may require a scrollbar)
-if ( pHScrollbar-IsVisible(pWrtShell-GetViewOptions()-getBrowseMode()) )
+if ( pHScrollbar-IsVisible(sal_True) )
 rToFill.Bottom() = nTmp;
 
 SetBorderPixel( rToFill );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-02-13 Thread Kohei Yoshida 
 sc/source/ui/app/inputhdl.cxx |   54 +-
 sc/source/ui/inc/inputhdl.hxx |3 +-
 2 files changed, 29 insertions(+), 28 deletions(-)

New commits:
commit c1ebc27ec9e55615c51b6941ed1d6b6b6782ddb2
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 17:07:48 2012 -0500

Use separate iterators for column and formula data.

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 5169b01..baefc8a 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1077,9 +1077,9 @@ void ScInputHandler::UseFormulaData()
 if (!aText.isEmpty())
 {
 rtl::OUString aNew;
-miAutoPos = pFormulaData-end();
-miAutoPos = findText(*pFormulaData, miAutoPos, aText, aNew, 
false);
-if (miAutoPos != pFormulaData-end())
+miAutoPosFormula = pFormulaData-end();
+miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aText, aNew, false);
+if (miAutoPosFormula != pFormulaData-end())
 {
 ShowTip( aNew );
 aAutoSearch = aText;
@@ -1220,8 +1220,8 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
 if ( pActiveView  pFormulaData )
 {
 rtl::OUString aNew;
-miAutoPos = findText(*pFormulaData, miAutoPos, aAutoSearch, aNew, 
bBack);
-if (miAutoPos != pFormulaData-end())
+miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, 
aAutoSearch, aNew, bBack);
+if (miAutoPosFormula != pFormulaData-end())
 ShowTip( aNew );//  als QuickHelp anzeigen
 }
 
@@ -1276,9 +1276,9 @@ void lcl_CompleteFunction( EditView* pView, const String 
rInsert, bool rParIns
 
 void ScInputHandler::PasteFunctionData()
 {
-if (pFormulaData  miAutoPos != pFormulaData-end())
+if (pFormulaData  miAutoPosFormula != pFormulaData-end())
 {
-const ScTypedStrData rData = *miAutoPos;
+const ScTypedStrData rData = *miAutoPosFormula;
 const rtl::OUString aInsert = rData.GetString();
 bool bParInserted = false;
 
@@ -1393,9 +1393,9 @@ void ScInputHandler::FormulaPreview()
 ShowTip( aValue );  //  als QuickHelp anzeigen
 aManualTip = aValue;//  nach ShowTip setzen
 if (pFormulaData)
-miAutoPos = pFormulaData-end();
-else if (pColumnData)
-miAutoPos = pColumnData-end();
+miAutoPosFormula = pFormulaData-end();
+if (pColumnData)
+miAutoPosColumn = pColumnData-end();
 }
 }
 
@@ -1556,9 +1556,9 @@ void ScInputHandler::UseColData()   // beim Tippen
 if (!aText.isEmpty())
 {
 rtl::OUString aNew;
-miAutoPos = pColumnData-end();
-miAutoPos = findText(*pColumnData, miAutoPos, aText, aNew, 
false);
-if (miAutoPos != pColumnData-end())
+miAutoPosColumn = pColumnData-end();
+miAutoPosColumn = findText(*pColumnData, miAutoPosColumn, 
aText, aNew, false);
+if (miAutoPosColumn != pColumnData-end())
 {
 //  durch dBase Import etc. koennen Umbrueche im 
String sein,
 //  das wuerde hier mehrere Absaetze ergeben - nicht 
gut
@@ -1598,7 +1598,7 @@ void ScInputHandler::UseColData()   // beim Tippen
 
 rtl::OUString aDummy;
 ScTypedCaseStrSet::const_iterator itNextPos =
-findText(*pColumnData, miAutoPos, aText, 
aDummy, false);
+findText(*pColumnData, miAutoPosColumn, aText, 
aDummy, false);
 bUseTab = itNextPos != pColumnData-end();
 }
 else
@@ -1615,7 +1615,7 @@ void ScInputHandler::NextAutoEntry( bool bBack )
 EditView* pActiveView = pTopView ? pTopView : pTableView;
 if ( pActiveView  pColumnData )
 {
-if (miAutoPos != pColumnData-end()  !aAutoSearch.isEmpty())
+if (miAutoPosColumn != pColumnData-end()  !aAutoSearch.isEmpty())
 {
 //  stimmt die Selektion noch? (kann per Maus geaendert sein)
 
@@ -1630,8 +1630,8 @@ void ScInputHandler::NextAutoEntry( bool bBack )
 if ( aSel.nEndPos == nParLen  aText.getLength() == 
aAutoSearch.getLength() + nSelLen )
 {
 rtl::OUString aNew;
-miAutoPos = findText(*pColumnData, miAutoPos, aAutoSearch, 
aNew, bBack);
-if (miAutoPos != pColumnData-end())
+miAutoPosColumn = findText(*pColumnData, miAutoPosColumn, 
aAutoSearch, aNew, bBack);
+if (miAutoPosColumn != pColumnData-end())
 {

[Libreoffice-commits] .: 2 commits - src/xlsrecord.py src/xlsstream.py

2012-02-13 Thread Kohei Yoshida 
 src/xlsrecord.py |  326 ++-
 src/xlsstream.py |2 
 2 files changed, 161 insertions(+), 167 deletions(-)

New commits:
commit 5412dccfe5af25bcfdbd4858f9051e42744051de
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 17:25:10 2012 -0500

Redid SXVI handler.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 1be0ccb..729cd56 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -3381,8 +3381,8 @@ class SXVI(BaseRecordHandler):
 itemTypes = {
 0xFE: 'Page',
 0xFF: 'Null',
-0x00: 'Data',
-0x01: 'Default',
+0x00: 'Data value',
+0x01: 'Default subtotal',
 0x02: 'SUM',
 0x03: 'COUNTA',
 0x04: 'COUNT',
@@ -3398,40 +3398,34 @@ class SXVI(BaseRecordHandler):
 0x0E: 'blank'
 }
 
-def parseBytes (self):
-itemType = self.readSignedInt(2)
-grbit= self.readSignedInt(2)
-iCache   = self.readSignedInt(2)
-nameLen  = self.readSignedInt(2)
-
-itemTypeName = 'unknown'
-if SXVI.itemTypes.has_key(itemType):
-itemTypeName = SXVI.itemTypes[itemType]
-
-flags = ''
-if (grbit  0x0001):
-flags += 'hidden, '
-if (grbit  0x0002):
-flags += 'detail hidden, '
-if (grbit  0x0008):
-flags += 'formula, '
-if (grbit  0x0010):
-flags += 'missing, '
-
-if len(flags)  0:
-# strip the trailing ', '
-flags = flags[:-2]
-else:
-flags = '(none)'
+def __parseBytes (self):
+self.itmType = self.readSignedInt(2)
+flag = self.readUnsignedInt(1)
 
-self.appendLine(item type: %s%itemTypeName)
-self.appendLine(flags: %s%flags)
-self.appendLine(pivot cache index: %d%iCache)
-if nameLen == -1:
-self.appendLine(name: null (use name in the cache))
+self.fHidden = (flag  0x01) != 0
+self.fHideDetail = (flag  0x02) != 0
+reserved = (flag  0x04) != 0
+self.fFormula= (flag  0x08) != 0
+self.fMissing= (flag  0x10) != 0
+
+self.readBytes(1) # reserved
+
+self.iCache = self.readSignedInt(2)
+cch = self.readSignedInt(2)
+if cch  0:
+self.name = self.readXLUnicodeStringNoCch()
 else:
-name, nameLen = globals.getRichText(self.readRemainingBytes(), 
nameLen)
-self.appendLine(name: %s%name)
+self.name = null (use name in the cache)
+
+def parseBytes (self):
+self.__parseBytes()
+self.appendLineString(item type, 
globals.getValueOrUnknown(SXVI.itemTypes, self.itmType))
+self.appendLineBoolean(hidden, self.fHidden)
+self.appendLineBoolean(collapsed, self.fHideDetail)
+self.appendLineBoolean(calcualted, self.fFormula)
+self.appendLineBoolean(missing in data source, self.fMissing)
+self.appendLineInt(pivot cache index, self.iCache)
+self.appendLineString(name, self.name)
 
 
 class PivotQueryTableEx(BaseRecordHandler):
commit d4ea0f4ff39e2fe3aec12cceaeda03b7a56ebe9c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 16:23:11 2012 -0500

Rename: SXViewItem - SXVI, to be consistent with the spec name.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index d75ab55..1be0ccb 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -1,7 +1,7 @@
 
 #
 #  Copyright (c) 2010-2012 Kohei Yoshida
-#  
+#
 #  Permission is hereby granted, free of charge, to any person
 #  obtaining a copy of this software and associated documentation
 #  files (the Software), to deal in the Software without
@@ -10,10 +10,10 @@
 #  copies of the Software, and to permit persons to whom the
 #  Software is furnished to do so, subject to the following
 #  conditions:
-#  
+#
 #  The above copyright notice and this permission notice shall be
 #  included in all copies or substantial portions of the Software.
-#  
+#
 #  THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
 #  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 #  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -309,11 +309,11 @@ class Autofilter(BaseRecordHandler):
 
 errorCodes = {
 0x00: '#NULL! ',
-0x07: '#DIV/0!', 
-0x0F: '#VALUE!', 
-0x17: '#REF!  ', 
-0x1D: '#NAME? ', 
-0x24: '#NUM!  ', 
+0x07: '#DIV/0!',
+0x0F: '#VALUE!',
+0x17: '#REF!  ',
+0x1D: '#NAME? ',
+0x24: '#NUM!  ',
 0x2A: '#N/A   '
 }
 
@@ -526,7 +526,7 @@ class BOF(BaseRecordHandler):
 self.betaAny = (self.flags  0x0020)
 self.riscAny = (self.flags  0x0100)
 self.lowestExcelVer = self.readSignedInt(4)
-
+
 def parseBytes (self):
 self.__parseBytes()

[Libreoffice-commits] .: 3 commits - src/xlsrecord.py src/xlsstream.py

2012-02-13 Thread Kohei Yoshida 
 src/xlsrecord.py |   15 ---
 src/xlsstream.py |2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit e9fcd0b81eba3183ea3532ac2257fb3ad27743ed
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 17:47:57 2012 -0500

Explain what the pivot field index of -2 means.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 3aa47e8..4a78e37 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2725,7 +2725,13 @@ class SxIvd(BaseRecordHandler):
 def parseBytes (self):
 self.__parseBytes()
 for id in self.ids:
-self.appendLine(field value: %d%id)
+if id == -2:
+self.appendLine(pivot field index: %d (data layout field)%id)
+else:
+self.appendLineInt(pivot field index, id)
+
+self.appendLine()
+self.appendMultiLine(NOTE: The first one of this record is for row 
fields, whereas the second one is for column fields.)
 
 class SXViewEx9(BaseRecordHandler):
 
commit 3d267e63527ec784628148e6d370195d4d3cf4b8
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 17:43:11 2012 -0500

SXIvd - SxIvd. Make the casing as it appears in the spec.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index dfcb660..3aa47e8 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2714,7 +2714,7 @@ class DConRef(BaseRecordHandler):
 self.appendLine(range: %s%self.ref.toString())
 self.appendLine(sheet name: %s%self.sheetName)
 
-class SXIvd(BaseRecordHandler):
+class SxIvd(BaseRecordHandler):
 
 def __parseBytes (self):
 self.ids = []
diff --git a/src/xlsstream.py b/src/xlsstream.py
index f936586..912bc25 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -123,7 +123,7 @@ recData = {
 0x00B0: [SXVIEW, View Definition, xlsrecord.SXView],
 0x00B1: [SXVD, View Fields, xlsrecord.SXViewFields],
 0x00B2: [SXVI, View Item, xlsrecord.SXVI],
-0x00B4: [SXIVD, Row/Column Field IDs, xlsrecord.SXIvd],
+0x00B4: [SXIVD, Row/Column Field IDs, xlsrecord.SxIvd],
 0x00B5: [SXLI, Line Item Array],
 0x00B6: [SXPI, Page Item],
 0x00B8: [DOCROUTE, Routing Slip Information],
commit 100f5fe862fadcdda3d86e20847932a1382702cb
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Feb 13 17:30:32 2012 -0500

Be more specific when iCache == -1.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 729cd56..dfcb660 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -3424,7 +3424,10 @@ class SXVI(BaseRecordHandler):
 self.appendLineBoolean(collapsed, self.fHideDetail)
 self.appendLineBoolean(calcualted, self.fFormula)
 self.appendLineBoolean(missing in data source, self.fMissing)
-self.appendLineInt(pivot cache index, self.iCache)
+if self.iCache = 0:
+self.appendLineInt(cache item index, self.iCache)
+else:
+self.appendLine(cache item index: %d (no cache item is 
referenced)%self.iCache)
 self.appendLineString(name, self.name)
 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcdr/README libcmis/README libcroco/README libgsf/README libpng/README librsvg/README libvisio/README

2012-02-13 Thread Josh Heidenreich 
 libcdr/README   |3 +++
 libcmis/README  |8 
 libcroco/README |4 
 libgsf/README   |4 
 libpng/README   |1 +
 librsvg/README  |4 
 libvisio/README |4 
 7 files changed, 28 insertions(+)

New commits:
commit b87e6be543b3daf73edb95012b87dbf95a918b95
Author: Josh Heidenreich josh.sickm...@gmail.com
Date:   Tue Feb 14 12:33:01 2012 +1030

Added READMEs for some library modules which didn't have them

diff --git a/libcdr/README b/libcdr/README
new file mode 100644
index 000..d3ba94d
--- /dev/null
+++ b/libcdr/README
@@ -0,0 +1,3 @@
+Library parsing the Corel cdr documents.
+
+I couldn't find an upstream for this library - although I did only try a 
primitive Google search.
diff --git a/libcmis/README b/libcmis/README
new file mode 100644
index 000..c39861a
--- /dev/null
+++ b/libcmis/README
@@ -0,0 +1,8 @@
+A C++ client library for the CMIS interface.
+
+From:
+[http://sourceforge.net/projects/libcmis/]
+
+Wikipedia (CMIS):
+Content Management Interoperability Services (CMIS) is an open standard that 
defines an
+abstraction layer for controlling diverse document management systems and 
repositories using web protocols.
diff --git a/libcroco/README b/libcroco/README
new file mode 100644
index 000..52a93c6
--- /dev/null
+++ b/libcroco/README
@@ -0,0 +1,4 @@
+A general CSS parsing and manipulation library written in C for the GNOME 
project.
+
+From:
+[https://launchpad.net/libcroco]
diff --git a/libgsf/README b/libgsf/README
new file mode 100644
index 000..821cd52
--- /dev/null
+++ b/libgsf/README
@@ -0,0 +1,4 @@
+A simple i/o library that can read and write common file types and handle 
structured formats that provide file-system-in-a-file semantics.
+
+From:
+[http://www.gnome.org/projects/libgsf]
diff --git a/libpng/README b/libpng/README
new file mode 100644
index 000..8b9c896
--- /dev/null
+++ b/libpng/README
@@ -0,0 +1 @@
+libpng is the official PNG reference library, from [http://www.libpng.org/]
diff --git a/librsvg/README b/librsvg/README
new file mode 100644
index 000..6b8b641
--- /dev/null
+++ b/librsvg/README
@@ -0,0 +1,4 @@
+Rapid Rendering of SVG files to screen or to other more conventional 
filetypes, such as JPEG and PNG.
+
+From:
+[http://librsvg.sourceforge.net/]
diff --git a/libvisio/README b/libvisio/README
new file mode 100644
index 000..216fee9
--- /dev/null
+++ b/libvisio/README
@@ -0,0 +1,4 @@
+Libvisio is library providing ability to interpret and import visio diagrams 
into various applications.
+
+See also:
+[http://www.freedesktop.org/wiki/Software/libvisio]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/xlsrecord.py src/xlsstream.py

2012-02-13 Thread Kohei Yoshida 
 src/xlsrecord.py |   82 +++
 src/xlsstream.py |5 ++-
 2 files changed, 86 insertions(+), 1 deletion(-)

New commits:
commit c88811e3f6b15e08d1da682d97eed0eb8c42c75e
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Tue Feb 14 00:42:58 2012 -0500

Handler for SXLI.

diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 4a78e37..ddcb2f2 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -2733,6 +2733,7 @@ class SxIvd(BaseRecordHandler):
 self.appendLine()
 self.appendMultiLine(NOTE: The first one of this record is for row 
fields, whereas the second one is for column fields.)
 
+
 class SXViewEx9(BaseRecordHandler):
 
 def parseBytes (self):
@@ -2951,6 +2952,7 @@ class SXDBB(BaseRecordHandler):
 for item in self.items:
 self.appendLine(item)
 
+
 class SXDbEx(BaseRecordHandler):
 
 def parseBytes (self):
@@ -3081,6 +3083,86 @@ class SXFDB(BaseRecordHandler):
 self.appendLineString(field name, self.stFieldName)
 
 
+class SXLI(BaseRecordHandler):
+
+itemTypes = {
+0x00: 'value in the data',
+0x01: 'automatic subtotal selection',
+0x02: 'SUM',
+0x03: 'COUNTA',
+0x04: 'COUNT',
+0x05: 'AVERAGE',
+0x06: 'MAX',
+0x07: 'MIN',
+0x08: 'PRODUCT',
+0x09: 'STDEV',
+0x0A: 'STDEVP',
+0x0B: 'VAR',
+0x0C: 'VARP',
+0x0D: 'grand total',
+0x0E: 'blank line'
+}
+
+class Item(object):
+def __init__ (self, strm):
+self.cSic = strm.readSignedInt(2)
+flag = strm.readUnsignedInt(2)
+self.itmType = (flag  0x7FFF)
+self.isxviMac = strm.readSignedInt(2)
+flag = strm.readUnsignedInt(2)
+self.fMultiDataName   = (flag  0x0001) != 0
+self.iData= (flag  0x01FE) / 2
+self.fSbt = (flag  0x0200) != 0
+self.fBlock   = (flag  0x0400) != 0
+self.fGrand   = (flag  0x0800) != 0
+self.fMultiDataOnAxis = (flag  0x1000) != 0
+G = (flag  0x2000) != 0 # unused
+H = (flag  0x4000) != 0 # unused
+I = (flag  0x8000) != 0 # reserved
+self.rgisxvi = []
+if self.isxviMac  0:
+for i in xrange(0, self.isxviMac):
+id = strm.readSignedInt(2)
+self.rgisxvi.append(id)
+
+def appendLines (self, parent):
+parent.appendLine()
+parent.appendLine( pivot line)
+parent.appendLine()
+parent.appendLineInt(pivot item index count, self.cSic)
+parent.appendLineString(item type, 
globals.getValueOrUnknown(SXLI.itemTypes, self.itmType))
+parent.appendLineInt(number of elements, self.isxviMac)
+if self.fMultiDataName:
+parent.appendLineString(data field name, subtotal)
+else:
+parent.appendLineString(data field name, total)
+parent.appendLineInt(data item index, self.iData)
+parent.appendLineBoolean(subtotal, self.fSbt)
+parent.appendLineBoolean(block total, self.fBlock)
+parent.appendLineBoolean(grand total, self.fGrand)
+parent.appendLineBoolean(multi data on axis, 
self.fMultiDataOnAxis)
+s = 
+first = True
+for id in self.rgisxvi:
+if first:
+first = False
+else:
+s += ,
+s += %d%id
+parent.appendLineString(pivot line entry, s)
+
+def __parseBytes (self):
+self.items = []
+while not self.isEndOfRecord():
+obj = SXLI.Item(self)
+self.items.append(obj)
+
+def parseBytes (self):
+self.__parseBytes()
+for item in self.items:
+item.appendLines(self)
+
+
 class SXStreamID(BaseRecordHandler):
 
 def parseBytes (self):
diff --git a/src/xlsstream.py b/src/xlsstream.py
index 912bc25..7d831c9 100644
--- a/src/xlsstream.py
+++ b/src/xlsstream.py
@@ -124,7 +124,7 @@ recData = {
 0x00B1: [SXVD, View Fields, xlsrecord.SXViewFields],
 0x00B2: [SXVI, View Item, xlsrecord.SXVI],
 0x00B4: [SXIVD, Row/Column Field IDs, xlsrecord.SxIvd],
-0x00B5: [SXLI, Line Item Array],
+0x00B5: [SXLI, Line Item Array, xlsrecord.SXLI],
 0x00B6: [SXPI, Page Item],
 0x00B8: [DOCROUTE, Routing Slip Information],
 0x00B9: [RECIPNAME, Recipient Name],
@@ -335,6 +335,7 @@ class StreamData(object):
 def isPivotCacheStream (self, name):
 return self.pivotCacheIDs.has_key(name)
 
+
 class XLStream(object):
 
 def __init__ (self, chars, params, strmData):
@@ -411,11 +412,13 @@ class XLStream(object):
 strm = XLDirStream(bytes, self.params,

Re: Trying to understand why LO seems freezed for some seconds when a module is started

2012-02-13 Thread Stephan Bergmann 

On 02/11/2012 07:24 PM, julien2412 wrote:

On master branch (not on 3.5 branch), each time I start a module Calc,
Writer or Impress (I didn't test on others), when I begin to type something,
it seems to freeze for some seconds (about 10 secs) then everything seems
ok.
So I runned valgrind by using this :
valgrind --tool=memcheck --num-callers=50 --trace-children=yes ./soffice.bin
21 | tee /tmp/valgrind.log


If you suspect the cause for the delay to be unnecessary large amounts 
of code being executed, you should run valgrind with --tool=callgrind.



With this, I can't start LO at all because there are too much errors. By
taking a look, 98% of them are like this :
==4110== Invalid write of size 4
==4110==at 0x2E7BE641: ???
==4110==by 0x2E7AF437: ???
==4110==by 0x2DA518CE: JavaCalls::call_helper(JavaValue*, methodHandle*,
JavaCallArguments*, Thread*) (in
/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/amd64/server/libjvm.so)

[...]

JVMs are notorious for producing false positives from valgrind.  I once 
improved that somewhat, by forcing the JVM into interpreted mode when 
run under valgrind (see forceInterpreted in 
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx), but even the 
non-JITed code still produces noise (which I was able to silence at 
least on a Fedora 16 with trunk valgrind via a



{
 java-1
 Memcheck:Addr4
 ...
 
obj:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so
}
{
 java-2
 Memcheck:Addr8
 fun:_wordcopy_fwd_dest_aligned
  # (in /lib64/libc-2.14.so)
 fun:__GI_memmove
  # (in /lib64/libc-2.14.so)
 fun:realpath@@GLIBC_2.3
  # (in /lib64/libc-2.14.so)
 obj:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libjava.so
 fun:Java_java_io_UnixFileSystem_canonicalize0
  # (in /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libjava.so)
}
{
 java-3
 Memcheck:Cond
 
obj:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so
}


valgrind suppressions file).


I noticed these lines too :
700 #ifdef MACOSX
 701 vm_args.version= JNI_VERSION_1_4; // issue 88987
 702 #else
 703 vm_args.version= JNI_VERSION_1_2;
 704 #endif
If we support jdk 1.4 min, we could use JNI version 1.4 according to this
http://docs.oracle.com/javase/1.4.2/docs/guide/jni/jni-14.html, no ? (or
perhaps it would need lots of changes to use it except for MacOS where it's
already used)


Yes, we could probably simplify the code by always using 
JNI_VERSION_1_4.  But it should probably not make a difference (note 
that the example at 
http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/invocation.html#wp16334 
still uses 1_2, and only states that it must be at least 1_2, but not 
that setting it to a higher value has any special effect), and who knows 
what would break with all those varied JVM implementations out there.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Cannot build on Debian: no fontconfig and unmet dependencies

2012-02-13 Thread Lionel Elie Mamane 
On Mon, Feb 13, 2012 at 04:19:17PM +1000, Andrew Roffey wrote:

 I have been trying to build LibreOffice on Debian Squeeze using the
 instructions at
 http://wiki.documentfoundation.org/Development/Native_Build

 $ apt-get build-dep openoffice.org
 The following packages have unmet dependencies:
  libcairo2-dev : Depends: libpixman-1-dev (= 0.18.4) but it is not
 going to be installed
  xulrunner-dev : Depends: libnss3-dev but it is not going to be installed
 E: Build-dependencies for openoffice.org could not be satisfied.

 What should I do in this situation? Any help appreciated.

This looks like you run not a pure squeeze, but a mix of squeeze and
wheezy (testing). Either install libpixman-1-dev from wheezy, or
downgrade the cairo packages to their squeeze version. (downgrades are
not guaranteed/tested to work by Debian) I expect the
xulrunner-dev/libnss3-dev thing is similar.

To do things a bit more manually:

apt-cache showsrc openoffice.org|grep ^Build

Install all packages in the Build-Depends and Build-Depends-Indep
lines.


 I ran ./autogen.sh, but I currently am getting the following error:

 checking for FONTCONFIG... no
 configure: error: Package requirements (fontconfig = 2.2.0) were not met:

 No package 'fontconfig' found

Install package libfontconfig1-dev. Then rerun autogen.sh, you'll get
a different this is missing message, install what it asks for,
etc. Because many things are required, this method can take quite some
time, alas. You may prefer to get the build-dep shortcut working
first.


-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: changes in profile path in release notes for 3.5

2012-02-13 Thread Stephan Bergmann 

On 02/12/2012 05:05 PM, Cor Nouws wrote:

Jean-Baptiste Faure wrote (11-02-12 09:04)

On Linux (or Linux Gnome only ???) the profile directory for LO 3.5.0
has been move to ~/.config/libreoffice. This information should be
clearly stated in the release notes for 3.5.
Could somebody who knows exactly what has been modified, update the
release notes?


I agree and will try to find a useful place for it.

I do not know where the change is introduced: the var $SYSUSERCONFIG in
the bootstraprc gets another value.


Introduced with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9276f7d5740a28b342db2a9bcd8644ff2f4f5742 
fdo#32263; should affect all Linux desktops.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Hosting LibreOffice online

2012-02-13 Thread Andor E 
Hi,
thanks for the info. That's a lot of stuff to process. I can't
promise, that I have the time for it right now (even if I'd like to).
But I will do the write up of the information contained in this thread
as asked by Michael.

Thanks

Andor Ertsey

On Fri, Feb 10, 2012 at 9:00 AM, drew d...@baseanswers.com wrote:
 On Thu, 2012-02-09 at 20:23 +, Michael Meeks wrote:
 On Thu, 2012-02-09 at 12:56 -0500, drew wrote:
  Hope you don't mind.

       Of course not ! :-)

  Added Micheal's repo to SuseStudio.

       Neat.

  From within an OpenSUSE 12.1 (32bit) vm project, go to the Software tab,
  click on Add repository and enter the name: mm-gtk3

       I hope it'll get out there as a 12.1 update shortly and the problem
 will go away.

  That adds the repo to your project, then you can add individual packages
  as needed, as usual.
 
  ok, could of come up with a better name, I suppose ;)

       :-) didn't you have a nice database test / VM image that had a master
 build environment ? or at least all the dependencies for that ? I guess
 it'd be good to link that from Andor's wiki page as/when he has it
 working - and there's nothing like having a LibreOffice window, in a
 browser window, inside a virtual-machine window, inside another
 (test-drive) browser I suspect ;-)

 I did use the service to generate a number of VM's, yes - not sure it
 really made sense for just a straight build system, for most people, as
 oo one downloaded it other then me :) have used the service to make
 others though with pre-built stuff, and some even get played with from
 time to time.

 But I did want to make one just for the LOOL purpose.
 so here it is http://susestudio.com/a/NfE1GU/lool-test

 A basic lamp server(Apache, postgres, no gui) included the C++, Java and
 Python development patterns from the SuseSTUDIO service, added the other
 LibO dependencies as needed (well, not libGL for the moment), didn't
 include a source code tarball (could I suppose)

 Anyway - installed it here, under virtualbox, and it's been chugging
 along for awhile on the first build - what I'd like to do is to, after
 the build, put a version up with everything pre-installed, pull it down
 and have it just start out of the box (no build required)..but later on
 that I suppose.

 @Andor I don't know if any of this would interest you, if so that would
 be great I'd love to hear from you.

 Thanks,

 //drew

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: basegfx::fround and friends seems needed in windows build

2012-02-13 Thread Stephan Bergmann 

On 02/12/2012 06:45 AM, Korrawit Pruegsanusak wrote:

On Thu, Feb 9, 2012 at 17:39, Michael Meeksmichael.me...@suse.com  wrote:

On Wed, 2012-02-08 at 21:36 +0100, Stephan Bergmann wrote:

On 02/08/2012 09:30 PM, Caolán McNamara wrote:

So there are some alternatives options to hide something from
callcatcher. [...] write unit tests that call it  [...]


I somehow like that solution best.  :)


Ditto :-)


Could you please give me a hint how to do this? Thanks :-)


Module basegfx already has some unit tests in basegfx/test/, run via 
basegfx/CppunitTest_basegfx.mk (cd basegfx  make check).


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH][PUSHED] Remove unused code (5)

2012-02-13 Thread Stephan Bergmann 

On 02/11/2012 03:59 PM, Ivan Timofeev wrote:

Pushed, thank you.


marking thread as pushed

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2012-02-13 Thread Stephan Bergmann 

On 02/09/2012 06:54 PM, Michael Meeks wrote:

* make check triggers build
+ make it as easy as possible to run checks (Stephan)
+ 'make check' is simpler
+ hopefully time it takes to re-run a pristine make will
  improve over time (Norbert)


Seen fixed.  Thanks a lot.

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Trying to understand why LO seems freezed for some seconds when a module is started

2012-02-13 Thread Michael Meeks 

On Sat, 2012-02-11 at 10:24 -0800, julien2412 wrote:
 On master branch (not on 3.5 branch), each time I start a module Calc,
 Writer or Impress (I didn't test on others), when I begin to type something,
 it seems to freeze for some seconds (about 10 secs) then everything seems
 ok.

That sounds -very- much like the java grammar checker - LanguageTool.
This behaviour is entirely expected - we defer the horrible first-start
performance penalty of the JVM until the very last minute, but as you
start to type ...

Bang ! ;-) and yes, I've seen this on at least three users' laptops
they brought to me saying OO.o performance sucks and simply removing
the Java grammar checker removed the eight to ten second hang that
occurs in each module when you start interacting ;-) Not having that is
one of the big wins of the new LightProof checker  ...

Of course; quite why we're activating any Java stuff when you start
typing in master, I don't know - you're sure it's not sharing some Java
extension installed in ~ ?

I guess running under gdb, hitting ctrl-c in the hang, winding the
stack-trace back to see what is activating that stuff would help get us
closer to the pain.

All the best,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Master fails to compile with cclan in moz module

2012-02-13 Thread Michael Meeks 
Hi Julien,

On Sun, 2012-02-12 at 23:30 -0800, julien2412 wrote:
 I gave a try to cclang and scan-build.
 Compilation stops because of some errors in moz module.

That is odd.

 Here is the file :
 http://nabble.documentfoundation.org/file/n3739375/llvm_moz.log llvm_moz.log 

Particularly as the patching of the mozilla source should be entirely
unrelated to the compiler used :-)

Can you remove the output directory in moz/ and try again ?
rm -Rf moz/unxlngi6.pro # or somesuch ?

Thanks :-)

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Adding Extension for Experimental Thai Spelling

2012-02-13 Thread Michael Stahl 
On 11/02/12 17:23, Richard Wordingham wrote:
 As I understand it, the lack of a usable Thai spell-checker for
 LibreOffice (unlike, say, a Khmer spell-checker) is due to the Thai
 break iterator.  (I had expected Thai and Khmer to face similar
 problems, for neither has a visible word separator and syllable
 boundaries are often unclear in both.)  Tagging Thai script text as
 Khmer does not work (at least, not in Version 3.4.5); the word
 boundaries are still determined by the Thai break iterator.
 
 Is it possible to create an experimental alternative to the Thai
 break iterator that can be shared with other people as a LibreOffice
 extension? I would be prepared to routinely use U+200B ZERO WIDTH SPACE
 (ZWSP) to separate words in the Thai script, but I suspect Thais would
 not.  Also, I can seem my first useful version fouling up the
 rendering of pre-existing text.  I can't work out how to create a break
 iterator as an *extension*. Could someone please advise me how, e.g. by
 pointing to the documentation or an example.  I can find documentation
 for *publishing* an extension, but that does not address *creating* an
 extension.

hi Richard,

while i don't know anything about break iterators, since OOo 3.0.1 there
is a new grammar checking API, which AFAIK operates on a whole paragraph
at a time; perhaps that API would make implementing a spelling checker
for such languages easier (if LO cannot determine the word boundaries
then the checker can always do it on its own).

http://wiki.services.openoffice.org/wiki/Grammar_Checking
http://www.openoffice.org/lingucomponent/grammar.html

regards,
 michael

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][REVIEWED 3-5] Wrong mapping to log level from postgresql-sdbc.ini

2012-02-13 Thread Lionel Elie Mamane 
On Sat, Feb 11, 2012 at 11:42:11PM +0900, Takeshi Abe wrote:

 Please review the commit:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=4649fafa317f4717634d863d3f3edf1d0180fc1e
 for cherry-pick to 3-5 if appropriate.

Pushed. Thanks.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW][3-5] Header/Footer and PageBreak indicators to be hidden in RO mode

2012-02-13 Thread Cedric Bosdonnat 
Hi all,

Could someone (kendy?) review and cherry-pick -s in -3-5 the following
commit:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=beb8a85796c78d4cdcf6497b6725fce8f7141d75

A bug was also recently filed that is fixed by this one: 
https://bugs.freedesktop.org/show_bug.cgi?id=45548

Thanks,

--
Cedric

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Hosting LibreOffice online

2012-02-13 Thread Andor E 
https://wiki.documentfoundation.org/Using_LibreOffice_in_a_Web_Browser

As promised I have created a first version of the Wiki page. I hope it
is not too awful.

On Mon, Feb 13, 2012 at 10:11 AM, Andor E eymux2...@googlemail.com wrote:
 Hi,
 thanks for the info. That's a lot of stuff to process. I can't
 promise, that I have the time for it right now (even if I'd like to).
 But I will do the write up of the information contained in this thread
 as asked by Michael.

 Thanks

 Andor Ertsey

 On Fri, Feb 10, 2012 at 9:00 AM, drew d...@baseanswers.com wrote:
 On Thu, 2012-02-09 at 20:23 +, Michael Meeks wrote:
 On Thu, 2012-02-09 at 12:56 -0500, drew wrote:
  Hope you don't mind.

       Of course not ! :-)

  Added Micheal's repo to SuseStudio.

       Neat.

  From within an OpenSUSE 12.1 (32bit) vm project, go to the Software tab,
  click on Add repository and enter the name: mm-gtk3

       I hope it'll get out there as a 12.1 update shortly and the problem
 will go away.

  That adds the repo to your project, then you can add individual packages
  as needed, as usual.
 
  ok, could of come up with a better name, I suppose ;)

       :-) didn't you have a nice database test / VM image that had a master
 build environment ? or at least all the dependencies for that ? I guess
 it'd be good to link that from Andor's wiki page as/when he has it
 working - and there's nothing like having a LibreOffice window, in a
 browser window, inside a virtual-machine window, inside another
 (test-drive) browser I suspect ;-)

 I did use the service to generate a number of VM's, yes - not sure it
 really made sense for just a straight build system, for most people, as
 oo one downloaded it other then me :) have used the service to make
 others though with pre-built stuff, and some even get played with from
 time to time.

 But I did want to make one just for the LOOL purpose.
 so here it is http://susestudio.com/a/NfE1GU/lool-test

 A basic lamp server(Apache, postgres, no gui) included the C++, Java and
 Python development patterns from the SuseSTUDIO service, added the other
 LibO dependencies as needed (well, not libGL for the moment), didn't
 include a source code tarball (could I suppose)

 Anyway - installed it here, under virtualbox, and it's been chugging
 along for awhile on the first build - what I'd like to do is to, after
 the build, put a version up with everything pre-installed, pull it down
 and have it just start out of the box (no build required)..but later on
 that I suppose.

 @Andor I don't know if any of this would interest you, if so that would
 be great I'd love to hear from you.

 Thanks,

 //drew

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

development summary: year 2012, week 06

2012-02-13 Thread Petr Mladek 
Hi,

this time a brief summary of what happened during the 6th week in 2012
on LibreOffice repositories and the living branches:

+ master:LO-3.5 development
+ libreoffice-3-5:   fixes for LO-3.5.1 bug fix release
+ libreoffice-3-4:   fixes for potential LO-3.4.6 bug fix release

There are two logs for each branch:

+ bugfixes-branch-week-year-week.txt lists all commits that 
reference a proper
  bug id from a variety of trackers, i.e. #i... referring to the 
OpenOffice
  issuezilla, fdo# to freedesktop, rhbz# to RedHat bugzilla

+ commit-log-branch-week-year-week.txt lists all relevant commits 
on the actual
  source repositories

Many thanks to all contributors - you make all the difference!


Best Regards,
Petr



+ base
+ don't replace NULLs given by the database by type-default values (fdo#44813) [Lionel Elie Mamane]
+ make the refresh query filter NULL-safe (fdo#44813) [Lionel Elie Mamane]
+ calc
+ compile defined names that had unresolveds during load (fdo#40378) [Eike Rathke]
+ fix stop abusing regular string token for XML import (fdo#40590) [Eike Rathke]
+ in INDIRECT() make a non-existing sheet produce an error again (fdo#36109) [Eike Rathke]
+ resolved border width lost in ODF import (fdo#38595) [Eike Rathke]
+ sc: ODF export: cell styles: (fdo#45450) [Michael Stahl]
+ sc: fix setting borders (fdo#45115) [Michael Stahl]
+ help
+ don't ignore empty TableCell Element, also check if it's a header (fdo#42924) [Korrawit Pruegsanusak]
+ libs-core
+ fix stop abusing regular string token for XML import (fdo#40590) [Eike Rathke]
+ ODF export: fix draw:fit-to-size (fdo#45534) [Michael Stahl]
+ ODF export: frames: invalid min-width (fdo#45449) [Michael Stahl]
+ writer
+ fix hilariously stupid stack guards: (fdo#38745) [Michael Stahl]
+ fix sw.SwXViewSettings::com::sun::star::text::ViewSettings (fdo#35661) [Bjoern Michaelsen]
+ fs34b: (patch provided by mathias.ba...@oracle.com) (i#117545) [Stephan Bergmann]
+ swView::SwView: fix BROWSE_MODE setting: (fdo#37024) [Michael Stahl]
+ swXTextTable: fix setting borders (fdo#45115) [Michael Stahl]
+ core
+ an empty table grid can't have implicit merges (bnc#228839) [Miklos Vajna]
+ copy settings for RTL with sheets, (fdo#45768) [Markus Mohrhard]
+ donot set duplicate master slide names. (bnc#735533) [Muthu Subramanian]
+ fix - Alien save dialog buttons run off the edge (fdo#45117) [Josh Heidenreich]
+ fix RTF export of picture frame shape type (fdo#42656) [Miklos Vajna]
+ fix RTF import of PNG images with bogus width/height (bnc#192129) [Miklos Vajna]
+ fix hilariously stupid stack guards: (fdo#38745) [Michael Stahl]
+ fix problem with vba Range.Copy ( for multirange ) (bnc#707486) [Noel Power]
+ fox context sensitive help for Word Count dialog (fdo#45045) [Andras Timar]
+ getTablePrivileges: rely on information_schema (fdo#45254) [Lionel Elie Mamane]
+ improving layout of Confirm File Format dialog (fdo#45117, fdo#45330) [Tomcsik Bence]
+ make ctrl-shift-f2 change focus to the inputline (fdo#40957) [Noel Power]
+ oDF export: fix draw:fit-to-size (fdo#45534) [Michael Stahl]
+ oDF export: frames: invalid min-width (fdo#45449) [Michael Stahl]
+ officecfg: turn off SaveBackwardCompatibleODF (fdo#45446) [Michael Stahl]
+ sc: ODF export: cell styles: (fdo#45450) [Michael Stahl]
+ sc: fix setting borders (fdo#45115) [Michael Stahl]
+ survive registered but unavailable binfilter (fdo#43644) [Caolán McNamara]
+ swView::SwView: fix BROWSE_MODE setting: (fdo#37024) [Michael Stahl]
+ swXTextTable: fix setting borders (fdo#45115) [Michael Stahl]
+ update the references even if nothing uses them here (fdo#35669) [Cédric Bosdonnat]
+ use system stdlibs on Linux by default (fdo#45074, fdo#45696) [Petr Mladek]
+ we need to explicitly set the paste area in ScMarkData, (fdo#45481) [Markus Mohrhard]
+ core
+ -I$(OUTDIR)/inc is set in SOLARINC (fdo#39491) [Matúš Kukan]
+ an empty table grid can't have implicit merges (bnc#228839) [Miklos Vajna]
+ cleaning up the tabs too early can cause loops (fdo#45908) [Cédric Bosdonnat]
+ copy settings for RTL with sheets, (fdo#45768) [Markus Mohrhard]
+ declare support for Core SQL - Base allows user aggregate functions (fdo#45249) [Lionel Elie Mamane]
+ do not deserialize into long, use a type of the correct width (fdo#40768) [Luboš Luňák]
+ fix - Alien save dialog buttons run off the edge (fdo#45117) [Josh Heidenreich]
+ fix RTF export of picture frame shape type (fdo#42656) [Miklos Vajna]
+ fix RTF export table output for subtables (bnc#203704) [Miklos Vajna]
+ fix RTF import of PNG images with bogus width/height (bnc#192129) [Miklos Vajna]
+ fix RTF import of page breaks right before text frames (bnc#703032) [Miklos Vajna]
+ fix RTF import of space-before/after

Re: [Libreoffice] [PATCH] Making default tab prefix name configurable in Calc

2012-02-13 Thread Noel Power 

On 09/02/12 14:53, Albert Thuswaldner wrote:

Hi,

[...]


So I have improved the patch according to Kohei's suggestion above.
Now I store the prefix at each key-stroke and check for illegal
characters. When an illegal character is entered, the text is reverted
back to the last good prefix. (So basically the same as for the
separators in the formula options dialog)

The patch also fixes the UI glitches.

So it all should be well - but it is not!

At least I get two annoying bugs:
1) The cursor moves In front of the text when the Prefix is reverted.
I guessed maybe the last backspace moves the cursor but just setting the 
text doesn't, however using the arrow keys to say insert a '/' in the 
middle of a prefix and the cursor goes gets repositioned at the start of 
the text, no idea why that happens, the answer most certainly lies 
somewhere in vcl/source/control/edit.cxx  core/vcl/inc/vcl/edit.hxx

2) When trying to delete text in the edit box, the last character
sticks (can't be deleted).
well that would seem to be because your code thinks a blank prefix is 
illegal, I believe changing


 -if ( !ScDocument::ValidTabName( aSheetPrefix ) )
+if ( !aSheetPrefix.isEmpty()  !ScDocument::ValidTabName( 
aSheetPrefix ) )

 {
 // Revert to last good Prefix
 pEdit-SetText( maOldPrefixValue );
 }

will fix that


To finish this feature I also would like to add some type of cue.  It
would be great if there would be some kind of standard to follow here
(is there?).

Below I just list the different options (including possible pros/cons)
that I can think of at the moment:

[...]

isn't the problem with such visual cues that the illegal character is already 
gone ( replaced by the previous selection ) by the time you flag it so it might 
be even more confusing ? Or.. do you see some other type of workflow when using 
that. Maybe a bell is isn't such a bad idea ( although I agree annoying )

Noel

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: basegfx::fround and friends seems needed in windows build

2012-02-13 Thread Michael Meeks 
Hi there,

On Sun, 2012-02-12 at 12:45 +0700, Korrawit Pruegsanusak wrote:
   So there are some alternatives options to hide something from
   callcatcher. [...] write unit tests that call it  [...]

 Could you please give me a hint how to do this? Thanks :-)

Sure ! :-) so we want to keep:

+BASEGFX_DLLPUBLIC B2IRange fround(const B2DRange rRange);

around [sic.] ;-)

The basegfx/CppunitTest makefile points to the code that is used for
unit testing.

I suggest we add a method to test/basegfx2d.cxx that has an equivalent:

CPPUNIT_TEST(rotate);

that does some trivial operation on that method, and checks the
results :-) that will ensure the method is called at least from
somewhere  calm down the unusedcode checker [ we can remove it from the
list then ].

Does that make sense ?

Thanks ! :-)

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Patch for Easy Hack 45033

2012-02-13 Thread Italo Vignoli 
I have patched the biblio.odb document with LibreOffice entries (got rid
of the old OOo entries). The patch is below to be checked, but I do not
understand if I have to attach the patched document as well. Please
help. Thanks, Italo


---
 extras/source/database/biblio.odb |  Bin 2796 - 2723 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/extras/source/database/biblio.odb
b/extras/source/database/biblio.odb
index
4e19692a7b3d8dee7988b4b873694e6de9640dda..0939bcb8b03bcf26f0550f79bbb0a73d507f2f8f
100644
GIT binary patch
delta 2036
zcmZWqc{tST7ysI3YzYxYk)0u1)6j?r$!{=(u}yUV#YEkOY^mpEfTV39T_)EC~FKM
z5mJ`945C7kArCJ1a#c^i?(hE2Kj%EocHs2-}64t`Fs{E5#%vPv#P06PHOs7C9i
z@ffpy^XVPXW9bZ4^}@@7cOq2p7}$DDAe?4_|W}q!Z_myx^)6wNdy4!g?=x}Q8
z#G+YT+_64li9Akw+KQGtz*nn3f{8eMP8myJlN~k-bg*mda6r|5x|?_32aAImT*S
zoqH!1E%^HG-|kl0-rnFzj?#EKGxb8+g)hHH{iP+GJE2sSL1!Tpl^3A6{AI{@uaV0m
zORYeRDI!BekZrs^p#X=8RZI1=g=c6r(y29o!Qit=$a{eZ}MWAw|%x!R?8y@AVAr
zG^1WPKiO}_?sl*Cs(_3POW(!RZ8w73s+++_pZOqx*pNh=Nfsu0ig-^v#V;@8%=t
z*}K8w{^AvyxCa{(@A`kBfTDAX6-f3tN#p)r;sk!55_Nai;Wwgi|rR;S;o7x5+tr
z2-pN$Udar-qTaKm8z8=QW75w(*bwXfoNT7JGOIQ4EG`HQYP6R0_xAbx~)TcLUkl
zQ0z_$?hh#)B~grc#0(9liWN=BQFc{YmZ#AObE#_SNkwC(-2#ZANt7P=AiGwaZ}F
zUQH$QYJ#iL3I};tX6c0!HVI+Sx{GexBfdDSPCR@vc8txmf0tlcq1Xgt*Wr3%LY)
zlg(8qKkaPEnlB1sr2z0-S9=4*05xF4#}0vAs{7FTtOa$lR{9WvRRLiJ3wSI@;Z
zE(=hEeFkcqxv*y8I8mS$wx-yJ}8JeJTa1b%eH)fUp)Daq)F%DrbmbRYKLW-je
z1iBG(JDWW=?fxwb6~d!7|M%!5sL8^D1G0K1zHYF_E|B}c=bOTI77u%GfU)tBya
zuCtK$)r%~C`PGV*%_H!L+bn{@T@upOOmnK8z_Ih`O5|e62|mpxwTZ^?SL0WFL*qC
zM*Go8jMYhLeA{mUX*H!L{s4;zoCE)(sjk=W(BN#4!s3%xW|ot8r-dzxnlWBX`$
z;Vr09kL0lc-Xv-om0hdCXI?56O4%p`b!ftd@H3eFYBnQL0XI??J-3sjSzG`x{j^Y
zXSi8cWj*Ff(a5_oFVK?pRo2?{+jL}KQu6$AL(kXyYXXHqt;cAomr?s=21R=
zNLZ5VZr+aqG4pTVUgv|mtIFpwj)EB#=`kC+*~FQZD)+0K2-1$acJ|hzDP7v7dLu
zmwR#dh)vF2`(@gXIhwM!esL4lZQS1;k(lx6Dy_s;tX$Zss56UbF;jbkG$uqt
z6lLK#v)iNlXJh!b@RQhfX#5;p4|waITZAT65uu{-^ot#Pp7PPI-^3MryH+k#Oik
z7`M?@_WPt+E2RN`zsyc)^X9?@L%pbGUm|pgn`m2?aYT8Jj`{q2Z92sEBjn3lSH)
z=Z!49?yWWhb#nfnIQ4|D@rxAmpt6q?fhy@*Ibp+=*=sIi8fY~vTq+Rwh1hA
ztY(`Q5R_xu_L|p26L)1BAm3un;qid^!$c6S?PrydY~1Hu64N$(Ynwi%qJN@^PD
z3Yc_?S;jW@B_@?ImHWp4f(X8*eYC_4bytLtaCZli8|c@;zSCBN4C{JsCT_lw3r5
zgv|aRdu7b%y2HR{`s%h4Ht{nm4a}-kit8-PIB}gzqYaq3AT~zPb^}si+)Xp2i|Y
z_0H)-)zw|OR*gtTO2d@C%IiSK86g!+9DK^DLJPZ|WzS39lOkW$7XK6PWiq)|abEn|
zCM(XbmwXPqfL3T3q#041QiM|ENSs?+04w2+TH}qOGNYFjQK8Hug;lRf}0RsNngZ
z4aR%y7K`0*vX;6GI2hH$RkylUtE}VW8ZH1jDHS4)0^SL4~U+mO?=xveamUGytkT*
zYWh`gnJRHs+R(nb44}9s}42wRc9pUE5zWrtxfBlSc!0MHTxfPZas2U+$5`@Y%J
z-$P}=G%BI%1b6J}EzalKH7kgsR5ADp#}laY^QF{yz1oW3pNijpOI``7s27cneoUC
z3O!b$*m12lu`Z3kW=@;PI#zdyUw|s8%-7l|@xUGG7t#d4~$jbeYa={ni;bh|
zHe-*%(J9$Z^Bo1WT0qmWE^i%1$9XpE3!caPlvs9F6%!7S#8{`I6P6=T~;OdX_D_n
zLx{W@lD2jy!~RpbE4R^D!+bA-`D3ACF0yUs*c1^)Y+l786Lqr1q!Qmk^V%MXKhO
zI?iYjPs3L3{~5f+^=%IAhSBf|005Mkzm0*3SpfJYYugVFZOH*Zx+I64|((9guzS?
zn%#Z;@kEtx2NxOz%01%KmP?KK=o}8h#FQ$VC^^q_w9fQ$RU|FSF~-GUSLgX9he
z3`=GL08LNy_3df7yirh6Xu^k$Mp;2AbNFh?5YnTzN@~d=u~ee;2gifH4O{)A1ZI
Zsh?o~e81rTfR(2|CKSV9!NX@{0*-qhxh;h

delta 2125
zcmZWqdoI19R9gvW2=ZEmz|I$_sf!+iEZwzM5fZ!Yq@Ujx+DirHdF5RvXAW44eY
zyls?A$YgSzl#*MiT*|9D?_1~X^UwElp7VU3pFTcoX?X7n}TiFXD=cu0{~zEU`Agz
zOWt5B`u(LQfDqt+K`Ki~?I$`Qq)f379x#@y|4i_D!DWHK5pLHC_#G@7kn*~J9)PU
zt|BaBAS5IP=+rjUL(KDShOW_I(gai__1MK*~JmlhDxan^F3G)brjn-Y!t!_@b
zgqXp2|M3tMx0lW!r6nSFJk`m~7zfRF;3fQ^}?3j92)=vmO6i=#vpTMnhIi33S9
zI%uc!_9cX@H6_2ib@%1SiTf;1#eoAa=8XSpW!8Cix~CUrmeon1j)HxTm^vLfztbuQ
zXYsr$+pRv~q*~38R-Jv1msHJyM+LvgX4k!D7@kG+S7S5EXvs{Oeo;V(cytv7`hK
z_jzJl3jK=`Svf_Usoq1wVznuYQ!ed-l3*)S`i6J}{?c@|;;q{72hRMjXYR6ev!t@%
zCRD8`5N`GL^m|o5MJ*Mfq%RvvarI6{A_RiIgf-{QV+7qMBO?{`KtXiv7_3d
z?}Z?5%0Ma*7MR9fxBd%9-b6Ao#QRX7-rm*b%SaL6g^pjI0rJdIn`Z8a#EouKIJ}
z6GNuQ#4)0kyMq0=E}gGD+Gx^VL9Fe*C*j-u@MUZtRpPLZQDBXmiBIeO?$mos;q2`f
znuIJYld{VjNG?5sekAu+v0YbE}W}5RF3ka8nx55;cAeWn=v^SKE+W^RFbO;HsLJ
z@MOLhlMy)M^O)n{PdN;Q4|!N)r!8VqYS}K4HY#Ig(U8(hNW5O^Hf#RdSZ6~lC8EV*
z!7fg=sOkDSDvvDL?#03hO2(1s5H%J?6ndm8`#;jNqSc5SNGky;W`jk5$05LX$U8x
zk*;na7@I^Sn#-Bx`_=80D9r{L%=0z1zLA?TWt^_CJmd%^Ny(0-VYoRhWx+AESxVo3
zm(k__un#|3D(xl;o0FCJ4(4*93rA;-{PPr?TvS}Ab$27#E971?lFoSrvu^}o9
zD%afl%3J;@8g*fE76Gv46CdX6!-5_XmWiUYL8+Z(}1`xba?u~ac+@UFTjDn3Ts
zNu}iyLd%gdmxQofF02W?I3pT(HlclB48x$xPCX2Lh1Zr8mxcIFU@Lm!XiE_|75
z1f8;X(_C`VdBU0glSkwc=LfbCS@mV(zL@ExUDgT=7RAWa0aBA}~!t?7V$0^U#$k
zmd%bh;=8OFNHY@ZxMw8gTDm?t0Jh%T)FV~;uiHTsuykv1qsQt?kGJv)45k5?6L0R
z7}Az)oU*h+o2tF*`k?0_=~g@R|YbHC$gES)0V;UHrf$Lf=$RG$7Dzo;Kc|a#
zj8C_$k=-R{?N`6Wo!4n1T1r9aU$3Fz7faXF%R)T#(%D)xVXmxS1K-b$lXRf_
zC5loyk7pEN^uZ-L+`)MaTsjUDHtlA}oD-KX#b8RVTIY?JUyq@R9rIOm=j7(-#8(Jy
zJ2{FSI`?kSSG`wbng7YNsY6bf`7}KOLuSZ6-C;ye3RRuh^4L-pS9s%Ys(QX8FM)eZ
zn^ngjuou`-i@!GXe2^~489rkfdSZCKHePi`}wnJO59QdjYe|QZVj!^}JmsmlaS
z5Oms|jfbcRw^@^FR=d5@$M(w*Zf6w_1fFn%k2H~MPlHO2cp|tsc3`pgC1n;$T@@
z2YX)Y72Wvb)a9zCH(mC^WAzm6*pO@unohjD|E}@SN%Gsb04Nc-IUY2^nl5GZvs
zRbNGh)NFB`uG2YvZgJM)AaTxAy(u@(Ta=CjEm!|QUg`Ah9-Ys$AQw|wE9zvA|dT)
zY(tWB!BR(mWZ?kWPb~`_aYM3(dp`DMPcMA(n@EWm#fj-5pwl3%JZ9NzD^f+@X!5
zta2nYgoKFgc)9xAcy?S{Z4)uecE$|$ePlv$Jtf=s3~}2g)Xc*beYDDo-@!P?u?$X

OK to get rid of scaddins?

2012-02-13 Thread Tor Lillqvist 
Do we really need to keep analysis and date as separate shared
libraries? Would it be OK to move their source code over to the sc
module, and merge their objects into the sc library, and their
.component files into sc.component?

Probably the code that refers to them could be simplified a bit then,
too, but that I don't know how to do.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: building master fails on nlpsolver

2012-02-13 Thread Caolán McNamara 
On Sat, 2012-02-11 at 08:47 +0100, Jean-Baptiste Faure wrote:
 Hi,
 
 When building the master (Ubuntu 11.10, x86_64), it fails and says that
 the problem is inside nlpsolver. If I try to build nlpsolver by
 make nlpsolver
 I get the following error messages :
 
  cd nlpsolver  make -j 2 -rs gb_PARTIALBUILD=T
  [ build XHP ] help/fr/com.sun.star.comp.Calc.NLPSolver/Options.xhp
  [ build XHP ] help/fr/com.sun.star.comp.Calc.NLPSolver/Usage.xhp
  [ build PRP ] locale/NLPSolverCommon_en_US.properties
  [ build PRP ] locale/NLPSolverStatusDialog_en_US.properties
  propmerge: cannot open sdf file: 
  /home/.../master/translations/unxlngx6.pro/misc/sdf//nlpsolver/src/locale/localize.sdf
   at /home/.../master/solver/unxlngx6.pro/bin/propmerge line 46.
  make[1]: *** 
  [/home/.../master/workdir/unxlngx6.pro/Extension/nlpsolver/locale/NLPSolverCommon_en_US.properties]
   Erreur 2

I would *suspect* some fallout of recent changes in l10ntools, e.g. a
missing conversion system file paths to urls or something of that
nature ?

Is this still broken ?

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-02-13 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=37361

--- Comment #181 from Petr Mladek pmla...@suse.cz 2012-02-13 03:35:50 PST ---
(In reply to comment #180)
 Can't install 3.5 because it says I must quit using another version of libre

It is most likely caused by the bug 45068. The update to LO-.3.5 does not work 
directly from LO  3.4.5. The solution is to either install 3.4.5 and then 3.5
or remove the older LO before installation.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: OK to get rid of scaddins?

2012-02-13 Thread Michael Stahl 
On 13/02/12 12:31, Tor Lillqvist wrote:
 Do we really need to keep analysis and date as separate shared
 libraries? Would it be OK to move their source code over to the sc
 module, and merge their objects into the sc library, and their
 ..component files into sc.component?

is that really necessary?
the sc, sd, sw libraries already take forever to link with full debug,
and adding more stuff to them would also impact startup performance for
the respective application.

(of course i don't care if you do it for a special merged libs mode,
but C++ development is already a sufficiently unproductive activity that
we shouldn't make it even more so...)

 Probably the code that refers to them could be simplified a bit then,
 too, but that I don't know how to do.
 
 --tml


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: OK to get rid of scaddins?

2012-02-13 Thread Tor Lillqvist 
 is that really necessary?

No, so OK, not then.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: JDK 1.7 error in autogen.sh

2012-02-13 Thread Caolán McNamara 
On Sun, 2012-02-12 at 14:44 +0800, LOH KOK HOE wrote:
 configure: error: 1.7 is not a supported Java bytecode version!
 Error running configure at ./autogen.sh line 157.
 
 May I know how this problem could be resolve?

I'm not sure why we check for the version here. *maybe* it was because
the embedded hsqldb wouldn't build with the openjdk 1.7, but I fixed
that a few days ago. Or maybe it was just an omission because 1.7 didn't
exist when that check was written.

Anyway, I removed the error on bytecode 1.7 from configure, ./g pull -r
again and see if it works for you now.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] New tool for better understanding the codebase, to complement the wiki.

2012-02-13 Thread Thorsten Behrens 
 So, wow again for this great work - I couldn't resist, and merged
 that up with the existing doxygen documentation, result is here:
 
  http://docs.libreoffice.org/
 
Pushed now to solenv/bin/mkdocs.sh - thanks again!

Cheers,

-- Thorsten


pgpLbm6gctRk7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3.5 (and maybe 3.4?)] fdo#42771: Fix crash when loading an invalid .fodt

2012-02-13 Thread Michael Meeks 

On Fri, 2012-02-10 at 18:12 +0100, Jan Holesovsky wrote:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9951de4a10386a85dc1bfa465304cd0005414b8e

Workaround looks fine to me :-) I'm amazed that we throw such a hard
exception here, but ...

 Returning a 'I was unable create a cursor' value via throwing runtime
 exception [in SwXFootnote::createTextCursorByRange()] is not really
 efficient ;-) - but I have no idea what I might break by changing that,
 so I just catch the exception in the code that already somehow counts on
 the possibility that the call fails anyway.  This way, the filter fails
 nicely, with our favorite 'General Input/Output Error.'

You have my ack for -3-5 :-) any chance you can push it ?

Thanks,

Michael (feeling lame).

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW][3-5][3-4] fdo#41712 SwFlowFrm::pPrecede regression

2012-02-13 Thread Michael Stahl 

apparently a SwFlowFrm::pPrecede was introduced, turning the SwFlowFrm
list from a singly linked list to a doubly linked list, without much
thought given to the additional invariants that need to be maintained;
these patches should fix that up and should go into libreoffice-3-4 and
libreoffice-3-5:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=c0970c2be45ea62d86e24271065311aaa92c0186
http://cgit.freedesktop.org/libreoffice/core/commit/?id=657c500e2e9e9ad2e38e9da278b20fb82c109001
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a9f6e5323eaa3078f0a3a00a37cee169ba7dedbc

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Patch for Easy Hack 45033

2012-02-13 Thread Tommy 
On Mon, 13 Feb 2012 12:27:26 +0100, Italo Vignoli it...@italovignoli.com  
wrote:



I have patched the biblio.odb document with LibreOffice entries (got rid
of the old OOo entries). The patch is below to be checked, but I do not
understand if I have to attach the patched document as well. Please
help. Thanks, Italo



Italo, are you turning into a code-geek after years and years of PR  
activity ?


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

  1   2   3   4   >