[Libreoffice-commits] .: sw/inc sw/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Jan 10 00:17:59 PST 2011
sw/inc/calbck.hxx | 2 -
sw/inc/index.hxx | 4 --
sw/inc/ndindex.hxx | 4 --
sw/source/core/attr/calbck.cxx | 7 ----
sw/source/core/bastyp/index.cxx | 4 --
sw/source/filter/rtf/swparrtf.cxx | 4 --
sw/source/ui/shells/txtattr.cxx | 65 --------------------------------------
7 files changed, 90 deletions(-)
New commits:
commit 249bbbb3309357e51ca6a41f71a7190d4ad50057
Author: David Tardon <dtardon at redhat.com>
Date: Mon Jan 10 09:10:44 2011 +0100
remove all mentions of cfront. Oh, my!
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index c23cb9f..624bd8f 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 41f9a2d..7921863 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 fc4fe84..a4b256e 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 6381df1..d6f36c0 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 bff4170..1d122c3 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 34a3237..01670c4 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 31a1ea3..1bb4dc9 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();
More information about the Libreoffice-commits
mailing list