summaryrefslogtreecommitdiff
path: root/sw/inc/fmtruby.hxx
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/inc/fmtruby.hxx
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/inc/fmtruby.hxx')
-rw-r--r--sw/inc/fmtruby.hxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 1e30ad697938..9a48047369c4 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.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
@@ -38,12 +38,12 @@ class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem
{
friend class SwTxtRuby;
- String sRubyTxt; // the ruby txt
- String sCharFmtName; // name of the charformat
- SwTxtRuby* pTxtAttr; // the TextAttribut
- USHORT nCharFmtId; // PoolId of the charformat
- USHORT nPosition; // Position of the Ruby-Character
- USHORT nAdjustment; // specific adjustment of the Ruby-Ch.
+ String sRubyTxt; // the ruby txt
+ String sCharFmtName; // name of the charformat
+ SwTxtRuby* pTxtAttr; // the TextAttribut
+ USHORT nCharFmtId; // PoolId of the charformat
+ USHORT nPosition; // Position of the Ruby-Character
+ USHORT nAdjustment; // specific adjustment of the Ruby-Ch.
public:
SwFmtRuby( const String& rRubyTxt );
@@ -54,7 +54,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -62,29 +62,29 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
- SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
+ const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
+ SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
- const String& GetText() const { return sRubyTxt; }
- void SetText( const String& rTxt ) { sRubyTxt = rTxt; }
+ const String& GetText() const { return sRubyTxt; }
+ void SetText( const String& rTxt ) { sRubyTxt = rTxt; }
- const String& GetCharFmtName() const { return sCharFmtName; }
- void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; }
+ const String& GetCharFmtName() const { return sCharFmtName; }
+ void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; }
- USHORT GetCharFmtId() const { return nCharFmtId; }
- void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; }
+ USHORT GetCharFmtId() const { return nCharFmtId; }
+ void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; }
- USHORT GetPosition() const { return nPosition; }
- void SetPosition( USHORT nNew ) { nPosition = nNew; }
+ USHORT GetPosition() const { return nPosition; }
+ void SetPosition( USHORT nNew ) { nPosition = nNew; }
- USHORT GetAdjustment() const { return nAdjustment; }
- void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; }
+ USHORT GetAdjustment() const { return nAdjustment; }
+ void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; }
};