diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:25:01 +0200 |
| commit | 002c16ce95fa6e384e7541b6e656b9058dd9b459 (patch) | |
| tree | c713903d39a6fa16db64fcf311b7b09a09528cfa /sw/inc/swcrsr.hxx | |
| parent | 870bf01177cda3e80d200b785040e0ebe248b263 (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 884b525da5856cbd2c4a382e73327d8c59a91acc (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit b59804d94e107c5227532aa3511d4fad1dd15436
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 17:47:27 2011 +0100
Related: fdo#32553/fdo#31792 nsure correct odt mimetype and pdf export filter
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/ui/dbui/mmoutputpage.cxx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
commit d1234b1bcd542b4ce523b6be76e7491afdce4de8
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Mar 18 12:29:41 2011 +0000
Resolves: fdo#32553 freeze/hang on mailmerge to attached pdf
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/docnode/nodes.cxx | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
commit 5974be757044982b8f510c5fc642e8e03ae62c74
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Mar 8 16:32:57 2011 +0100
n#663622: Fix the positions of imported fields to avoid crashes
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sw/source/core/crsr/bookmrk.cxx | 2 +-
sw/source/core/inc/bookmrk.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: writer_libreoffice-3.3.3.1
Diffstat (limited to 'sw/inc/swcrsr.hxx')
| -rw-r--r-- | sw/inc/swcrsr.hxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 14878734d615..feea603d0a82 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ namespace com { namespace sun { namespace star { namespace util { // ein Basis-Struktur fuer die Parameter der Find-Methoden // return - Werte vom Found-Aufruf. -const int FIND_NOT_FOUND = 0; -const int FIND_FOUND = 1; -const int FIND_NO_RING = 2; +const int FIND_NOT_FOUND = 0; +const int FIND_FOUND = 1; +const int FIND_NO_RING = 2; struct SwFindParas { @@ -113,7 +113,7 @@ public: SwPaM* ) const; - ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt, + ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt, BOOL bSearchInNotes, SwDocPositions nStart, SwDocPositions nEnde, BOOL& bCancel, @@ -180,7 +180,7 @@ public: BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden ) { return LeftRight( FALSE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); } BOOL GoNextCell( USHORT nCnt = 1 ) { return GoPrevNextCell( TRUE, nCnt ); } - BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); } + BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); } virtual BOOL GotoTable( const String& rName ); BOOL GotoTblBox( const String& rName ); BOOL GotoRegion( const String& rName ); @@ -207,7 +207,7 @@ public: BOOL bChgCrsr = TRUE ); BOOL IsNoCntnt() const; - void RestoreSavePos(); // Point auf die SavePos setzen + void RestoreSavePos(); // Point auf die SavePos setzen // TRUE: an die Position kann der Cursor gesetzt werden virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; @@ -265,7 +265,7 @@ protected: xub_StrLen nTblPtCnt, nTblMkCnt; SwSelBoxes aSelBoxes; BOOL bChg : 1; - BOOL bParked : 1; // Tabellen-Cursor wurde geparkt + BOOL bParked : 1; // Tabellen-Cursor wurde geparkt virtual bool IsSelOvrCheck(int eFlags); @@ -294,7 +294,7 @@ public: // wurde der TabelleCursor veraendert ? BOOL IsCrsrMoved() const { - return nTblMkNd != GetMark()->nNode.GetIndex() || + return nTblMkNd != GetMark()->nNode.GetIndex() || nTblPtNd != GetPoint()->nNode.GetIndex() || nTblMkCnt != GetMark()->nContent.GetIndex() || nTblPtCnt != GetPoint()->nContent.GetIndex(); |