diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-06-10 21:57:16 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-06-10 22:00:58 +0200 |
commit | 39f4f7d95391c5396a1fc92d48cb400c06db68b4 (patch) | |
tree | a82fe4ab4cdcdc7f5c19ec822b668633620e59d0 /sw/source | |
parent | 9d055aed9f4b97b5186ea1da67a6d3e92b9839f4 (diff) |
fdo#62475 - remove visual noise in sw/source/core/fields
Change-Id: I4b14dbb652375f4c6f52ba2fb127e98d6798e07f
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/fields/authfld.cxx | 11 | ||||
-rw-r--r-- | sw/source/core/fields/cellfml.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/fields/chpfld.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/fields/dbfld.cxx | 57 | ||||
-rw-r--r-- | sw/source/core/fields/ddefld.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/ddetbl.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/docufld.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/fields/expfld.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/fields/fldbas.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/fields/flddat.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/flddropdown.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/fldlst.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/macrofld.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/postithelper.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/reffld.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/fields/scrptfld.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/tblcalc.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/fields/textapi.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/fields/usrfld.cxx | 4 |
19 files changed, 8 insertions, 128 deletions
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index b262251f26e9..fb2e3b3d580a 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -44,14 +44,13 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy) : nRefCount(0) { for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) aAuthFields[i] = rCopy.aAuthFields[i]; } -// -------------------------------------------------------- + sal_Bool SwAuthEntry::operator==(const SwAuthEntry& rComp) { for(sal_uInt16 i = 0; i < AUTH_FIELD_END; i++) @@ -59,7 +58,7 @@ sal_Bool SwAuthEntry::operator==(const SwAuthEntry& rComp) return sal_False; return sal_True; } -// -------------------------------------------------------- + SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc) : SwFieldType( RES_AUTHORITY ), m_pDoc(pDoc), @@ -223,9 +222,7 @@ bool SwAuthorityFieldType::ChangeEntryContent(const SwAuthEntry* pNewEntry) return bChanged; } -/*------------------------------------------------------------------------- - appends a new entry (if new) and returns the array position - -----------------------------------------------------------------------*/ +/// appends a new entry (if new) and returns the array position sal_uInt16 SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert ) { sal_uInt16 nRet = 0; @@ -656,7 +653,7 @@ static sal_Int16 lcl_Find(const OUString& rFieldName) return i; return -1; } -//---------------------------------------------------------------------------- + bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ ) { if(!GetTyp() || !((SwAuthorityFieldType*)GetTyp())->GetEntryByHandle(m_nHandle)) diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index c89e0c1c943a..239402e79ddd 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -42,7 +42,6 @@ const sal_Unicode cRelTrenner = ','; const sal_Unicode cRelKennung = ''; // CTRL-R - const sal_uInt16 cMAXSTACKSIZE = 50; static const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox ); @@ -212,7 +211,6 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const if( pNumFmtr->IsNumberFormat( sTxt, nFmtIndex, aNum )) nRet = aNum; } - // ?? otherwise it is an error } while( false ); @@ -229,7 +227,6 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const return nRet; } - // structure needed for calculation of tables SwTblCalcPara::SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable ) @@ -281,7 +278,6 @@ sal_Bool SwTblCalcPara::CalcWithStackOverflow() return !rCalc.IsCalcError(); } - SwTableFormula::SwTableFormula( const String& rFormel ) : sFormel( rFormel ) { @@ -417,7 +413,6 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr, rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 ); } - void SwTableFormula::BoxNmsToRelNm( const SwTable& rTbl, String& rNewStr, String& rFirstBox, String* pLastBox, void* pPara ) const { @@ -580,7 +575,6 @@ void SwTableFormula::ToRelBoxNm( const SwTable* pTbl ) eNmType = REL_NAME; } - String SwTableFormula::ScanString( FnScanFormel fnFormel, const SwTable& rTbl, void* pPara ) const { @@ -1002,7 +996,6 @@ bool SwTableFormula::HasValidBoxes() const return bRet; } - sal_uInt16 SwTableFormula::GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox ) { sal_uInt16 nRet = USHRT_MAX; @@ -1060,7 +1053,6 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr, } else (rNewStr += sTblNm ) += '.'; // keep table name - } } if( pTblNmBox == pLastBox ) @@ -1176,5 +1168,4 @@ void SwTableFormula::ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd ) eNmType = INTRNL_NAME; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index 0b974bc78cb6..795cabe75dbf 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -36,7 +36,6 @@ SwChapterFieldType::SwChapterFieldType() { } - SwFieldType* SwChapterFieldType::Copy() const { return new SwChapterFieldType(); @@ -48,7 +47,6 @@ SwChapterField::SwChapterField(SwChapterFieldType* pTyp, sal_uInt32 nFmt) : SwField(pTyp, nFmt), nLevel( 0 ) {} - String SwChapterField::Expand() const { String sStr( sNumber ); @@ -68,7 +66,6 @@ String SwChapterField::Expand() const return sStr; } - SwField* SwChapterField::Copy() const { SwChapterField *pTmp = diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 372bcbd9d7d2..f3e81116d302 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <float.h> #include <sfx2/app.hxx> #include <svl/zforlist.hxx> @@ -69,11 +68,10 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& } sName += GetColumnName(); } -//------------------------------------------------------------------------------ + SwDBFieldType::~SwDBFieldType() { } -//------------------------------------------------------------------------------ SwFieldType* SwDBFieldType::Copy() const { @@ -81,14 +79,11 @@ SwFieldType* SwDBFieldType::Copy() const return pTmp; } -//------------------------------------------------------------------------------ const OUString& SwDBFieldType::GetName() const { return sName; } -//------------------------------------------------------------------------------ - void SwDBFieldType::ReleaseRef() { OSL_ENSURE(nRefCnt > 0, "RefCount < 0!"); @@ -184,16 +179,12 @@ SwDBField::SwDBField(SwDBFieldType* pTyp, sal_uLong nFmt) InitContent(); } -//------------------------------------------------------------------------------ - SwDBField::~SwDBField() { if (GetTyp()) ((SwDBFieldType*)GetTyp())->ReleaseRef(); } -//------------------------------------------------------------------------------ - void SwDBField::InitContent() { if (!IsInitialized()) @@ -204,8 +195,6 @@ void SwDBField::InitContent() } } -//------------------------------------------------------------------------------ - void SwDBField::InitContent(const String& rExpansion) { if (rExpansion.Len() > 2) @@ -225,8 +214,6 @@ void SwDBField::InitContent(const String& rExpansion) SetExpansion( rExpansion ); } -//------------------------------------------------------------------------------ - String SwDBField::Expand() const { String sRet; @@ -236,8 +223,6 @@ String SwDBField::Expand() const return sRet; } -//------------------------------------------------------------------------------ - SwField* SwDBField::Copy() const { SwDBField *pTmp = new SwDBField((SwDBFieldType*)GetTyp(), GetFormat()); @@ -268,8 +253,6 @@ String SwDBField::GetFieldName() const return lcl_DBTrennConv(sContent); } -//------------------------------------------------------------------------------ - void SwDBField::ChgValue( double d, bool bVal ) { bValidValue = bVal; @@ -395,7 +378,6 @@ bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const OSL_FAIL("illegal property"); } return true; - } bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) @@ -466,8 +448,6 @@ SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, s { } -//------------------------------------------------------------------------------ - SwDBData SwDBNameInfField::GetDBData(SwDoc* pDoc) { SwDBData aRet; @@ -483,8 +463,6 @@ void SwDBNameInfField::SetDBData(const SwDBData & rDBData) aDBData = rDBData; } -//------------------------------------------------------------------------------ - String SwDBNameInfField::GetFieldName() const { String sStr( SwField::GetFieldName() ); @@ -572,8 +550,6 @@ SwDBNextSetFieldType::SwDBNextSetFieldType() { } -//------------------------------------------------------------------------------ - SwFieldType* SwDBNextSetFieldType::Copy() const { SwDBNextSetFieldType* pTmp = new SwDBNextSetFieldType(); @@ -589,15 +565,11 @@ SwDBNextSetField::SwDBNextSetField(SwDBNextSetFieldType* pTyp, SwDBNameInfField(pTyp, rDBData), aCond(rCond), bCondValid(true) {} -//------------------------------------------------------------------------------ - String SwDBNextSetField::Expand() const { return aEmptyStr; } -//------------------------------------------------------------------------------ - SwField* SwDBNextSetField::Copy() const { SwDBNextSetField *pTmp = new SwDBNextSetField((SwDBNextSetFieldType*)GetTyp(), @@ -606,7 +578,6 @@ SwField* SwDBNextSetField::Copy() const pTmp->bCondValid = bCondValid; return pTmp; } -//------------------------------------------------------------------------------ void SwDBNextSetField::Evaluate(SwDoc* pDoc) { @@ -665,8 +636,6 @@ SwDBNumSetFieldType::SwDBNumSetFieldType() : { } -//------------------------------------------------------------------------------ - SwFieldType* SwDBNumSetFieldType::Copy() const { SwDBNumSetFieldType* pTmp = new SwDBNumSetFieldType(); @@ -685,15 +654,11 @@ SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp, bCondValid(true) {} -//------------------------------------------------------------------------------ - String SwDBNumSetField::Expand() const { return aEmptyStr; } -//------------------------------------------------------------------------------ - SwField* SwDBNumSetField::Copy() const { SwDBNumSetField *pTmp = new SwDBNumSetField((SwDBNumSetFieldType*)GetTyp(), @@ -784,7 +749,6 @@ SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument) { pDoc = pDocument; } -//------------------------------------------------------------------------------ String SwDBNameFieldType::Expand(sal_uLong ) const { @@ -794,7 +758,6 @@ String SwDBNameFieldType::Expand(sal_uLong ) const sRet += (String)aData.sCommand; return sRet; } -//------------------------------------------------------------------------------ SwFieldType* SwDBNameFieldType::Copy() const { @@ -802,16 +765,12 @@ SwFieldType* SwDBNameFieldType::Copy() const return pTmp; } -//------------------------------------------------------------------------------ - // name of the connected database SwDBNameField::SwDBNameField(SwDBNameFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt) : SwDBNameInfField(pTyp, rDBData, nFmt) {} -//------------------------------------------------------------------------------ - String SwDBNameField::Expand() const { String sRet; @@ -820,8 +779,6 @@ String SwDBNameField::Expand() const return sRet; } -//------------------------------------------------------------------------------ - SwField* SwDBNameField::Copy() const { SwDBNameField *pTmp = new SwDBNameField((SwDBNameFieldType*)GetTyp(), GetDBData()); @@ -848,16 +805,12 @@ SwDBSetNumberFieldType::SwDBSetNumberFieldType() { } -//------------------------------------------------------------------------------ - SwFieldType* SwDBSetNumberFieldType::Copy() const { SwDBSetNumberFieldType *pTmp = new SwDBSetNumberFieldType; return pTmp; } -//------------------------------------------------------------------------------ - // set-number of the connected database SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp, @@ -866,8 +819,6 @@ SwDBSetNumberField::SwDBSetNumberField(SwDBSetNumberFieldType* pTyp, : SwDBNameInfField(pTyp, rDBData, nFmt), nNumber(0) {} -//------------------------------------------------------------------------------ - String SwDBSetNumberField::Expand() const { if(0 !=(GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE) || nNumber == 0) @@ -876,8 +827,6 @@ String SwDBSetNumberField::Expand() const return FormatNumber((sal_uInt16)nNumber, GetFormat()); } -//------------------------------------------------------------------------------ - void SwDBSetNumberField::Evaluate(SwDoc* pDoc) { SwNewDBMgr* pMgr = pDoc->GetNewDBMgr(); @@ -889,9 +838,6 @@ void SwDBSetNumberField::Evaluate(SwDoc* pDoc) nNumber = pMgr->GetSelectedRecordId(); } - -//------------------------------------------------------------------------------ - SwField* SwDBSetNumberField::Copy() const { SwDBSetNumberField *pTmp = @@ -943,5 +889,4 @@ bool SwDBSetNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return bRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index 8c2fdee5798b..1ec60355b4d8 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <sfx2/linkmgr.hxx> #include <doc.hxx> @@ -54,7 +53,6 @@ public: xub_StrLen nEnd = STRING_NOTFOUND ) const; }; - ::sfx2::SvBaseLink::UpdateResult SwIntrnlRefLink::DataChanged( const String& rMimeType, const uno::Any & rValue ) { diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index 063cced4874b..647c2d297c89 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <frmfmt.hxx> #include <doc.hxx> @@ -181,5 +180,4 @@ sal_Bool SwDDETable::NoDDETable() return sal_True; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index c9455cb19bf0..3017c249bb1d 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <textapi.hxx> #include <hintids.hxx> @@ -1043,7 +1042,6 @@ SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pTyp, sal_uInt16 nSub, const aContent = rValue; } - template<class T> static double lcl_TimeToDouble( const T& rTime ) { @@ -1560,8 +1558,6 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } -//------------------------------------------------------------------------------ - String SwHiddenTxtField::GetColumnName(const String& rName) { sal_uInt16 nPos = rName.Search(DB_DELIM); @@ -1575,8 +1571,6 @@ String SwHiddenTxtField::GetColumnName(const String& rName) return rName; } -//------------------------------------------------------------------------------ - String SwHiddenTxtField::GetDBName(const String& rName, SwDoc *pDoc) { sal_uInt16 nPos = rName.Search(DB_DELIM); @@ -1695,7 +1689,6 @@ SwPostItField::SwPostItField( SwPostItFieldType* pT, { } - SwPostItField::~SwPostItField() { if ( m_pTextObject ) @@ -1740,7 +1733,6 @@ String SwPostItField::GetDescription() const return SW_RES(STR_NOTE); } - SwField* SwPostItField::Copy() const { SwPostItField* pRet = new SwPostItField( (SwPostItFieldType*)GetTyp(), sAuthor, sTxt, sInitials, sName, @@ -2056,7 +2048,6 @@ bool SwExtUserField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) } return true; } -//------------------------------------------------------------------------- // field type for relative page numbers diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index df352e3b4461..3a2fa3e51fb9 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/charclass.hxx> @@ -58,7 +57,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::text; -//----------------------------------------------------------------------------- static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) { sal_Int16 nRet = 0; @@ -79,7 +77,7 @@ static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType) } return nRet; } -//----------------------------------------------------------------------------- + static sal_Int32 lcl_APIToSubType(const uno::Any& rAny) { sal_Int16 nVal = 0; @@ -98,8 +96,6 @@ static sal_Int32 lcl_APIToSubType(const uno::Any& rAny) return nSet; } -//----------------------------------------------------------------------------- - void ReplacePoint( String& rTmpName, bool bWithCommandType ) { // replace first and last (if bWithCommandType: last two) dot @@ -589,7 +585,6 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& rList ) return rList.Count(); } - void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd ) { const SwTxtNode* pTxtNd = rNd.FindOutlineNodeOfLevel( nLevel ); @@ -1245,6 +1240,4 @@ bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index f9467ad42297..aa71ff33a465 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <float.h> #include <rtl/math.hxx> #include <svl/zforlist.hxx> @@ -115,8 +114,6 @@ std::vector<String>* SwFieldType::pFldNames = 0; }; // ????? TYP_USRINPFLD, - - const String& SwFieldType::GetTypeStr(sal_uInt16 nTypeId) { if( !pFldNames ) @@ -282,6 +279,7 @@ bool SwField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const } return true; } + bool SwField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) { switch( nWhichId ) diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index fc57a4842238..4b17cb772b77 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/datetime.hxx> #include <svl/zforlist.hxx> #include <com/sun/star/util/DateTime.hpp> diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 417f5e6aa236..3fd75d615f35 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <flddropdown.hxx> #include <algorithm> diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx index 01ea812e45d4..c094cd5fbbdf 100644 --- a/sw/source/core/fields/fldlst.cxx +++ b/sw/source/core/fields/fldlst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "switerator.hxx" #include "editsh.hxx" #include "doc.hxx" @@ -200,5 +199,4 @@ void SwInputFieldList::RemoveUnselectedFlds() pSrtLst = pNewLst; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index a4e641a9485e..604376cc6a71 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <hintids.hxx> #include <doc.hxx> #include <docufld.hxx> diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx index 1937cee7c6fa..7d9b83e7f057 100644 --- a/sw/source/core/fields/postithelper.cxx +++ b/sw/source/core/fields/postithelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <postithelper.hxx> #include <PostItMgr.hxx> #include <AnnotationWin.hxx> diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index e81c4c859de0..5360de70ccef 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -90,7 +90,6 @@ static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr ) } } - bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos, const SwTxtNode& rBehindNd, sal_uInt16 nSttPos ) { @@ -243,6 +242,7 @@ const SwTxtNode* SwGetRefField::GetReferencedTxtNode() const sal_uInt16 nDummy = USHRT_MAX; return SwGetRefFieldType::FindAnchor( pDoc, sSetRefName, nSubType, nSeqNo, &nDummy ); } + // #i85090# String SwGetRefField::GetExpandedTxtOfReferencedTxtNode() const { @@ -257,7 +257,6 @@ String SwGetRefField::Expand() const return sTxt; } - String SwGetRefField::GetFieldName() const { if ( GetTyp()->GetName().getLength() > 0 || sSetRefName.getLength() > 0 ) @@ -587,7 +586,6 @@ void SwGetRefField::SetPar1( const OUString& rName ) sSetRefName = rName; } - OUString SwGetRefField::GetPar2() const { return Expand(); @@ -774,13 +772,11 @@ SwGetRefFieldType::SwGetRefFieldType( SwDoc* pDc ) : SwFieldType( RES_GETREFFLD ), pDoc( pDc ) {} - SwFieldType* SwGetRefFieldType::Copy() const { return new SwGetRefFieldType( pDoc ); } - void SwGetRefFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { // update to all GetReference fields @@ -917,7 +913,6 @@ SwTxtNode* SwGetRefFieldType::FindAnchor( SwDoc* pDoc, const String& rRefMark, return pTxtNd; } - struct _RefIdsMap { private: @@ -1078,7 +1073,6 @@ void _RefIdsMap::Check( SwDoc& rDoc, SwDoc& rDestDoc, SwGetRefField& rFld, } } - void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) { if( &rDestDoc != pDoc ) diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx index e1af8944a2ad..48b367652c08 100644 --- a/sw/source/core/fields/scrptfld.cxx +++ b/sw/source/core/fields/scrptfld.cxx @@ -72,7 +72,6 @@ void SwScriptField::SetPar2( const OUString& rStr ) sCode = rStr; } - OUString SwScriptField::GetPar2() const { return sCode; diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 19cc755573b5..3b18763ffa81 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <switerator.hxx> #include <cntfrm.hxx> #include <doc.hxx> @@ -31,19 +30,15 @@ using namespace ::com::sun::star; - SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr) : SwValueFieldType( pDocPtr, RES_TABLEFLD ) {} - SwFieldType* SwTblFieldType::Copy() const { return new SwTblFieldType(GetDoc()); } - - void SwTblField::CalcField( SwTblCalcPara& rCalcPara ) { if( rCalcPara.rCalc.IsCalcError() ) // stop if there is already an error set @@ -56,8 +51,6 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara ) ChgValid( !rCalcPara.IsStackOverFlow() ); // is the value again valid? } - - SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel, sal_uInt16 nType, sal_uLong nFmt ) : SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ), @@ -66,7 +59,6 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel, sExpand = OUString('0'); } - SwField* SwTblField::Copy() const { SwTblField* pTmp = new SwTblField( (SwTblFieldType*)GetTyp(), @@ -78,7 +70,6 @@ SwField* SwTblField::Copy() const return pTmp; } - String SwTblField::GetFieldName() const { String aStr(GetTyp()->GetName()); @@ -159,7 +150,6 @@ OUString SwTblField::GetPar2() const return SwTableFormula::GetFormula(); } - void SwTblField::SetPar2(const OUString& rStr) { SetFormula( rStr ); diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx index fdc145ae461e..525ad9434c97 100644 --- a/sw/source/core/fields/textapi.cxx +++ b/sw/source/core/fields/textapi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <textapi.hxx> #include <doc.hxx> #include <docsh.hxx> diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 969891d5298b..4cd42e7973c2 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/zforlist.hxx> #include <svl/zformat.hxx> @@ -32,7 +31,6 @@ #include <dpage.hxx> #include <unofldmid.h> - using namespace ::com::sun::star; // Userfields @@ -339,6 +337,4 @@ bool SwUserFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |