Re: [Libreoffice] bugs from openoffice
Hi Arno, Pls understand the use of this list: http://lists.freedesktop.org/mailman/listinfo/libreoffice Arno Teigseth wrote (14-05-11 07:17) This here very data-destructive bug is also living in libreoffice's fur somewhere: http://openoffice.org/bugzilla/show_bug.cgi?id=89232 [...] So I wonder if bug fixes from openoffice taken into libreoffice "automagically"? My advise: try the latest beta version for 3.4 http://www.libreoffice.org/download/pre-releases/ And might you encounter some bug or whatever, pls try to help with giving information: http://wiki.documentfoundation.org/BugReport http://wiki.documentfoundation.org/BugTriage Kindest regards, Cor -- - http://nl.libreoffice.org - giving openoffice.org its foundation :: The Document Foundation - ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] bugs from openoffice
Hi This might be a stupid question, so I'd better ask it quick and get over with it: This here very data-destructive bug is also living in libreoffice's fur somewhere: http://openoffice.org/bugzilla/show_bug.cgi?id=89232 My version: LibreOffice 3.3.2 OOO330m19 (Build:202) tag libreoffice-3.3.2.2 Good news are, it's been fixed in openoffice. :) So I wonder if bug fixes from openoffice taken into libreoffice "automagically"? (If not, I vote for this bug. per mail. hehe) Arno signature.asc Description: This is a digitally signed message part ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ExcelToSc / ExcelToSc8
On Fri, 2011-05-13 at 22:38 +0200, Chr. Rossmanith wrote: > Quick answer :-) Thank you! > >> at the moment I'm having a look at ExcelToSc and ExcelToSc8 and have the > >> feeling that there is some amount of duplicate code... > >> > >> During comparison of methods ExcRelToScRel and ExcRelToScRel8 I've > >> wondered if it shouldn't be nRow instead of nC in the initialisation of > >> bRowRel: > > No, that code is correct. In the Excel binary format, both column and > > row flags are stored in the (unused) higher bits of the column index > > bytes. > > > And it changed with versions? That's possible. BIFF5 and BIFF8 handle many things differently. I'm just talking about BIFF8 here. I don't even know if we can still find a spec on BIFF5. But then, that format is so old we don't really pay that much attention. But if something as basic as that (cell address) is wrong, I would think that we would have received lots of bugs reports regarding Excel import filter bugs. So I assume that's correct. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ExcelToSc / ExcelToSc8
Quick answer :-) Thank you! at the moment I'm having a look at ExcelToSc and ExcelToSc8 and have the feeling that there is some amount of duplicate code... During comparison of methods ExcRelToScRel and ExcRelToScRel8 I've wondered if it shouldn't be nRow instead of nC in the initialisation of bRowRel: No, that code is correct. In the Excel binary format, both column and row flags are stored in the (unused) higher bits of the column index bytes. And it changed with versions? In ExcRelToScRel() I find if( nRow & 0x4000 ) and if( nRow & 0x8000 ) I'd expect nCol with your explanation from above... Christina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] ExcelToSc / ExcelToSc8
On Fri, 2011-05-13 at 22:14 +0200, Chr. Rossmanith wrote: > Hi, > > at the moment I'm having a look at ExcelToSc and ExcelToSc8 and have the > feeling that there is some amount of duplicate code... > > During comparison of methods ExcRelToScRel and ExcRelToScRel8 I've > wondered if it shouldn't be nRow instead of nC in the initialisation of > bRowRel: No, that code is correct. In the Excel binary format, both column and row flags are stored in the (unused) higher bits of the column index bytes. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] ExcelToSc / ExcelToSc8
Hi,
at the moment I'm having a look at ExcelToSc and ExcelToSc8 and have the
feeling that there is some amount of duplicate code...
During comparison of methods ExcRelToScRel and ExcRelToScRel8 I've
wondered if it shouldn't be nRow instead of nC in the initialisation of
bRowRel:
void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC,
ScSingleRefData &rSRD, const sal_Bool bName )
{
const sal_BoolbColRel = ( nC & 0x4000 ) != 0;
const sal_BoolbRowRel = ( nC & 0x8000 ) != 0;
const sal_uInt8nCol = static_cast(nC);
...
Christina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Simplified #define OSL_FILE_TRACE
Hi, if I remember correctly cppcheck complained about some statements in the context of OSL_FILE_TRACE. This patch simplifies the definition of OSL_FILE_TRACE ( => code better readable) and facilitates compiling without warnings. Please review in case there was some magic behind the original definition... Thank you, Christina >From dca0c130a360481eaae32d863c0fca77bd0941fb Mon Sep 17 00:00:00 2001 From: Christina Rossmanith Date: Fri, 13 May 2011 21:36:25 +0200 Subject: [PATCH] Simplified #define OSL_FILE_TRACE --- sal/osl/unx/file.cxx |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 24f6311..6507d9c 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -59,13 +59,15 @@ #endif /* MACOSX */ #ifdef DEBUG_OSL_FILE -# define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace +# define OSL_FILE_TRACE osl_trace # define PERROR( a, b ) perror( a ); fprintf( stderr, b ) #else -# define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace +# define OSL_FILE_TRACE(fmt, ...) # define PERROR( a, b ) #endif + + /*** * * FileHandle_Impl interface -- 1.7.0.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] cppcheck : Same expression on both sides of '!='
On Fri, 2011-05-13 at 23:54 +0700, Korrawit Pruegsanusak wrote: > Hello all, > > Joop Kiefte wrote: > > Maybe worth it to look those places up in the version control history... > > I've annotated this file and found the added version since Sep 2010. > Let's take a look from this link: > http://opengrok.libreoffice.org/diff/calc/sc/source/core/tool/rangeutl.cxx?r2=%2Fcalc%2Fsc%2Fsource%2Fcore%2Ftool%2Frangeutl.cxx%40188130067b80960fd509078f2e23fc1636e694ab&r1=%2Fcalc%2Fsc%2Fsource%2Fcore%2Ftool%2Frangeutl.cxx%40f789f423c79cb68fdf253cbc0291139436e80ec8 The actual change that matters dates back older than that commit (back in the go-oo times which means you need to dig up the history of the actual patch file itself in the 'build' repository). Anyway, in the latest master I've already made changes to make the code the way it should be. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] cppcheck : Same expression on both sides of '!='
Hello all, Joop Kiefte wrote: > Maybe worth it to look those places up in the version control history... I've annotated this file and found the added version since Sep 2010. Let's take a look from this link: http://opengrok.libreoffice.org/diff/calc/sc/source/core/tool/rangeutl.cxx?r2=%2Fcalc%2Fsc%2Fsource%2Fcore%2Ftool%2Frangeutl.cxx%40188130067b80960fd509078f2e23fc1636e694ab&r1=%2Fcalc%2Fsc%2Fsource%2Fcore%2Ftool%2Frangeutl.cxx%40f789f423c79cb68fdf253cbc0291139436e80ec8 Best regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] patch for #36684
Hi, can someone please review ( and cherrypick ) to libreoffice3.4 the following patch http://cgit.freedesktop.org/libreoffice/libs-core/commit/?id=ea29c4f0d289890fcdb2f12380aa1ccf3d1028c9 from master thanks, Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 36684, which changed state. Bug 36684 Summary: UI: Menu 'View> Toolbars' relations to toolbars messed up https://bugs.freedesktop.org/show_bug.cgi?id=36684 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- 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
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Rainer Bielefeld changed: What|Removed |Added Depends on|36571 | -- 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: [Libreoffice] [GSOC][PATCH] Multiline inputbar
On Thu, 2011-05-12 at 23:27 -0400, Kohei Yoshida wrote: > On Fri, 2011-05-13 at 03:53 +0530, Anurag Jain wrote: > > Hello There, > > > > I'm posting here the git diff of the work I've done till now. > > @Kohei Since I do not want to disturb my master branch I'm here > > pasting the diff only. Please create a feature branch and apply it, so > > that I can clone that branch and commit on that. > > Could you re-send that patch as an attachment? I'm having hard time > applying that diff output because the mail client wrapped many lines > that basically screwed up the patch format. I have received a patch in private mail, and have checked it in to the feature/calc-multiline-input (the calc repo only for now). I have assumed that it is submitted under LGPLv3+/MPL. If not, let me know. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 36571, which changed state. Bug 36571 Summary: Find bar does not appear properly at top of screen https://bugs.freedesktop.org/show_bug.cgi?id=36571 What|Old Value |New Value Resolution||DUPLICATE Status|ASSIGNED|RESOLVED -- 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: [Libreoffice] Fwd: LibreOffice 3.4.0 ,DEV300m103 (Build:4)
Hi Italo, without any more info from that guy I'ld say that this looks like a blocker that has been recently fixed and will be in the next version. On Fri, 2011-05-13 at 15:55 +0200, Italo Vignoli wrote: > I know this is not the right place for bugs, but I am definitely not the > right person to handle a bug warning ;-) > > Original Message > Subject: LibreOffice 3.4.0 ,DEV300m103 (Build:4) > Date: Fri, 13 May 2011 15:50:16 +0200 > From: Jean-Paul Ghys > Reply-To: jp.g...@gmail.com > To: Italo Vignoli > > Sorry to send you to bother you with this. But I can't find where to > send my comments when using a Beta 3.4 version. > > - Table formats are lost if document is saved in Word 97 format. > > Best regards and many thanks to all of you for this wonderful LibreOffice. > > Jean-Paul Ghys > -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PUSHED] Re: [REVIEW] Fix for fdo#36826
Thank you for the patches, valuable contributor.
Keep on the good work
F.
On Fri, 2011-05-13 at 15:30 +0200, Cedric Bosdonnat wrote:
> -nLeftHeaderCount = pLeftHeaderFmt->GetClientCount();
> -{
> -int nLeftHeaderCount = 0;
> -}
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Fwd: LibreOffice 3.4.0 ,DEV300m103 (Build:4)
I know this is not the right place for bugs, but I am definitely not the right person to handle a bug warning ;-) Original Message Subject:LibreOffice 3.4.0 ,DEV300m103 (Build:4) Date: Fri, 13 May 2011 15:50:16 +0200 From: Jean-Paul Ghys Reply-To: jp.g...@gmail.com To: Italo Vignoli Sorry to send you to bother you with this. But I can't find where to send my comments when using a Beta 3.4 version. - Table formats are lost if document is saved in Word 97 format. Best regards and many thanks to all of you for this wonderful LibreOffice. Jean-Paul Ghys -- Italo Vignoli italo.vign...@gmail.com mobile +39.348.5653829 VoIP +39.02.320621813 skype italovignoli ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [Bug 35673] LibreOffice 3.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=35673 Bug 35673 depends on bug 36524, which changed state. Bug 36524 Summary: EDITING: Delete Index causes crash https://bugs.freedesktop.org/show_bug.cgi?id=36524 What|Old Value |New Value Resolution||FIXED Status|ASSIGNED|RESOLVED -- 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
[Libreoffice] [REVIEW] Fix for fdo#36826
Hi all,
Could you review and signoff the attached patches for inclusion in 3.4
branch?
The first patch is simply some cleanup to make sw build with debug
symbols.
The second is the fix for
https://bugs.freedesktop.org/show_bug.cgi?id=36826 (paragraph borders
hidden by paragraph background)
Thanks,
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr
>From 01ca61d0aacafbe1afa1e72832e5dc1b4989ecd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?=
Date: Wed, 11 May 2011 14:20:44 +0200
Subject: [PATCH 1/2] fix debug build
---
sw/source/core/layout/tabfrm.cxx |2 +-
sw/source/core/undo/SwUndoPageDesc.cxx | 16
2 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 93cbfc3..aaa73ca 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1568,7 +1568,7 @@ bool SwCntntFrm::CalcLowers( SwLayoutFrm* pLay, const SwLayoutFrm* pDontLeave,
}
#if OSL_DEBUG_LEVEL > 1
-OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" )
+OSL_FAIL( "LoopControl in SwCntntFrm::CalcLowers" );
#endif
}
}
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx
index c8f9b0c..7b0eb6a 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -64,10 +64,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
SwFrmFmt* pHeaderFmt = rHead.GetHeaderFmt();
if( pHeaderFmt )
{
-nHeaderCount = pHeaderFmt->GetClientCount();
-{
-int nHeaderCount = 0;
-}
const SwFmtCntnt* pCntnt = &pHeaderFmt->GetCntnt();
if( pCntnt->GetCntntIdx() )
nHeaderMaster = pCntnt->GetCntntIdx()->GetIndex();
@@ -77,10 +73,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
SwFrmFmt* pLeftHeaderFmt = rLeftHead.GetHeaderFmt();
if( pLeftHeaderFmt )
{
-nLeftHeaderCount = pLeftHeaderFmt->GetClientCount();
-{
-int nLeftHeaderCount = 0;
-}
const SwFmtCntnt* pLeftCntnt = &pLeftHeaderFmt->GetCntnt();
if( pLeftCntnt->GetCntntIdx() )
nHeaderLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
@@ -93,10 +85,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
SwFrmFmt* pFooterFmt = rFoot.GetFooterFmt();
if( pFooterFmt )
{
-nFooterCount = pFooterFmt->GetClientCount();
-{
-int nFooterCount = 0;
-}
const SwFmtCntnt* pCntnt = &pFooterFmt->GetCntnt();
if( pCntnt->GetCntntIdx() )
nFooterMaster = pCntnt->GetCntntIdx()->GetIndex();
@@ -106,10 +94,6 @@ void DebugHeaderFooterContent( const SwPageDesc& rPageDesc )
SwFrmFmt* pLeftFooterFmt = rLeftFoot.GetFooterFmt();
if( pLeftFooterFmt )
{
-nLeftFooterCount = pLeftFooterFmt->GetClientCount();
-{
-int nLeftFooterCount = 0;
-}
const SwFmtCntnt* pLeftCntnt = &pLeftFooterFmt->GetCntnt();
if( pLeftCntnt->GetCntntIdx() )
nFooterLeft = pLeftCntnt->GetCntntIdx()->GetIndex();
--
1.7.3.4
>From bcc99c69ee6b6ec36f4b9b8563a2594489238e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?=
Date: Fri, 13 May 2011 15:25:01 +0200
Subject: [PATCH 2/2] fdo#36826: draw background before borders or borders may be hidden
---
sw/source/core/layout/paintfrm.cxx |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 904c2c9..144d2b0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5810,13 +5810,12 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
{
SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)pFrm );
const SwBorderAttrs &rTmpAttrs = *aAccess.Get();
-/// OD 06.08.2002 #99657# - paint border before painting background
-if ( bLowerBorder )
-pFrm->PaintBorder( aBorderRect, pPage, rTmpAttrs );
if ( ( pFrm->IsLayoutFrm() && bLowerBorder ) ||
aFrmRect.IsOver( aRect ) )
pFrm->PaintBackground( aRect, pPage, rTmpAttrs, bLowMode,
bLowerBorder );
+if ( bLowerBorder )
+pFrm->PaintBorder( aBorderRect, pPage, rTmpAttrs );
}
pFrm = pFrm->GetNext();
} while ( pFrm && pFrm->GetUpper() == this &&
--
1.7.3.4
[Libreoffice] [PATCH] resubmitted: Some more OSL_* love and debug.hxx removal in writer/sw
Resubmitting the mail in case it got lost somewhere in the spam filter.
BTW, do you think I should create a bug in bugzilla for align ASSERT (&
friends) macro foo easy hack?
Jacek
Wiadomość przekazywana --
Od: Jacek Wolszczak
Do: libreoffice-dev
Temat: [Libreoffice] [PATCH] Some more OSL_* love and debug.hxx removal
in writer/sw
Data: Tue, 10 May 2011 13:01:32 +0200
Hi,
Attached hereto are 3 patches:
- 0001 replaces #ifdef DEBUG with #if OSL_DEBUG_LEVEL > 1
- 0002 removes unused (most probably) debug function from acccontext.cxx
- 0003 removes debug.hxx includes from several files in writer/sw. There
are stil a few debug.hxx left as there are some macros from other repos
used therein that contain DBG_ASSERT.
Hope you'll find it useful. As always LGPL3+/MPL.
Jacek
>From 14c35419426a941b96eed4890f6e2e6f37af6382 Mon Sep 17 00:00:00 2001
From: Jacek Wolszczak
Date: Tue, 10 May 2011 09:56:23 +0200
Subject: [PATCH 1/3] Replace #ifdef DEBUG with #if OSL_DEBUG_LEVEL > 1
---
sw/inc/dbgoutsw.hxx|4 +-
sw/source/core/doc/dbgoutsw.cxx|2 +-
sw/source/core/doc/docbm.cxx |2 +-
sw/source/core/doc/docredln.cxx|4 +-
sw/source/core/edit/edlingu.cxx|2 +-
sw/source/core/text/inftxt.cxx |4 +-
sw/source/core/txtnode/txtedt.cxx |2 +-
sw/source/core/undo/SwUndoPageDesc.cxx | 12
sw/source/core/unocore/unotext.cxx |4 +-
sw/source/core/view/printdata.cxx |2 +-
sw/source/filter/ww8/WW8Sttbf.cxx |6 ++--
sw/source/filter/ww8/WW8TableInfo.cxx | 46
sw/source/filter/ww8/rtfexport.cxx |4 +-
sw/source/filter/ww8/wrtw8nds.cxx | 10 +++
sw/source/filter/ww8/wrtww8.cxx| 40 ++--
sw/source/filter/ww8/ww8par.cxx|4 +-
sw/source/ui/lingu/hhcwrp.cxx | 10 +++---
sw/source/ui/lingu/olmenu.cxx |5 +---
18 files changed, 79 insertions(+), 84 deletions(-)
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index dad9e50..b111808 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -28,7 +28,7 @@
#ifndef __DBGOUTSW_HXX
#define __DBGOUTSW_HXX
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
#include
#include
@@ -124,7 +124,7 @@ const char * dbg_out(const boost::unordered_map &
}
SW_DLLPUBLIC const char * dbg_out(const SwFormToken & rToken);
SW_DLLPUBLIC const char * dbg_out(const SwFormTokens & rTokens);
-#endif // DEBUG
+#endif // OSL_DEBUG_LEVEL > 1
#endif // __DBGOUTSW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 9b83b52..2ca96f6 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
#include
#include
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 5a3cf3e..7c03f51 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -750,7 +750,7 @@ namespace sw { namespace mark
{
m_vFieldmarks.clear();
m_vBookmarks.clear();
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
for(iterator_t pBkmk = m_vMarks.begin();
pBkmk != m_vMarks.end();
++pBkmk)
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 5d5ffd1..e0f6c31 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -254,7 +254,7 @@ inline bool IsPrevPos( const SwPosition rPos1, const SwPosition rPos2 )
: false;
}
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
{
int nError = 0;
@@ -2733,7 +2733,7 @@ sal_Bool SwRedlineTbl::InsertWithValidRanges( SwRedlinePtr& p, sal_uInt16* pInsP
}
else
aNewStt = *pNew->GetPoint();
-#ifdef DEBUG
+#if OSL_DEBUG_LEVEL > 1
CheckPosition( pNew->GetPoint(), pNew->GetMark() );
#endif
if( *pNew->GetPoint() != *pNew->GetMark() &&
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index dcdc438..2464deb 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1330,7 +1330,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
}
else
{
-OSL_ENSURE( 0, "ApplyChangedSentence: iterator positions broken" );
+OSL_FAIL("ApplyChangedSentence: iterator positions broken" );
break;
}
}
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ba19cec..32a35a2 100644
--- a/sw/source/core/text/inftxt.c
Re: [Libreoffice] Make check now fails on master in smoketest for Mac OSX
Le 13/05/11 09:58, Alexander Thurgood a écrit :
Here's the first one (line 140) :
catch (css::connection::NoConnectException &) {}
if (process_ != 0) {
TimeValue delay = { 1, 0 }; // 1 sec
CPPUNIT_ASSERT_EQUAL(
osl_Process_E_TimedOut,
osl_joinProcessWithTimeout(process_, &delay));
and the second one (line 169) :
CPPUNIT_ASSERT_EQUAL(osl_Process_E_None, osl_joinProcess(process_));
oslProcessInfo info;
info.Size = sizeof info;
CPPUNIT_ASSERT_EQUAL(
osl_Process_E_None,
osl_getProcessInfo(process_, osl_Process_EXITCODE, &info));
CPPUNIT_ASSERT_EQUAL(oslProcessExitCode(0), info.Code);
osl_freeProcessHandle(process_);
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] fix for fdo#36951
Hi, Could anyone review and sign-off this patch in 3.4 branch? It fixes the layout of password dialog (e.g. File - Properties - Security, File - Export to PDF - Security). It is not critical but it looks ugly. Thanks, Andras >From 4f5b9c060c38d46db0f2df008979fc8e4d9f4d79 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Fri, 13 May 2011 10:24:29 +0200 Subject: [PATCH] fix password dialog layout problem - fdo#36951 --- sfx2/source/dialog/passwd.cxx |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 67b3d7b..86eb82a 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -165,6 +165,9 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText // add second confirm line xEdits->addRow( &maConfirm2FT, &maConfirm2ED, -2, aEditSize ); +// add password length warning line +xEdits->addWindow( &maMinLengthFT ); + // add a FixedLine FixedLine* pLine = new FixedLine( this, 0 ); pLine->Show(); -- 1.7.0.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Make check now fails on master in smoketest for Mac OSX
Le 13/05/11 09:49, Alexander Thurgood a écrit :
The problem appears to lie in some assertions which fail :
: &&
DYLD_LIBRARY_PATH=/Users/alex/DevHack/git/libo/clone/testing/smoketestoo_native/unxmacxi.pro/lib:/Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/lib${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
/Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/bin/cppunit/cppunittester
\
-env:UNO_SERVICES=file:///Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/xml/ure/services.rdb
\
-env:UNO_TYPES=file:///Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/bin/types.rdb
\
-env:arg-soffice=path:/Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/installation/opt/LibreOffice.app/Contents/MacOS/soffice
-env:arg-user=./unxmacxi.pro/misc/smoketest/user \
-env:arg-env=DYLD_LIBRARY_PATH"${DYLD_LIBRARY_PATH+=$DYLD_LIBRARY_PATH}"
-env:arg-testarg.smoketest.doc=/Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/bin/smoketestdoc.sxw
--protector \
/Users/alex/DevHack/git/libo/solver/340/unxmacxi.pro/lib/unoexceptionprotector.dylib
\
unoexceptionprotector ./unxmacxi.pro/lib/libsmoketest.dylib
/Users/alex/DevHack/git/libo/clone/testing/test/source/cpp/officeconnection.cxx:140:
Assertion
Test name: (anonymous namespace)::Test::test
setUp() failed
- equality assertion failed
- Expected: 2
- Actual : 0
/Users/alex/DevHack/git/libo/clone/testing/test/source/cpp/officeconnection.cxx:169:
Assertion
Test name: (anonymous namespace)::Test::test
tearDown() failed
- equality assertion failed
- Expected: 0
- Actual : 77
Is this one of those iterator problems again that Michael and Tor picked
up on ?
Alex
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Make check now fails on master in smoketest for Mac OSX
FYI, I built from master on Mac OSX 2 days ago, make check worked, and smoketest successfully did its tests, i.e. I saw the app start, a window opens briefly, then closes again, and this is repeated a couple of times. Note that I built initially with the LANG switch "en-US, de, fr, ru". Now, after pulling all the latest changes into the repo, the build still completes and packages, but when I attempt a make check, the build fails in smoketest, and its attempt to start the office gets the splashscreen, and then a laconic error message in French : LibreOffice 3.4 - Fatal Error "Impossible de lancer l'application" with a ~OK button to close. Rebuilding the module specifically after a rm leads to the same result. Something changed ? Thorsten, the patch to the cppunit tests to avoid the locale problem ? FWIW, the app installs from the DMG and starts normally, so does the problem lie somewhere in the way the smoketest bootstraps the office to start ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] fix for fdo#36524
Hi all, I've just seen that there are cases where that change won't fit the original code. I'll need some more thinking to make it clean or check what it breaks. Don't push it now as it may introduce other bugs (potentially blockers) On Thu, 2011-05-12 at 17:14 +0200, Cedric Bosdonnat wrote: > Hi all, > > Could anyone review and sign-off this patch in 3.4 branch? The change > from sal_True to sal_False was pretty complex to find out, but I just > reverted it to the value it had in 3.3 sources. > > Thanks, > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Cédric Bosdonnat LibreOffice hacker http://documentfoundation.org OOo Eclipse Integration developer http://cedric.bosdonnat.free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
