Skip to content

C
core
Kaydet (Commit) 338b6a64 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

sw: prefix members of SwBoxAutoFormat 

Change-Id: I9849dcd31dae2e5db9ce3178640d2bf605b78238
üst 38128ea3
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 280 deletions
sw/inc/tblafmt.hxx
Dosyayı görüntüle @ 338b6a64
...@@ -66,49 +66,49 @@ class SwBoxAutoFormat ...@@ -66,49 +66,49 @@ class SwBoxAutoFormat
{ {
// common attributes of Calc and Writer // common attributes of Calc and Writer
// --- from 641 on: CJK and CTL font settings // --- from 641 on: CJK and CTL font settings
SvxFontItem aFont; SvxFontItem m_aFont;
SvxFontHeightItem aHeight; SvxFontHeightItem m_aHeight;
SvxWeightItem aWeight; SvxWeightItem m_aWeight;
SvxPostureItem aPosture; SvxPostureItem m_aPosture;
SvxFontItem aCJKFont; SvxFontItem m_aCJKFont;
SvxFontHeightItem aCJKHeight; SvxFontHeightItem m_aCJKHeight;
SvxWeightItem aCJKWeight; SvxWeightItem m_aCJKWeight;
SvxPostureItem aCJKPosture; SvxPostureItem m_aCJKPosture;
SvxFontItem aCTLFont; SvxFontItem m_aCTLFont;
SvxFontHeightItem aCTLHeight; SvxFontHeightItem m_aCTLHeight;
SvxWeightItem aCTLWeight; SvxWeightItem m_aCTLWeight;
SvxPostureItem aCTLPosture; SvxPostureItem m_aCTLPosture;
SvxUnderlineItem aUnderline; SvxUnderlineItem m_aUnderline;
SvxOverlineItem aOverline; SvxOverlineItem m_aOverline;
SvxCrossedOutItem aCrossedOut; SvxCrossedOutItem m_aCrossedOut;
SvxContourItem aContour; SvxContourItem m_aContour;
SvxShadowedItem aShadowed; SvxShadowedItem m_aShadowed;
SvxColorItem aColor; SvxColorItem m_aColor;
SvxBoxItem aBox; SvxBoxItem m_aBox;
SvxLineItem aTLBR; SvxLineItem m_aTLBR;
SvxLineItem aBLTR; SvxLineItem m_aBLTR;
SvxBrushItem aBackground; SvxBrushItem m_aBackground;
// Writer specific // Writer specific
SvxAdjustItem aAdjust; SvxAdjustItem m_aAdjust;
SvxFrameDirectionItem m_aTextOrientation; SvxFrameDirectionItem m_aTextOrientation;
SwFormatVertOrient m_aVerticalAlignment; SwFormatVertOrient m_aVerticalAlignment;
// Calc specific // Calc specific
SvxHorJustifyItem aHorJustify; SvxHorJustifyItem m_aHorJustify;
SvxVerJustifyItem aVerJustify; SvxVerJustifyItem m_aVerJustify;
SfxBoolItem aStacked; SfxBoolItem m_aStacked;
SvxMarginItem aMargin; SvxMarginItem m_aMargin;
SfxBoolItem aLinebreak; SfxBoolItem m_aLinebreak;
SfxInt32Item aRotateAngle; SfxInt32Item m_aRotateAngle;
SvxRotateModeItem aRotateMode; SvxRotateModeItem m_aRotateMode;
// number format // number format
OUString sNumFormatString; OUString m_sNumFormatString;
LanguageType eSysLanguage, eNumFormatLanguage; LanguageType m_eSysLanguage, m_eNumFormatLanguage;
public: public:
SwBoxAutoFormat(); SwBoxAutoFormat();
...@@ -119,63 +119,63 @@ public: ...@@ -119,63 +119,63 @@ public:
SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew ); SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew );
// The get-methods. // The get-methods.
const SvxFontItem &GetFont() const { return aFont; } const SvxFontItem &GetFont() const { return m_aFont; }
const SvxFontHeightItem &GetHeight() const { return aHeight; } const SvxFontHeightItem &GetHeight() const { return m_aHeight; }
const SvxWeightItem &GetWeight() const { return aWeight; } const SvxWeightItem &GetWeight() const { return m_aWeight; }
const SvxPostureItem &GetPosture() const { return aPosture; } const SvxPostureItem &GetPosture() const { return m_aPosture; }
const SvxFontItem &GetCJKFont() const { return aCJKFont; } const SvxFontItem &GetCJKFont() const { return m_aCJKFont; }
const SvxFontHeightItem &GetCJKHeight() const { return aCJKHeight; } const SvxFontHeightItem &GetCJKHeight() const { return m_aCJKHeight; }
const SvxWeightItem &GetCJKWeight() const { return aCJKWeight; } const SvxWeightItem &GetCJKWeight() const { return m_aCJKWeight; }
const SvxPostureItem &GetCJKPosture() const { return aCJKPosture; } const SvxPostureItem &GetCJKPosture() const { return m_aCJKPosture; }
const SvxFontItem &GetCTLFont() const { return aCTLFont; } const SvxFontItem &GetCTLFont() const { return m_aCTLFont; }
const SvxFontHeightItem &GetCTLHeight() const { return aCTLHeight; } const SvxFontHeightItem &GetCTLHeight() const { return m_aCTLHeight; }
const SvxWeightItem &GetCTLWeight() const { return aCTLWeight; } const SvxWeightItem &GetCTLWeight() const { return m_aCTLWeight; }
const SvxPostureItem &GetCTLPosture() const { return aCTLPosture; } const SvxPostureItem &GetCTLPosture() const { return m_aCTLPosture; }
const SvxUnderlineItem &GetUnderline() const { return aUnderline; } const SvxUnderlineItem &GetUnderline() const { return m_aUnderline; }
const SvxOverlineItem &GetOverline() const { return aOverline; } const SvxOverlineItem &GetOverline() const { return m_aOverline; }
const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; } const SvxCrossedOutItem &GetCrossedOut() const { return m_aCrossedOut; }
const SvxContourItem &GetContour() const { return aContour; } const SvxContourItem &GetContour() const { return m_aContour; }
const SvxShadowedItem &GetShadowed() const { return aShadowed; } const SvxShadowedItem &GetShadowed() const { return m_aShadowed; }
const SvxColorItem &GetColor() const { return aColor; } const SvxColorItem &GetColor() const { return m_aColor; }
const SvxAdjustItem &GetAdjust() const { return aAdjust; } const SvxAdjustItem &GetAdjust() const { return m_aAdjust; }
const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; } const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; }
const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; } const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
const SvxBoxItem &GetBox() const { return aBox; } const SvxBoxItem &GetBox() const { return m_aBox; }
const SvxBrushItem &GetBackground() const { return aBackground; } const SvxBrushItem &GetBackground() const { return m_aBackground; }
void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const
{ rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; } { rFormat = m_sNumFormatString; rLng = m_eNumFormatLanguage; rSys = m_eSysLanguage; }
// The set-methods. // The set-methods.
void SetFont( const SvxFontItem& rNew ) { aFont = rNew; } void SetFont( const SvxFontItem& rNew ) { m_aFont = rNew; }
void SetHeight( const SvxFontHeightItem& rNew ) { aHeight = rNew; } void SetHeight( const SvxFontHeightItem& rNew ) { m_aHeight = rNew; }
void SetWeight( const SvxWeightItem& rNew ) { aWeight = rNew; } void SetWeight( const SvxWeightItem& rNew ) { m_aWeight = rNew; }
void SetPosture( const SvxPostureItem& rNew ) { aPosture = rNew; } void SetPosture( const SvxPostureItem& rNew ) { m_aPosture = rNew; }
void SetCJKFont( const SvxFontItem& rNew ) { aCJKFont = rNew; } void SetCJKFont( const SvxFontItem& rNew ) { m_aCJKFont = rNew; }
void SetCJKHeight( const SvxFontHeightItem& rNew ) { aCJKHeight = rNew; } void SetCJKHeight( const SvxFontHeightItem& rNew ) { m_aCJKHeight = rNew; }
void SetCJKWeight( const SvxWeightItem& rNew ) { aCJKWeight = rNew; } void SetCJKWeight( const SvxWeightItem& rNew ) { m_aCJKWeight = rNew; }
void SetCJKPosture( const SvxPostureItem& rNew ) { aCJKPosture = rNew; } void SetCJKPosture( const SvxPostureItem& rNew ) { m_aCJKPosture = rNew; }
void SetCTLFont( const SvxFontItem& rNew ) { aCTLFont = rNew; } void SetCTLFont( const SvxFontItem& rNew ) { m_aCTLFont = rNew; }
void SetCTLHeight( const SvxFontHeightItem& rNew ) { aCTLHeight = rNew; } void SetCTLHeight( const SvxFontHeightItem& rNew ) { m_aCTLHeight = rNew; }
void SetCTLWeight( const SvxWeightItem& rNew ) { aCTLWeight = rNew; } void SetCTLWeight( const SvxWeightItem& rNew ) { m_aCTLWeight = rNew; }
void SetCTLPosture( const SvxPostureItem& rNew ) { aCTLPosture = rNew; } void SetCTLPosture( const SvxPostureItem& rNew ) { m_aCTLPosture = rNew; }
void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline = rNew; } void SetUnderline( const SvxUnderlineItem& rNew ) { m_aUnderline = rNew; }
void SetOverline( const SvxOverlineItem& rNew ) { aOverline = rNew; } void SetOverline( const SvxOverlineItem& rNew ) { m_aOverline = rNew; }
void SetCrossedOut( const SvxCrossedOutItem& rNew ) { aCrossedOut = rNew; } void SetCrossedOut( const SvxCrossedOutItem& rNew ) { m_aCrossedOut = rNew; }
void SetContour( const SvxContourItem& rNew ) { aContour = rNew; } void SetContour( const SvxContourItem& rNew ) { m_aContour = rNew; }
void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed = rNew; } void SetShadowed( const SvxShadowedItem& rNew ) { m_aShadowed = rNew; }
void SetColor( const SvxColorItem& rNew ) { aColor = rNew; } void SetColor( const SvxColorItem& rNew ) { m_aColor = rNew; }
void SetAdjust( const SvxAdjustItem& rNew ) void SetAdjust( const SvxAdjustItem& rNew )
{ {
aAdjust.SetAdjust( rNew.GetAdjust() ); m_aAdjust.SetAdjust( rNew.GetAdjust() );
aAdjust.SetOneWord( rNew.GetOneWord() ); m_aAdjust.SetOneWord( rNew.GetOneWord() );
aAdjust.SetLastBlock( rNew.GetLastBlock() ); m_aAdjust.SetLastBlock( rNew.GetLastBlock() );
} }
void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; } void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; }
void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; } void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; }
void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; } void SetBox( const SvxBoxItem& rNew ) { m_aBox = rNew; }
void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; } void SetBackground( const SvxBrushItem& rNew ) { m_aBackground = rNew; }
void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys ) void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys )
{ sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; } { m_sNumFormatString = rFormat; m_eNumFormatLanguage = eLng; m_eSysLanguage = eSys; }
bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer );
bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const; bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
......
sw/source/core/doc/tblafmt.cxx
Dosyayı görüntüle @ 338b6a64
...@@ -262,86 +262,86 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer ) ...@@ -262,86 +262,86 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16 nVer )
} }
SwBoxAutoFormat::SwBoxAutoFormat() SwBoxAutoFormat::SwBoxAutoFormat()
: aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ), : m_aFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_FONT )) ),
aHeight( 240, 100, RES_CHRATR_FONTSIZE ), m_aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ), m_aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ), m_aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ),
aCJKFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CJK_FONT )) ), m_aCJKFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CJK_FONT )) ),
aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ), m_aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ),
aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ), m_aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ),
aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ), m_aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ),
aCTLFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CTL_FONT )) ), m_aCTLFont( *static_cast<const SvxFontItem*>(GetDfltAttr( RES_CHRATR_CTL_FONT )) ),
aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ), m_aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ),
aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ), m_aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ),
aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ), m_aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ),
aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ), m_aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ),
aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ), m_aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ), m_aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
aContour( false, RES_CHRATR_CONTOUR ), m_aContour( false, RES_CHRATR_CONTOUR ),
aShadowed( false, RES_CHRATR_SHADOWED ), m_aShadowed( false, RES_CHRATR_SHADOWED ),
aColor( RES_CHRATR_COLOR ), m_aColor( RES_CHRATR_COLOR ),
aBox( RES_BOX ), m_aBox( RES_BOX ),
aTLBR( 0 ), m_aTLBR( 0 ),
aBLTR( 0 ), m_aBLTR( 0 ),
aBackground( RES_BACKGROUND ), m_aBackground( RES_BACKGROUND ),
aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ), m_aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
m_aTextOrientation(FRMDIR_ENVIRONMENT, RES_FRAMEDIR), m_aTextOrientation(FRMDIR_ENVIRONMENT, RES_FRAMEDIR),
m_aVerticalAlignment(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME), m_aVerticalAlignment(0, css::text::VertOrientation::NONE, css::text::RelOrientation::FRAME),
aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0), m_aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0), m_aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
aStacked( 0 ), m_aStacked( 0 ),
aMargin( 0 ), m_aMargin( 0 ),
aLinebreak( 0 ), m_aLinebreak( 0 ),
aRotateAngle( 0 ), m_aRotateAngle( 0 ),
// FIXME - add attribute IDs for the diagonal line items // FIXME - add attribute IDs for the diagonal line items
// aTLBR( RES_... ), // aTLBR( RES_... ),
// aBLTR( RES_... ), // aBLTR( RES_... ),
aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 ) m_aRotateMode( SVX_ROTATE_MODE_STANDARD, 0 )
{ {
eSysLanguage = eNumFormatLanguage = ::GetAppLanguage(); m_eSysLanguage = m_eNumFormatLanguage = ::GetAppLanguage();
aBox.SetDistance( 55 ); m_aBox.SetDistance( 55 );
} }
SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew ) SwBoxAutoFormat::SwBoxAutoFormat( const SwBoxAutoFormat& rNew )
: aFont( rNew.aFont ), : m_aFont( rNew.m_aFont ),
aHeight( rNew.aHeight ), m_aHeight( rNew.m_aHeight ),
aWeight( rNew.aWeight ), m_aWeight( rNew.m_aWeight ),
aPosture( rNew.aPosture ), m_aPosture( rNew.m_aPosture ),
aCJKFont( rNew.aCJKFont ), m_aCJKFont( rNew.m_aCJKFont ),
aCJKHeight( rNew.aCJKHeight ), m_aCJKHeight( rNew.m_aCJKHeight ),
aCJKWeight( rNew.aCJKWeight ), m_aCJKWeight( rNew.m_aCJKWeight ),
aCJKPosture( rNew.aCJKPosture ), m_aCJKPosture( rNew.m_aCJKPosture ),
aCTLFont( rNew.aCTLFont ), m_aCTLFont( rNew.m_aCTLFont ),
aCTLHeight( rNew.aCTLHeight ), m_aCTLHeight( rNew.m_aCTLHeight ),
aCTLWeight( rNew.aCTLWeight ), m_aCTLWeight( rNew.m_aCTLWeight ),
aCTLPosture( rNew.aCTLPosture ), m_aCTLPosture( rNew.m_aCTLPosture ),
aUnderline( rNew.aUnderline ), m_aUnderline( rNew.m_aUnderline ),
aOverline( rNew.aOverline ), m_aOverline( rNew.m_aOverline ),
aCrossedOut( rNew.aCrossedOut ), m_aCrossedOut( rNew.m_aCrossedOut ),
aContour( rNew.aContour ), m_aContour( rNew.m_aContour ),
aShadowed( rNew.aShadowed ), m_aShadowed( rNew.m_aShadowed ),
aColor( rNew.aColor ), m_aColor( rNew.m_aColor ),
aBox( rNew.aBox ), m_aBox( rNew.m_aBox ),
aTLBR( rNew.aTLBR ), m_aTLBR( rNew.m_aTLBR ),
aBLTR( rNew.aBLTR ), m_aBLTR( rNew.m_aBLTR ),
aBackground( rNew.aBackground ), m_aBackground( rNew.m_aBackground ),
aAdjust( rNew.aAdjust ), m_aAdjust( rNew.m_aAdjust ),
m_aTextOrientation(rNew.m_aTextOrientation), m_aTextOrientation(rNew.m_aTextOrientation),
m_aVerticalAlignment(rNew.m_aVerticalAlignment), m_aVerticalAlignment(rNew.m_aVerticalAlignment),
aHorJustify( rNew.aHorJustify ), m_aHorJustify( rNew.m_aHorJustify ),
aVerJustify( rNew.aVerJustify ), m_aVerJustify( rNew.m_aVerJustify ),
aStacked( rNew.aStacked ), m_aStacked( rNew.m_aStacked ),
aMargin( rNew.aMargin ), m_aMargin( rNew.m_aMargin ),
aLinebreak( rNew.aLinebreak ), m_aLinebreak( rNew.m_aLinebreak ),
aRotateAngle( rNew.aRotateAngle ), m_aRotateAngle( rNew.m_aRotateAngle ),
aRotateMode( rNew.aRotateMode ), m_aRotateMode( rNew.m_aRotateMode ),
sNumFormatString( rNew.sNumFormatString ), m_sNumFormatString( rNew.m_sNumFormatString ),
eSysLanguage( rNew.eSysLanguage ), m_eSysLanguage( rNew.m_eSysLanguage ),
eNumFormatLanguage( rNew.eNumFormatLanguage ) m_eNumFormatLanguage( rNew.m_eNumFormatLanguage )
{ {
} }
...@@ -351,43 +351,43 @@ SwBoxAutoFormat::~SwBoxAutoFormat() ...@@ -351,43 +351,43 @@ SwBoxAutoFormat::~SwBoxAutoFormat()
SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew ) SwBoxAutoFormat& SwBoxAutoFormat::operator=( const SwBoxAutoFormat& rNew )
{ {
aFont = rNew.aFont; m_aFont = rNew.m_aFont;
aHeight = rNew.aHeight; m_aHeight = rNew.m_aHeight;
aWeight = rNew.aWeight; m_aWeight = rNew.m_aWeight;
aPosture = rNew.aPosture; m_aPosture = rNew.m_aPosture;
aCJKFont = rNew.aCJKFont; m_aCJKFont = rNew.m_aCJKFont;
aCJKHeight = rNew.aCJKHeight; m_aCJKHeight = rNew.m_aCJKHeight;
aCJKWeight = rNew.aCJKWeight; m_aCJKWeight = rNew.m_aCJKWeight;
aCJKPosture = rNew.aCJKPosture; m_aCJKPosture = rNew.m_aCJKPosture;
aCTLFont = rNew.aCTLFont; m_aCTLFont = rNew.m_aCTLFont;
aCTLHeight = rNew.aCTLHeight; m_aCTLHeight = rNew.m_aCTLHeight;
aCTLWeight = rNew.aCTLWeight; m_aCTLWeight = rNew.m_aCTLWeight;
aCTLPosture = rNew.aCTLPosture; m_aCTLPosture = rNew.m_aCTLPosture;
aUnderline = rNew.aUnderline; m_aUnderline = rNew.m_aUnderline;
aOverline = rNew.aOverline; m_aOverline = rNew.m_aOverline;
aCrossedOut = rNew.aCrossedOut; m_aCrossedOut = rNew.m_aCrossedOut;
aContour = rNew.aContour; m_aContour = rNew.m_aContour;
aShadowed = rNew.aShadowed; m_aShadowed = rNew.m_aShadowed;
aColor = rNew.aColor; m_aColor = rNew.m_aColor;
SetAdjust( rNew.aAdjust ); SetAdjust( rNew.m_aAdjust );
m_aTextOrientation = rNew.m_aTextOrientation; m_aTextOrientation = rNew.m_aTextOrientation;
m_aVerticalAlignment = rNew.m_aVerticalAlignment; m_aVerticalAlignment = rNew.m_aVerticalAlignment;
aBox = rNew.aBox; m_aBox = rNew.m_aBox;
aTLBR = rNew.aTLBR; m_aTLBR = rNew.m_aTLBR;
aBLTR = rNew.aBLTR; m_aBLTR = rNew.m_aBLTR;
aBackground = rNew.aBackground; m_aBackground = rNew.m_aBackground;
aHorJustify = rNew.aHorJustify; m_aHorJustify = rNew.m_aHorJustify;
aVerJustify = rNew.aVerJustify; m_aVerJustify = rNew.m_aVerJustify;
aStacked.SetValue( rNew.aStacked.GetValue() ); m_aStacked.SetValue( rNew.m_aStacked.GetValue() );
aMargin = rNew.aMargin; m_aMargin = rNew.m_aMargin;
aLinebreak.SetValue( rNew.aLinebreak.GetValue() ); m_aLinebreak.SetValue( rNew.m_aLinebreak.GetValue() );
aRotateAngle.SetValue( rNew.aRotateAngle.GetValue() ); m_aRotateAngle.SetValue( rNew.m_aRotateAngle.GetValue() );
aRotateMode.SetValue( rNew.aRotateMode.GetValue() ); m_aRotateMode.SetValue( rNew.m_aRotateMode.GetValue() );
sNumFormatString = rNew.sNumFormatString; m_sNumFormatString = rNew.m_sNumFormatString;
eSysLanguage = rNew.eSysLanguage; m_eSysLanguage = rNew.m_eSysLanguage;
eNumFormatLanguage = rNew.eNumFormatLanguage; m_eNumFormatLanguage = rNew.m_eNumFormatLanguage;
return *this; return *this;
} }
...@@ -402,48 +402,48 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa ...@@ -402,48 +402,48 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa
SfxPoolItem* pNew; SfxPoolItem* pNew;
SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0); SvxOrientationItem aOrientation( SVX_ORIENTATION_STANDARD, 0);
READ( aFont, SvxFontItem , rVersions.nFontVersion) READ( m_aFont, SvxFontItem , rVersions.nFontVersion)
if( rStream.GetStreamCharSet() == aFont.GetCharSet() ) if( rStream.GetStreamCharSet() == m_aFont.GetCharSet() )
aFont.SetCharSet(::osl_getThreadTextEncoding()); m_aFont.SetCharSet(::osl_getThreadTextEncoding());
READ( aHeight, SvxFontHeightItem , rVersions.nFontHeightVersion) READ( m_aHeight, SvxFontHeightItem , rVersions.nFontHeightVersion)
READ( aWeight, SvxWeightItem , rVersions.nWeightVersion) READ( m_aWeight, SvxWeightItem , rVersions.nWeightVersion)
READ( aPosture, SvxPostureItem , rVersions.nPostureVersion) READ( m_aPosture, SvxPostureItem , rVersions.nPostureVersion)
// --- from 641 on: CJK and CTL font settings // --- from 641 on: CJK and CTL font settings
if( AUTOFORMAT_DATA_ID_641 <= nVer ) if( AUTOFORMAT_DATA_ID_641 <= nVer )
{ {
READ( aCJKFont, SvxFontItem , rVersions.nFontVersion) READ( m_aCJKFont, SvxFontItem , rVersions.nFontVersion)
READ( aCJKHeight, SvxFontHeightItem , rVersions.nFontHeightVersion) READ( m_aCJKHeight, SvxFontHeightItem , rVersions.nFontHeightVersion)
READ( aCJKWeight, SvxWeightItem , rVersions.nWeightVersion) READ( m_aCJKWeight, SvxWeightItem , rVersions.nWeightVersion)
READ( aCJKPosture, SvxPostureItem , rVersions.nPostureVersion) READ( m_aCJKPosture, SvxPostureItem , rVersions.nPostureVersion)
READ( aCTLFont, SvxFontItem , rVersions.nFontVersion) READ( m_aCTLFont, SvxFontItem , rVersions.nFontVersion)
READ( aCTLHeight, SvxFontHeightItem , rVersions.nFontHeightVersion) READ( m_aCTLHeight, SvxFontHeightItem , rVersions.nFontHeightVersion)
READ( aCTLWeight, SvxWeightItem , rVersions.nWeightVersion) READ( m_aCTLWeight, SvxWeightItem , rVersions.nWeightVersion)
READ( aCTLPosture, SvxPostureItem , rVersions.nPostureVersion) READ( m_aCTLPosture, SvxPostureItem , rVersions.nPostureVersion)
} }
READ( aUnderline, SvxUnderlineItem , rVersions.nUnderlineVersion) READ( m_aUnderline, SvxUnderlineItem , rVersions.nUnderlineVersion)
if( nVer >= AUTOFORMAT_DATA_ID_300OVRLN ) if( nVer >= AUTOFORMAT_DATA_ID_300OVRLN )
{ {
READ( aOverline, SvxOverlineItem , rVersions.nOverlineVersion) READ( m_aOverline, SvxOverlineItem , rVersions.nOverlineVersion)
} }
READ( aCrossedOut, SvxCrossedOutItem , rVersions.nCrossedOutVersion) READ( m_aCrossedOut, SvxCrossedOutItem , rVersions.nCrossedOutVersion)
READ( aContour, SvxContourItem , rVersions.nContourVersion) READ( m_aContour, SvxContourItem , rVersions.nContourVersion)
READ( aShadowed, SvxShadowedItem , rVersions.nShadowedVersion) READ( m_aShadowed, SvxShadowedItem , rVersions.nShadowedVersion)
READ( aColor, SvxColorItem , rVersions.nColorVersion) READ( m_aColor, SvxColorItem , rVersions.nColorVersion)
READ( aBox, SvxBoxItem , rVersions.nBoxVersion) READ( m_aBox, SvxBoxItem , rVersions.nBoxVersion)
// --- from 680/dr14 on: diagonal frame lines // --- from 680/dr14 on: diagonal frame lines
if( nVer >= AUTOFORMAT_DATA_ID_680DR14 ) if( nVer >= AUTOFORMAT_DATA_ID_680DR14 )
{ {
READ( aTLBR, SvxLineItem, rVersions.nLineVersion) READ( m_aTLBR, SvxLineItem, rVersions.nLineVersion)
READ( aBLTR, SvxLineItem, rVersions.nLineVersion) READ( m_aBLTR, SvxLineItem, rVersions.nLineVersion)
} }
READ( aBackground, SvxBrushItem , rVersions.nBrushVersion) READ( m_aBackground, SvxBrushItem , rVersions.nBrushVersion)
pNew = aAdjust.Create(rStream, rVersions.nAdjustVersion ); pNew = m_aAdjust.Create(rStream, rVersions.nAdjustVersion );
SetAdjust( *static_cast<SvxAdjustItem*>(pNew) ); SetAdjust( *static_cast<SvxAdjustItem*>(pNew) );
delete pNew; delete pNew;
...@@ -453,23 +453,23 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa ...@@ -453,23 +453,23 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa
READ(m_aVerticalAlignment, SwFormatVertOrient, rVersions.m_nVerticalAlignmentVersion); READ(m_aVerticalAlignment, SwFormatVertOrient, rVersions.m_nVerticalAlignmentVersion);
} }
READ( aHorJustify, SvxHorJustifyItem , rVersions.nHorJustifyVersion) READ( m_aHorJustify, SvxHorJustifyItem , rVersions.nHorJustifyVersion)
READ( aVerJustify, SvxVerJustifyItem , rVersions.nVerJustifyVersion) READ( m_aVerJustify, SvxVerJustifyItem , rVersions.nVerJustifyVersion)
READ( aOrientation, SvxOrientationItem , rVersions.nOrientationVersion) READ( aOrientation, SvxOrientationItem , rVersions.nOrientationVersion)
READ( aMargin, SvxMarginItem , rVersions.nMarginVersion) READ( m_aMargin, SvxMarginItem , rVersions.nMarginVersion)
pNew = aLinebreak.Create(rStream, rVersions.nBoolVersion ); pNew = m_aLinebreak.Create(rStream, rVersions.nBoolVersion );
aLinebreak.SetValue( static_cast<SfxBoolItem*>(pNew)->GetValue() ); m_aLinebreak.SetValue( static_cast<SfxBoolItem*>(pNew)->GetValue() );
delete pNew; delete pNew;
if ( nVer >= AUTOFORMAT_DATA_ID_504 ) if ( nVer >= AUTOFORMAT_DATA_ID_504 )
{ {
pNew = aRotateAngle.Create( rStream, rVersions.nInt32Version ); pNew = m_aRotateAngle.Create( rStream, rVersions.nInt32Version );
aRotateAngle.SetValue( static_cast<SfxInt32Item*>(pNew)->GetValue() ); m_aRotateAngle.SetValue( static_cast<SfxInt32Item*>(pNew)->GetValue() );
delete pNew; delete pNew;
pNew = aRotateMode.Create( rStream, rVersions.nRotateModeVersion ); pNew = m_aRotateMode.Create( rStream, rVersions.nRotateModeVersion );
aRotateMode.SetValue( static_cast<SvxRotateModeItem*>(pNew)->GetValue() ); m_aRotateMode.SetValue( static_cast<SvxRotateModeItem*>(pNew)->GetValue() );
delete pNew; delete pNew;
} }
...@@ -478,48 +478,48 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa ...@@ -478,48 +478,48 @@ bool SwBoxAutoFormat::Load( SvStream& rStream, const SwAfVersions& rVersions, sa
sal_uInt16 eSys, eLge; sal_uInt16 eSys, eLge;
// --- from 680/dr25 on: store strings as UTF-8 // --- from 680/dr25 on: store strings as UTF-8
rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet(); rtl_TextEncoding eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
sNumFormatString = rStream.ReadUniOrByteString( eCharSet ); m_sNumFormatString = rStream.ReadUniOrByteString( eCharSet );
rStream.ReadUInt16( eSys ).ReadUInt16( eLge ); rStream.ReadUInt16( eSys ).ReadUInt16( eLge );
eSysLanguage = (LanguageType) eSys; m_eSysLanguage = (LanguageType) eSys;
eNumFormatLanguage = (LanguageType) eLge; m_eNumFormatLanguage = (LanguageType) eLge;
if ( eSysLanguage == LANGUAGE_SYSTEM ) // from old versions (Calc) if ( m_eSysLanguage == LANGUAGE_SYSTEM ) // from old versions (Calc)
eSysLanguage = ::GetAppLanguage(); m_eSysLanguage = ::GetAppLanguage();
} }
aStacked.SetValue( aOrientation.IsStacked() ); m_aStacked.SetValue( aOrientation.IsStacked() );
aRotateAngle.SetValue( aOrientation.GetRotation( aRotateAngle.GetValue() ) ); m_aRotateAngle.SetValue( aOrientation.GetRotation( m_aRotateAngle.GetValue() ) );
return 0 == rStream.GetError(); return 0 == rStream.GetError();
} }
bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
{ {
SvxOrientationItem aOrientation( aRotateAngle.GetValue(), aStacked.GetValue(), 0 ); SvxOrientationItem aOrientation( m_aRotateAngle.GetValue(), m_aStacked.GetValue(), 0 );
aFont.Store( rStream, aFont.GetVersion(fileVersion) ); m_aFont.Store( rStream, m_aFont.GetVersion(fileVersion) );
aHeight.Store( rStream, aHeight.GetVersion(fileVersion) ); m_aHeight.Store( rStream, m_aHeight.GetVersion(fileVersion) );
aWeight.Store( rStream, aWeight.GetVersion(fileVersion) ); m_aWeight.Store( rStream, m_aWeight.GetVersion(fileVersion) );
aPosture.Store( rStream, aPosture.GetVersion(fileVersion) ); m_aPosture.Store( rStream, m_aPosture.GetVersion(fileVersion) );
aCJKFont.Store( rStream, aCJKFont.GetVersion(fileVersion) ); m_aCJKFont.Store( rStream, m_aCJKFont.GetVersion(fileVersion) );
aCJKHeight.Store( rStream, aCJKHeight.GetVersion(fileVersion) ); m_aCJKHeight.Store( rStream, m_aCJKHeight.GetVersion(fileVersion) );
aCJKWeight.Store( rStream, aCJKWeight.GetVersion(fileVersion) ); m_aCJKWeight.Store( rStream, m_aCJKWeight.GetVersion(fileVersion) );
aCJKPosture.Store( rStream, aCJKPosture.GetVersion(fileVersion) ); m_aCJKPosture.Store( rStream, m_aCJKPosture.GetVersion(fileVersion) );
aCTLFont.Store( rStream, aCTLFont.GetVersion(fileVersion) ); m_aCTLFont.Store( rStream, m_aCTLFont.GetVersion(fileVersion) );
aCTLHeight.Store( rStream, aCTLHeight.GetVersion(fileVersion) ); m_aCTLHeight.Store( rStream, m_aCTLHeight.GetVersion(fileVersion) );
aCTLWeight.Store( rStream, aCTLWeight.GetVersion(fileVersion) ); m_aCTLWeight.Store( rStream, m_aCTLWeight.GetVersion(fileVersion) );
aCTLPosture.Store( rStream, aCTLPosture.GetVersion(fileVersion) ); m_aCTLPosture.Store( rStream, m_aCTLPosture.GetVersion(fileVersion) );
aUnderline.Store( rStream, aUnderline.GetVersion(fileVersion) ); m_aUnderline.Store( rStream, m_aUnderline.GetVersion(fileVersion) );
aOverline.Store( rStream, aOverline.GetVersion(fileVersion) ); m_aOverline.Store( rStream, m_aOverline.GetVersion(fileVersion) );
aCrossedOut.Store( rStream, aCrossedOut.GetVersion(fileVersion) ); m_aCrossedOut.Store( rStream, m_aCrossedOut.GetVersion(fileVersion) );
aContour.Store( rStream, aContour.GetVersion(fileVersion) ); m_aContour.Store( rStream, m_aContour.GetVersion(fileVersion) );
aShadowed.Store( rStream, aShadowed.GetVersion(fileVersion) ); m_aShadowed.Store( rStream, m_aShadowed.GetVersion(fileVersion) );
aColor.Store( rStream, aColor.GetVersion(fileVersion) ); m_aColor.Store( rStream, m_aColor.GetVersion(fileVersion) );
aBox.Store( rStream, aBox.GetVersion(fileVersion) ); m_aBox.Store( rStream, m_aBox.GetVersion(fileVersion) );
aTLBR.Store( rStream, aTLBR.GetVersion(fileVersion) ); m_aTLBR.Store( rStream, m_aTLBR.GetVersion(fileVersion) );
aBLTR.Store( rStream, aBLTR.GetVersion(fileVersion) ); m_aBLTR.Store( rStream, m_aBLTR.GetVersion(fileVersion) );
aBackground.Store( rStream, aBackground.GetVersion(fileVersion) ); m_aBackground.Store( rStream, m_aBackground.GetVersion(fileVersion) );
aAdjust.Store( rStream, aAdjust.GetVersion(fileVersion) ); m_aAdjust.Store( rStream, m_aAdjust.GetVersion(fileVersion) );
if (fileVersion >= SOFFICE_FILEFORMAT_50) if (fileVersion >= SOFFICE_FILEFORMAT_50)
{ {
WriterSpecificAutoFormatBlock block(rStream); WriterSpecificAutoFormatBlock block(rStream);
...@@ -528,40 +528,40 @@ bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const ...@@ -528,40 +528,40 @@ bool SwBoxAutoFormat::Save( SvStream& rStream, sal_uInt16 fileVersion ) const
m_aVerticalAlignment.Store(rStream, m_aVerticalAlignment.GetVersion(fileVersion)); m_aVerticalAlignment.Store(rStream, m_aVerticalAlignment.GetVersion(fileVersion));
} }
aHorJustify.Store( rStream, aHorJustify.GetVersion(fileVersion) ); m_aHorJustify.Store( rStream, m_aHorJustify.GetVersion(fileVersion) );
aVerJustify.Store( rStream, aVerJustify.GetVersion(fileVersion) ); m_aVerJustify.Store( rStream, m_aVerJustify.GetVersion(fileVersion) );
aOrientation.Store( rStream, aOrientation.GetVersion(fileVersion) ); aOrientation.Store( rStream, aOrientation.GetVersion(fileVersion) );
aMargin.Store( rStream, aMargin.GetVersion(fileVersion) ); m_aMargin.Store( rStream, m_aMargin.GetVersion(fileVersion) );
aLinebreak.Store( rStream, aLinebreak.GetVersion(fileVersion) ); m_aLinebreak.Store( rStream, m_aLinebreak.GetVersion(fileVersion) );
// Calc Rotation from SO5 // Calc Rotation from SO5
aRotateAngle.Store( rStream, aRotateAngle.GetVersion(fileVersion) ); m_aRotateAngle.Store( rStream, m_aRotateAngle.GetVersion(fileVersion) );
aRotateMode.Store( rStream, aRotateMode.GetVersion(fileVersion) ); m_aRotateMode.Store( rStream, m_aRotateMode.GetVersion(fileVersion) );
// --- from 680/dr25 on: store strings as UTF-8 // --- from 680/dr25 on: store strings as UTF-8
write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, sNumFormatString, write_uInt16_lenPrefixed_uInt8s_FromOUString(rStream, m_sNumFormatString,
RTL_TEXTENCODING_UTF8); RTL_TEXTENCODING_UTF8);
rStream.WriteUInt16( eSysLanguage ).WriteUInt16( eNumFormatLanguage ); rStream.WriteUInt16( m_eSysLanguage ).WriteUInt16( m_eNumFormatLanguage );
return 0 == rStream.GetError(); return 0 == rStream.GetError();
} }
bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) const
{ {
rStream.WriteUInt16( aFont.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aFont.GetVersion( fileVersion ) );
rStream.WriteUInt16( aHeight.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aHeight.GetVersion( fileVersion ) );
rStream.WriteUInt16( aWeight.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aWeight.GetVersion( fileVersion ) );
rStream.WriteUInt16( aPosture.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aPosture.GetVersion( fileVersion ) );
rStream.WriteUInt16( aUnderline.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aUnderline.GetVersion( fileVersion ) );
rStream.WriteUInt16( aOverline.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aOverline.GetVersion( fileVersion ) );
rStream.WriteUInt16( aCrossedOut.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aCrossedOut.GetVersion( fileVersion ) );
rStream.WriteUInt16( aContour.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aContour.GetVersion( fileVersion ) );
rStream.WriteUInt16( aShadowed.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aShadowed.GetVersion( fileVersion ) );
rStream.WriteUInt16( aColor.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aColor.GetVersion( fileVersion ) );
rStream.WriteUInt16( aBox.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aBox.GetVersion( fileVersion ) );
rStream.WriteUInt16( aTLBR.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aTLBR.GetVersion( fileVersion ) );
rStream.WriteUInt16( aBackground.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aBackground.GetVersion( fileVersion ) );
rStream.WriteUInt16( aAdjust.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aAdjust.GetVersion( fileVersion ) );
if (fileVersion >= SOFFICE_FILEFORMAT_50) if (fileVersion >= SOFFICE_FILEFORMAT_50)
{ {
...@@ -571,13 +571,13 @@ bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion ) ...@@ -571,13 +571,13 @@ bool SwBoxAutoFormat::SaveVersionNo( SvStream& rStream, sal_uInt16 fileVersion )
rStream.WriteUInt16( m_aVerticalAlignment.GetVersion(fileVersion) ); rStream.WriteUInt16( m_aVerticalAlignment.GetVersion(fileVersion) );
} }
rStream.WriteUInt16( aHorJustify.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aHorJustify.GetVersion( fileVersion ) );
rStream.WriteUInt16( aVerJustify.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aVerJustify.GetVersion( fileVersion ) );
rStream.WriteUInt16( SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion( fileVersion ) ); rStream.WriteUInt16( SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0).GetVersion( fileVersion ) );
rStream.WriteUInt16( aMargin.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aMargin.GetVersion( fileVersion ) );
rStream.WriteUInt16( aLinebreak.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aLinebreak.GetVersion( fileVersion ) );
rStream.WriteUInt16( aRotateAngle.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aRotateAngle.GetVersion( fileVersion ) );
rStream.WriteUInt16( aRotateMode.GetVersion( fileVersion ) ); rStream.WriteUInt16( m_aRotateMode.GetVersion( fileVersion ) );
rStream.WriteUInt16( 0 ); // NumberFormat rStream.WriteUInt16( 0 ); // NumberFormat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment