This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 7114c7e99d Fixed typo (verion -> version)
7114c7e99d is described below
commit 7114c7e99dcacf0a9eba20789243ba2b7ccd66b5
Author: mseidel <[email protected]>
AuthorDate: Fri Nov 18 19:42:38 2022 +0100
Fixed typo (verion -> version)
(cherry picked from commit 19a3086207e35c2ffd5d7a35076320505cf276f1)
---
main/sw/inc/tblafmt.hxx | 159 ++++++++++++++++++------------------
main/sw/source/core/doc/tblafmt.cxx | 139 +++++++++++++++----------------
2 files changed, 147 insertions(+), 151 deletions(-)
diff --git a/main/sw/inc/tblafmt.hxx b/main/sw/inc/tblafmt.hxx
index b478180a16..aa27ed20a3 100644
--- a/main/sw/inc/tblafmt.hxx
+++ b/main/sw/inc/tblafmt.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#ifndef _TBLAFMT_HXX
#define _TBLAFMT_HXX
/*************************************************************************
@@ -28,14 +29,14 @@
JP 20.07.95:
Die akt. Struktur der Autoformatierung darf nicht mehr veraendert
werden.
- Diese wird durch unterschiedlichen Code vom StartWriter und vom StarCalc
+ Diese wird durch unterschiedlichen Code von Writer und Calc
eingelesen/geschrieben.
- Sollte sich doch mal eine Aenderung nicht vermeiden lassen, dann auf
- jedenfall in beiden Applikationen aendern.
+ Sollte sich doch mal eine Änderung nicht vermeiden lassen, dann auf
+ jeden Fall in beiden Applikationen ändern.
- The structure of table auto formatting should not changed. It is used
- by different code of Writer and Calc. If a change is necessary, the
- source code of both applications must be changed!
+ The structure of table auto formatting should not changed. It is used
+ by different code of Writer and Calc. If a change is necessary, the
+ source code of both applications must be changed!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
**************************************************************************/
@@ -68,22 +69,22 @@ class SvNumberFormatter;
class SwBoxAutoFmt
{
- // common attributes of Calc and Writer
- // --- from 641 on: CJK and CTL font settings
- SvxFontItem aFont;
- SvxFontHeightItem aHeight;
- SvxWeightItem aWeight;
- SvxPostureItem aPosture;
-
- SvxFontItem aCJKFont;
- SvxFontHeightItem aCJKHeight;
- SvxWeightItem aCJKWeight;
- SvxPostureItem aCJKPosture;
-
- SvxFontItem aCTLFont;
- SvxFontHeightItem aCTLHeight;
- SvxWeightItem aCTLWeight;
- SvxPostureItem aCTLPosture;
+ // common attributes of Calc and Writer
+ // --- from 641 on: CJK and CTL font settings
+ SvxFontItem aFont;
+ SvxFontHeightItem aHeight;
+ SvxWeightItem aWeight;
+ SvxPostureItem aPosture;
+
+ SvxFontItem aCJKFont;
+ SvxFontHeightItem aCJKHeight;
+ SvxWeightItem aCJKWeight;
+ SvxPostureItem aCJKPosture;
+
+ SvxFontItem aCTLFont;
+ SvxFontHeightItem aCTLHeight;
+ SvxWeightItem aCTLWeight;
+ SvxPostureItem aCTLPosture;
SvxUnderlineItem aUnderline;
SvxOverlineItem aOverline;
@@ -92,23 +93,23 @@ class SwBoxAutoFmt
SvxShadowedItem aShadowed;
SvxColorItem aColor;
SvxBoxItem aBox;
- SvxLineItem aTLBR;
- SvxLineItem aBLTR;
+ SvxLineItem aTLBR;
+ SvxLineItem aBLTR;
SvxBrushItem aBackground;
- // Writer specific
+ // Writer specific
SvxAdjustItem aAdjust;
- // Calc specific
+ // Calc specific
SvxHorJustifyItem aHorJustify;
SvxVerJustifyItem aVerJustify;
- SfxBoolItem aStacked;
+ SfxBoolItem aStacked;
SvxMarginItem aMargin;
SfxBoolItem aLinebreak;
SfxInt32Item aRotateAngle;
SvxRotateModeItem aRotateMode;
- // number format
+ // number format
String sNumFmtString;
LanguageType eSysLanguage, eNumFmtLanguage;
@@ -122,64 +123,64 @@ public:
// die Get-Methoden
const SvxFontItem &GetFont() const {
return aFont; }
- const SvxFontHeightItem &GetHeight() const { return
aHeight; }
- const SvxWeightItem &GetWeight() const {
return aWeight; }
- const SvxPostureItem &GetPosture() const { return aPosture; }
- const SvxFontItem &GetCJKFont() const { return aCJKFont; }
- const SvxFontHeightItem &GetCJKHeight() const { return aCJKHeight; }
- const SvxWeightItem &GetCJKWeight() const { return aCJKWeight; }
- const SvxPostureItem &GetCJKPosture() const { return aCJKPosture; }
- const SvxFontItem &GetCTLFont() const { return aCTLFont; }
- const SvxFontHeightItem &GetCTLHeight() const { return aCTLHeight; }
- const SvxWeightItem &GetCTLWeight() const { return aCTLWeight; }
- const SvxPostureItem &GetCTLPosture() const { return aCTLPosture; }
- const SvxUnderlineItem &GetUnderline() const { return aUnderline; }
- const SvxOverlineItem &GetOverline() const { return aOverline; }
- const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; }
- const SvxContourItem &GetContour() const { return aContour; }
- const SvxShadowedItem &GetShadowed() const { return aShadowed; }
- const SvxColorItem &GetColor() const {
return aColor; }
+ const SvxFontHeightItem &GetHeight() const { return
aHeight; }
+ const SvxWeightItem &GetWeight() const {
return aWeight; }
+ const SvxPostureItem &GetPosture() const { return
aPosture; }
+ const SvxFontItem &GetCJKFont() const {
return aCJKFont; }
+ const SvxFontHeightItem &GetCJKHeight() const { return aCJKHeight; }
+ const SvxWeightItem &GetCJKWeight() const { return
aCJKWeight; }
+ const SvxPostureItem &GetCJKPosture() const { return aCJKPosture; }
+ const SvxFontItem &GetCTLFont() const {
return aCTLFont; }
+ const SvxFontHeightItem &GetCTLHeight() const { return aCTLHeight; }
+ const SvxWeightItem &GetCTLWeight() const { return
aCTLWeight; }
+ const SvxPostureItem &GetCTLPosture() const { return aCTLPosture; }
+ const SvxUnderlineItem &GetUnderline() const { return aUnderline; }
+ const SvxOverlineItem &GetOverline() const { return aOverline; }
+ const SvxCrossedOutItem &GetCrossedOut() const { return aCrossedOut; }
+ const SvxContourItem &GetContour() const { return
aContour; }
+ const SvxShadowedItem &GetShadowed() const { return aShadowed; }
+ const SvxColorItem &GetColor() const {
return aColor; }
const SvxAdjustItem &GetAdjust() const {
return aAdjust; }
- const SvxBoxItem &GetBox() const {
return aBox; }
- const SvxLineItem &GetTLBR() const { return aTLBR; }
- const SvxLineItem &GetBLTR() const { return aBLTR; }
- const SvxBrushItem &GetBackground() const { return
aBackground; }
+ const SvxBoxItem &GetBox() const {
return aBox; }
+ const SvxLineItem &GetTLBR() const {
return aTLBR; }
+ const SvxLineItem &GetBLTR() const {
return aBLTR; }
+ const SvxBrushItem &GetBackground() const { return
aBackground; }
void GetValueFormat( String& rFmt, LanguageType& rLng, LanguageType&
rSys ) const
{ rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys =
eSysLanguage; }
// die SetMethoden
- void SetFont( const SvxFontItem& rNew ) { aFont
= rNew; }
- void SetHeight( const SvxFontHeightItem& rNew ) { aHeight =
rNew; }
- void SetWeight( const SvxWeightItem& rNew ) { aWeight =
rNew; }
- void SetPosture( const SvxPostureItem& rNew ) { aPosture =
rNew; }
- void SetCJKFont( const SvxFontItem& rNew ) { aCJKFont = rNew; }
- void SetCJKHeight( const SvxFontHeightItem& rNew ) { aCJKHeight = rNew; }
- void SetCJKWeight( const SvxWeightItem& rNew ) { aCJKWeight = rNew; }
- void SetCJKPosture( const SvxPostureItem& rNew ) { aCJKPosture = rNew; }
- void SetCTLFont( const SvxFontItem& rNew ) { aCTLFont = rNew; }
- void SetCTLHeight( const SvxFontHeightItem& rNew ) { aCTLHeight = rNew; }
- void SetCTLWeight( const SvxWeightItem& rNew ) { aCTLWeight = rNew; }
- void SetCTLPosture( const SvxPostureItem& rNew ) { aCTLPosture = rNew; }
- void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline =
rNew; }
- void SetOverline( const SvxOverlineItem& rNew ) { aOverline =
rNew; }
+ void SetFont( const SvxFontItem& rNew ) { aFont
= rNew; }
+ void SetHeight( const SvxFontHeightItem& rNew ) { aHeight =
rNew; }
+ void SetWeight( const SvxWeightItem& rNew ) {
aWeight = rNew; }
+ void SetPosture( const SvxPostureItem& rNew ) { aPosture =
rNew; }
+ void SetCJKFont( const SvxFontItem& rNew ) {
aCJKFont = rNew; }
+ void SetCJKHeight( const SvxFontHeightItem& rNew ) { aCJKHeight =
rNew; }
+ void SetCJKWeight( const SvxWeightItem& rNew ) { aCJKWeight =
rNew; }
+ void SetCJKPosture( const SvxPostureItem& rNew ) { aCJKPosture =
rNew; }
+ void SetCTLFont( const SvxFontItem& rNew ) {
aCTLFont = rNew; }
+ void SetCTLHeight( const SvxFontHeightItem& rNew ) { aCTLHeight =
rNew; }
+ void SetCTLWeight( const SvxWeightItem& rNew ) { aCTLWeight =
rNew; }
+ void SetCTLPosture( const SvxPostureItem& rNew ) { aCTLPosture =
rNew; }
+ void SetUnderline( const SvxUnderlineItem& rNew ) { aUnderline =
rNew; }
+ void SetOverline( const SvxOverlineItem& rNew ) { aOverline =
rNew; }
void SetCrossedOut( const SvxCrossedOutItem& rNew ) { aCrossedOut =
rNew; }
- void SetContour( const SvxContourItem& rNew ) { aContour =
rNew; }
- void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed =
rNew; }
- void SetColor( const SvxColorItem& rNew ) {
aColor = rNew; }
+ void SetContour( const SvxContourItem& rNew ) { aContour =
rNew; }
+ void SetShadowed( const SvxShadowedItem& rNew ) { aShadowed =
rNew; }
+ void SetColor( const SvxColorItem& rNew ) {
aColor = rNew; }
void SetAdjust( const SvxAdjustItem& rNew )
{
aAdjust.SetAdjust( rNew.GetAdjust() );
aAdjust.SetOneWord( rNew.GetOneWord() );
aAdjust.SetLastBlock( rNew.GetLastBlock() );
}
- void SetBox( const SvxBoxItem& rNew ) { aBox
= rNew; }
- void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; }
+ void SetBox( const SvxBoxItem& rNew ) { aBox
= rNew; }
+ void SetBackground( const SvxBrushItem& rNew ) { aBackground =
rNew; }
void SetValueFormat( const String& rFmt, LanguageType eLng,
LanguageType eSys )
{ sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage =
eSys; }
sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions,
sal_uInt16 nVer );
sal_Bool Save( SvStream& rStream ) const;
- sal_Bool SaveVerionNo( SvStream& rStream ) const;
+ sal_Bool SaveVersionNo( SvStream& rStream ) const;
#ifdef READ_OLDVERS
// lade alte Version
@@ -195,14 +196,14 @@ class SW_DLLPUBLIC SwTableAutoFmt
String aName;
sal_uInt16 nStrResId;
- // common flags of Calc and Writer
+ // common flags of Calc and Writer
sal_Bool bInclFont : 1;
sal_Bool bInclJustify : 1;
sal_Bool bInclFrame : 1;
sal_Bool bInclBackground : 1;
sal_Bool bInclValueFormat : 1;
- // Calc specific flags
+ // Calc specific flags
sal_Bool bInclWidthHeight : 1;
SwBoxAutoFmt* aBoxAutoFmt[ 16 ];
@@ -226,14 +227,14 @@ public:
void UpdateToSet( sal_uInt8 nPos, SfxItemSet& rSet, UpdateFlags eFlags,
SvNumberFormatter* ) const ;
- sal_Bool IsFont() const { return bInclFont; }
- sal_Bool IsJustify() const { return bInclJustify; }
- sal_Bool IsFrame() const { return bInclFrame; }
+ sal_Bool IsFont() const { return bInclFont; }
+ sal_Bool IsJustify() const { return bInclJustify; }
+ sal_Bool IsFrame() const { return bInclFrame; }
sal_Bool IsBackground() const { return bInclBackground; }
sal_Bool IsValueFormat() const { return bInclValueFormat; }
void SetFont( const sal_Bool bNew ) { bInclFont =
bNew; }
- void SetJustify( const sal_Bool bNew ) { bInclJustify = bNew; }
+ void SetJustify( const sal_Bool bNew ) { bInclJustify = bNew; }
void SetFrame( const sal_Bool bNew ) { bInclFrame = bNew; }
void SetBackground( const sal_Bool bNew ) { bInclBackground =
bNew; }
void SetValueFormat( const sal_Bool bNew ) { bInclValueFormat =
bNew; }
diff --git a/main/sw/source/core/doc/tblafmt.cxx
b/main/sw/source/core/doc/tblafmt.cxx
index fd6c47f166..aefa8ec6bc 100644
--- a/main/sw/source/core/doc/tblafmt.cxx
+++ b/main/sw/source/core/doc/tblafmt.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -113,7 +113,7 @@ public:
sal_uInt16 nShadowedVersion;
sal_uInt16 nColorVersion;
sal_uInt16 nBoxVersion;
- sal_uInt16 nLineVersion;
+ sal_uInt16 nLineVersion;
sal_uInt16 nBrushVersion;
sal_uInt16 nAdjustVersion;
@@ -144,7 +144,7 @@ SwAfVersions::SwAfVersions() :
nShadowedVersion(0),
nColorVersion(0),
nBoxVersion(0),
- nLineVersion(0),
+ nLineVersion(0),
nBrushVersion(0),
nAdjustVersion(0),
nHorJustifyVersion(0),
@@ -165,15 +165,15 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16
nVer )
rStream >> nWeightVersion;
rStream >> nPostureVersion;
rStream >> nUnderlineVersion;
- if ( nVer >= AUTOFORMAT_ID_300OVRLN )
- rStream >> nOverlineVersion;
+ if ( nVer >= AUTOFORMAT_ID_300OVRLN )
+ rStream >> nOverlineVersion;
rStream >> nCrossedOutVersion;
rStream >> nContourVersion;
rStream >> nShadowedVersion;
rStream >> nColorVersion;
rStream >> nBoxVersion;
- if ( nVer >= AUTOFORMAT_ID_680DR14 )
- rStream >> nLineVersion;
+ if ( nVer >= AUTOFORMAT_ID_680DR14 )
+ rStream >> nLineVersion;
rStream >> nBrushVersion;
rStream >> nAdjustVersion;
rStream >> nHorJustifyVersion;
@@ -193,37 +193,37 @@ void SwAfVersions::Load( SvStream& rStream, sal_uInt16
nVer )
SwBoxAutoFmt::SwBoxAutoFmt()
: aFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) ),
- aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
- aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
- aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ),
-
- aCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) ),
- aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ),
- aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ),
- aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ),
-
- aCTLFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CTL_FONT ) ),
- aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ),
- aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ),
- aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ),
-
- aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ),
- aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
- aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
- aContour( sal_False, RES_CHRATR_CONTOUR ),
- aShadowed( sal_False, RES_CHRATR_SHADOWED ),
- aColor( RES_CHRATR_COLOR ),
- aBox( RES_BOX ),
- aTLBR( 0 ),
- aBLTR( 0 ),
- aBackground( RES_BACKGROUND ),
- aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
- aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
- aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
- aStacked( 0 ),
- aMargin( 0 ),
- aLinebreak( 0 ),
- aRotateAngle( 0 ),
+ aHeight( 240, 100, RES_CHRATR_FONTSIZE ),
+ aWeight( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ),
+ aPosture( ITALIC_NONE, RES_CHRATR_POSTURE ),
+
+ aCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) ),
+ aCJKHeight( 240, 100, RES_CHRATR_CJK_FONTSIZE ),
+ aCJKWeight( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ),
+ aCJKPosture( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ),
+
+ aCTLFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CTL_FONT ) ),
+ aCTLHeight( 240, 100, RES_CHRATR_CTL_FONTSIZE ),
+ aCTLWeight( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ),
+ aCTLPosture( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ),
+
+ aUnderline( UNDERLINE_NONE, RES_CHRATR_UNDERLINE ),
+ aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
+ aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
+ aContour( sal_False, RES_CHRATR_CONTOUR ),
+ aShadowed( sal_False, RES_CHRATR_SHADOWED ),
+ aColor( RES_CHRATR_COLOR ),
+ aBox( RES_BOX ),
+ aTLBR( 0 ),
+ aBLTR( 0 ),
+ aBackground( RES_BACKGROUND ),
+ aAdjust( SVX_ADJUST_LEFT, RES_PARATR_ADJUST ),
+ aHorJustify( SVX_HOR_JUSTIFY_STANDARD, 0),
+ aVerJustify( SVX_VER_JUSTIFY_STANDARD, 0),
+ aStacked( 0 ),
+ aMargin( 0 ),
+ aLinebreak( 0 ),
+ aRotateAngle( 0 ),
// FIXME - add attribute IDs for the diagonal line items
// aTLBR( RES_... ),
@@ -240,14 +240,14 @@ SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
aHeight( rNew.aHeight ),
aWeight( rNew.aWeight ),
aPosture( rNew.aPosture ),
- aCJKFont( rNew.aCJKFont ),
- aCJKHeight( rNew.aCJKHeight ),
- aCJKWeight( rNew.aCJKWeight ),
- aCJKPosture( rNew.aCJKPosture ),
- aCTLFont( rNew.aCTLFont ),
- aCTLHeight( rNew.aCTLHeight ),
- aCTLWeight( rNew.aCTLWeight ),
- aCTLPosture( rNew.aCTLPosture ),
+ aCJKFont( rNew.aCJKFont ),
+ aCJKHeight( rNew.aCJKHeight ),
+ aCJKWeight( rNew.aCJKWeight ),
+ aCJKPosture( rNew.aCJKPosture ),
+ aCTLFont( rNew.aCTLFont ),
+ aCTLHeight( rNew.aCTLHeight ),
+ aCTLWeight( rNew.aCTLWeight ),
+ aCTLPosture( rNew.aCTLPosture ),
aUnderline( rNew.aUnderline ),
aOverline( rNew.aOverline ),
aCrossedOut( rNew.aCrossedOut ),
@@ -255,13 +255,13 @@ SwBoxAutoFmt::SwBoxAutoFmt( const SwBoxAutoFmt& rNew )
aShadowed( rNew.aShadowed ),
aColor( rNew.aColor ),
aBox( rNew.aBox ),
- aTLBR( rNew.aTLBR ),
- aBLTR( rNew.aBLTR ),
+ aTLBR( rNew.aTLBR ),
+ aBLTR( rNew.aBLTR ),
aBackground( rNew.aBackground ),
aAdjust( rNew.aAdjust ),
aHorJustify( rNew.aHorJustify ),
aVerJustify( rNew.aVerJustify ),
- aStacked( rNew.aStacked ),
+ aStacked( rNew.aStacked ),
aMargin( rNew.aMargin ),
aLinebreak( rNew.aLinebreak ),
aRotateAngle( rNew.aRotateAngle ),
@@ -283,14 +283,14 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const
SwBoxAutoFmt& rNew )
aHeight = rNew.aHeight;
aWeight = rNew.aWeight;
aPosture = rNew.aPosture;
- aCJKFont = rNew.aCJKFont;
- aCJKHeight = rNew.aCJKHeight;
- aCJKWeight = rNew.aCJKWeight;
- aCJKPosture = rNew.aCJKPosture;
- aCTLFont = rNew.aCTLFont;
- aCTLHeight = rNew.aCTLHeight;
- aCTLWeight = rNew.aCTLWeight;
- aCTLPosture = rNew.aCTLPosture;
+ aCJKFont = rNew.aCJKFont;
+ aCJKHeight = rNew.aCJKHeight;
+ aCJKWeight = rNew.aCJKWeight;
+ aCJKPosture = rNew.aCJKPosture;
+ aCTLFont = rNew.aCTLFont;
+ aCTLHeight = rNew.aCTLHeight;
+ aCTLWeight = rNew.aCTLWeight;
+ aCTLPosture = rNew.aCTLPosture;
aUnderline = rNew.aUnderline;
aOverline = rNew.aOverline;
aCrossedOut = rNew.aCrossedOut;
@@ -299,13 +299,13 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const
SwBoxAutoFmt& rNew )
aColor = rNew.aColor;
SetAdjust( rNew.aAdjust );
aBox = rNew.aBox;
- aTLBR = rNew.aTLBR;
- aBLTR = rNew.aBLTR;
+ aTLBR = rNew.aTLBR;
+ aBLTR = rNew.aBLTR;
aBackground = rNew.aBackground;
aHorJustify = rNew.aHorJustify;
aVerJustify = rNew.aVerJustify;
- aStacked.SetValue( rNew.aStacked.GetValue() );
+ aStacked.SetValue( rNew.aStacked.GetValue() );
aMargin = rNew.aMargin;
aLinebreak.SetValue( rNew.aLinebreak.GetValue() );
aRotateAngle.SetValue( rNew.aRotateAngle.GetValue() );
@@ -490,7 +490,7 @@ sal_Bool SwBoxAutoFmt::Save( SvStream& rStream ) const
}
-sal_Bool SwBoxAutoFmt::SaveVerionNo( SvStream& rStream ) const
+sal_Bool SwBoxAutoFmt::SaveVersionNo( SvStream& rStream ) const
{
rStream << aFont.GetVersion( SOFFICE_FILEFORMAT_40 );
rStream << aHeight.GetVersion( SOFFICE_FILEFORMAT_40 );
@@ -521,8 +521,6 @@ sal_Bool SwBoxAutoFmt::SaveVerionNo( SvStream& rStream )
const
return 0 == rStream.GetError();
}
-/* */
-
SwTableAutoFmt::SwTableAutoFmt( const String& rName )
: aName( rName ), nStrResId( USHRT_MAX )
@@ -670,7 +668,7 @@ SwBoxAutoFmt& SwTableAutoFmt::UpdateFromSet( sal_uInt8 nPos,
static_cast<LanguageType>(::GetAppLanguage() ));
}
}
- // den Rest koennen wir nicht, StarCalc spezifisch
+ // den Rest koennen wir nicht, Calc spezifisch
return *pFmt;
}
@@ -760,7 +758,7 @@ void SwTableAutoFmt::UpdateToSet( sal_uInt8 nPos,
SfxItemSet& rSet,
}
}
- // den Rest koennen wir nicht, StarCalc spezifisch
+ // den Rest koennen wir nicht, Calc spezifisch
}
@@ -1083,7 +1081,7 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream )
const
//-----------------------------------------------------------
// die VersionsNummer fuer alle Attribute schreiben
- (*this)[ 0 ]->GetBoxFmt( 0 ).SaveVerionNo( rStream );
+ (*this)[ 0 ]->GetBoxFmt( 0 ).SaveVersionNo( rStream );
rStream << (sal_uInt16)(Count() - 1);
bRet = 0 == rStream.GetError();
@@ -1097,6 +1095,3 @@ sal_Bool SwTableAutoFmtTbl::Save( SvStream& rStream )
const
rStream.Flush();
return bRet;
}
-
-
-
