summaryrefslogtreecommitdiff
path: root/sw/source/ui/config/uinums.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:25:01 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:25:01 +0200
commit002c16ce95fa6e384e7541b6e656b9058dd9b459 (patch)
treec713903d39a6fa16db64fcf311b7b09a09528cfa /sw/source/ui/config/uinums.cxx
parent870bf01177cda3e80d200b785040e0ebe248b263 (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/source/ui/config/uinums.cxx')
-rw-r--r--sw/source/ui/config/uinums.cxx52
1 files changed, 26 insertions, 26 deletions
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 4986d1f1b745..a1695c1b7daa 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -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
@@ -45,7 +45,7 @@
#include <tools/resid.hxx>
#include <fmtornt.hxx>
-#include <swtypes.hxx> // Leerstring
+#include <swtypes.hxx> // Leerstring
#include <wrtsh.hxx>
#include <uinums.hxx>
#include <poolfmt.hxx>
@@ -57,12 +57,12 @@
using namespace ::com::sun::star;
-#define VERSION_30B ((USHORT)250)
-#define VERSION_31B ((USHORT)326)
-#define VERSION_40A ((USHORT)364)
+#define VERSION_30B ((USHORT)250)
+#define VERSION_31B ((USHORT)326)
+#define VERSION_40A ((USHORT)364)
#define VERSION_50A ((USHORT)373)
#define VERSION_53A ((USHORT)596)
-#define ACT_NUM_VERSION VERSION_53A
+#define ACT_NUM_VERSION VERSION_53A
#define NUMRULE_FILENAME "numrule.cfg"
#define CHAPTER_FILENAME "chapter.cfg"
@@ -73,8 +73,8 @@ SV_IMPL_PTRARR( _SwNumFmtsAttrs, SfxPoolItem* )
// SwNumRulesWithName ----------------------------------------------------
// PUBLIC METHODES -------------------------------------------------------
/*------------------------------------------------------------------------
- Beschreibung: Speichern einer Regel
- Parameter: rCopy -- die zu speichernde Regel
+ Beschreibung: Speichern einer Regel
+ Parameter: rCopy -- die zu speichernde Regel
nIdx -- Position, an der die Regel zu speichern ist.
Eine alte Regel an dieser Position wird ueberschrieben.
------------------------------------------------------------------------*/
@@ -151,7 +151,7 @@ BOOL SwBaseNumRules::Store(SvStream &rStream)
int SwBaseNumRules::Load(SvStream &rStream)
{
- int rc = 0;
+ int rc = 0;
rStream >> nVersion;
@@ -346,47 +346,47 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
BOOL bFlag;
String sStr;
- rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
+ rStream >> nUS; aFmt.SetNumberingType((sal_Int16)nUS );
if( VERSION_53A > nVersion )
{
- rStream >> cChar; aFmt.SetBulletChar( cChar );
+ rStream >> cChar; aFmt.SetBulletChar( cChar );
}
else
{
- rStream >> nUS; aFmt.SetBulletChar( nUS );
+ rStream >> nUS; aFmt.SetBulletChar( nUS );
}
- rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
+ rStream >> bFlag; aFmt.SetIncludeUpperLevels( bFlag );
if( VERSION_30B == nVersion )
{
long nL;
- rStream >> cChar; aFmt.SetStart( (USHORT)cChar );
+ rStream >> cChar; aFmt.SetStart( (USHORT)cChar );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
- rStream >> nL; aFmt.SetLSpace( lNumIndent );
- rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
+ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
+ rStream >> nL; aFmt.SetLSpace( lNumIndent );
+ rStream >> nL; aFmt.SetFirstLineOffset( (short)nL );
}
- else // alter StartWert war ein Byte
+ else // alter StartWert war ein Byte
{
- rStream >> nUS; aFmt.SetStart( nUS );
+ rStream >> nUS; aFmt.SetStart( nUS );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetPrefix( sStr );
rStream.ReadByteString(sStr, eEncoding);
aFmt.SetSuffix( sStr );
- rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
- rStream >> nUS; aFmt.SetAbsLSpace( nUS );
- rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
- rStream >> nUS; aFmt.SetCharTextDistance( nUS );
- rStream >> nShort; aFmt.SetLSpace( nShort );
+ rStream >> nUS; aFmt.SetNumAdjust( SvxAdjust( nUS ) );
+ rStream >> nUS; aFmt.SetAbsLSpace( nUS );
+ rStream >> nShort; aFmt.SetFirstLineOffset( nShort );
+ rStream >> nUS; aFmt.SetCharTextDistance( nUS );
+ rStream >> nShort; aFmt.SetLSpace( nShort );
rStream >> bFlag;
}
- USHORT nFamily;
+ USHORT nFamily;
USHORT nCharSet;
short nWidth;
short nHeight;
@@ -573,7 +573,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::ChgNumFmt( SwWrtShell& rSh,
else
pFmt = rSh.GetCharFmtFromPool( nCharPoolId );
- if( !pFmt->GetDepends() ) // Attribute setzen
+ if( !pFmt->GetDepends() ) // Attribute setzen
for( USHORT n = aItems.Count(); n; )
pFmt->SetFmtAttr( *aItems[ --n ] );
}