diff options
author | David Tardon <dtardon@redhat.com> | 2011-01-10 09:10:44 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-01-10 09:10:44 +0100 |
commit | 4cdcf19d7c2712d2eaa6efc440e22dc2fed4d419 (patch) | |
tree | 361ca699f88057450b3b4b8d895eb56824d2026d | |
parent | 734a248a18c16f012ad614628ec9a6c014b6d74a (diff) |
remove all mentions of cfront. Oh, my!
-rw-r--r-- | sw/inc/calbck.hxx | 2 | ||||
-rw-r--r-- | sw/inc/index.hxx | 4 | ||||
-rw-r--r-- | sw/inc/ndindex.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/attr/calbck.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/bastyp/index.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/rtf/swparrtf.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/shells/txtattr.cxx | 65 |
7 files changed, 0 insertions, 90 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 8708f923fcb6..cf39c2518b81 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -213,10 +213,8 @@ public: const SwModify& GetModify() const { return rRoot; } -#ifndef CFRONT SwClient* operator++(int); SwClient* operator--(int); -#endif SwClient* operator++(); SwClient* operator--(); diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index 8a18d2d09996..9841e0e092f7 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -71,10 +71,8 @@ public: INLINE xub_StrLen operator++(); INLINE xub_StrLen operator--(); -#ifndef CFRONT INLINE xub_StrLen operator++(int); INLINE xub_StrLen operator--(int); -#endif INLINE xub_StrLen operator+=( xub_StrLen ); INLINE xub_StrLen operator-=( xub_StrLen ); @@ -158,7 +156,6 @@ inline xub_StrLen SwIndex::operator--() { return ChgValue( *this, nIndex-1 ).nIndex; } -#ifndef CFRONT inline xub_StrLen SwIndex::operator++(int) { xub_StrLen nOldIndex = nIndex; @@ -171,7 +168,6 @@ inline xub_StrLen SwIndex::operator--(int) ChgValue( *this, nIndex-1 ); return nOldIndex; } -#endif inline xub_StrLen SwIndex::operator+=( xub_StrLen nWert ) { diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index cc0300793f61..741e21782978 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -65,10 +65,8 @@ public: inline ULONG operator++(); inline ULONG operator--(); -#ifndef CFRONT inline ULONG operator++(int); inline ULONG operator--(int); -#endif inline ULONG operator+=( ULONG ); inline ULONG operator-=( ULONG ); @@ -202,7 +200,6 @@ inline ULONG SwNodeIndex::operator--() { return ( pNd = GetNodes()[ pNd->GetIndex()-1 ] )->GetIndex(); } -#ifndef CFRONT inline ULONG SwNodeIndex::operator++(int) { ULONG nOldIndex = pNd->GetIndex(); @@ -215,7 +212,6 @@ inline ULONG SwNodeIndex::operator--(int) pNd = GetNodes()[ nOldIndex - 1 ]; return nOldIndex; } -#endif inline ULONG SwNodeIndex::operator+=( ULONG nWert ) { diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 246b7ecfda4b..63c5065462f0 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -506,13 +506,9 @@ SwClientIter::~SwClientIter() } -#ifndef CFRONT // Postfix Operator SwClient* SwClientIter::operator++(int) { -// solange der CFRONT Prefix und PostFix nicht unterscheiden kann, immer -// als Prefix-Operator arbeiten. Wenn der CFRONT es kann, muss auch der -// Code entsprechen umgestellt werden !!! if( pDelNext == pAkt ) { pAkt = pAkt->pRight; @@ -522,7 +518,6 @@ SwClient* SwClientIter::operator++(int) pAkt = pDelNext; return pAkt; } -#endif // Prefix Operator @@ -539,7 +534,6 @@ SwClient* SwClientIter::operator++() } -#ifndef CFRONT // Postfix Operator SwClient* SwClientIter::operator--(int) { @@ -553,7 +547,6 @@ SwClient* SwClientIter::operator--(int) pDelNext = pAkt; return pAkt; } -#endif // Prefix Operator diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx index a249a21ec2a6..f87e1a25ae6d 100644 --- a/sw/source/core/bastyp/index.cxx +++ b/sw/source/core/bastyp/index.cxx @@ -370,7 +370,6 @@ ARR_CHK_ARRAY } #if OSL_DEBUG_LEVEL > 1 -#ifndef CFRONT /************************************************************************* |* @@ -390,7 +389,6 @@ xub_StrLen SwIndex::operator++(int) return nOldIndex; } -#endif xub_StrLen SwIndex::operator++() { @@ -410,7 +408,6 @@ xub_StrLen SwIndex::operator++() |* *************************************************************************/ -#ifndef CFRONT xub_StrLen SwIndex::operator--(int) { @@ -421,7 +418,6 @@ xub_StrLen SwIndex::operator--(int) return nOldIndex; } -#endif xub_StrLen SwIndex::operator--() { diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 43203237ad69..4c653399fe72 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -3274,9 +3274,7 @@ void SwRTFParser::ReadPageDescTbl() pPg = &pDoc->_GetPageDesc(nPos); pPg->SetLandscape( FALSE ); pPgFmt = &pPg->GetMaster(); -#ifndef CFRONT SETPAGEDESC_DEFAULTS: -#endif aSz.SetWidth( a4.Width() ); aSz.SetHeight( a4.Height() ); aLR.SetLeft( 0 ); aLR.SetRight( 0 ); aUL.SetLower( 0 ); aUL.SetUpper( 0 ); @@ -3324,9 +3322,7 @@ void SwRTFParser::ReadPageDescTbl() } pPgFmt = &pPg->GetLeft(); -#ifndef CFRONT goto SETPAGEDESC_DEFAULTS; -#else aLR.SetLeft( 0 ); aLR.SetRight( 0 ); aUL.SetLower( 0 ); aUL.SetUpper( 0 ); aHLR.SetLeft( 0 ); aHLR.SetRight( 0 ); diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 6548259a2b44..eca1f9f298d4 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -285,67 +285,6 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) } } - - -#ifdef CFRONT - -void lcl_SetAdjust(SvxAdjust eAdjst, SfxItemSet& rSet) -{ - rSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST )); -} - - - -void lcl_SetLineSpace(BYTE ePropL,SfxItemSet& rSet) -{ - SvxLineSpacingItem aLineSpacing(ePropL, RES_PARATR_LINESPACING ); - aLineSpacing.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO; - if( 100 == ePropL ) - aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; - else - aLineSpacing.SetPropLineSpace(ePropL); - rSet.Put( aLineSpacing ); -} - - - -void SwTextShell::ExecParaAttr(SfxRequest &rReq) -{ - // gleiche beide Attribute holen, ist nicht teuerer !! - SfxItemSet aSet( GetPool(), RES_PARATR_LINESPACING, RES_PARATR_ADJUST ); - - switch (rReq.GetSlot()) - { - case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break; - case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break; - case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break; - case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break; - - case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break; - case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break; - case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break; - - default: - OSL_ENSURE(false, "SwTextShell::ExecParaAttr wrong Dispatcher"); - return; - } - SwWrtShell& rWrtSh = GetShell(); - SwTxtFmtColl* pColl = rWrtSh.GetCurTxtFmtColl(); - if(pColl && pColl->IsAutoUpdateFmt()) - { - rWrtSh.AutoUpdatePara(pColl, *pSet); - } - else - { - rWrtSh.SetAttr( aSet ); - rReq.Done( aSet ); - } -} - -#else - - - void SwTextShell::ExecParaAttr(SfxRequest &rReq) { SvxAdjust eAdjst; @@ -496,10 +435,6 @@ SET_LINESPACE: rReq.Done(); } -#endif - - - void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); |