[Libreoffice-commits] .: 2 commits - binfilter/bf_sw binfilter/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Mar 14 13:29:08 PDT 2011
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 18 -
binfilter/bf_sw/source/core/doc/sw_number.cxx | 34 ---
binfilter/bf_sw/source/core/draw/sw_dpage.cxx | 2
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 64 ------
binfilter/bf_sw/source/core/fields/sw_chpfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 24 --
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 152 --------------
binfilter/bf_sw/source/core/fields/sw_expfld.cxx | 12 -
binfilter/bf_sw/source/core/fields/sw_flddat.cxx | 4
binfilter/bf_sw/source/core/fields/sw_macrofld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx | 4
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx | 8
binfilter/bf_sw/source/core/inc/doctxm.hxx | 2
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 2
binfilter/bf_sw/source/core/para/sw_paratr.cxx | 2
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 12 -
binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx | 10
binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx | 10
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 138 -------------
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx | 62 ------
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 164 ----------------
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 164 ----------------
binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx | 82 --------
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 72 -------
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 28 --
binfilter/bf_sw/source/core/unocore/sw_unoredlines.cxx | 38 ---
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 70 ------
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 66 ------
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 151 --------------
binfilter/bf_sw/source/core/unocore/sw_unotext.cxx | 92 --------
binfilter/inc/bf_sw/viewopt.hxx | 2
37 files changed, 5 insertions(+), 1510 deletions(-)
New commits:
commit 62591ec6dda880f46138736be188f0065ed2a220
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 14 21:29:01 2011 +0100
Remove empty comment fields
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 606843b..454362d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1367,9 +1367,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ GetUpdtFlds().SetFieldsDirty( b );
/*N*/ return bFldsFnd;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*--------------------------------------------------------------------
Beschreibung:
--------------------------------------------------------------------*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index ecdac7e..8bc5005 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -663,9 +663,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ DELETEZ( pPgPViewPrtData );
/*N*/ SetModified();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwModify* SwDoc::GetUnoCallBack() const
/*N*/ {
/*N*/ return pUnoCallBack;
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index 1de6d4a..c2f6d59 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -217,9 +217,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return 0;
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
/*N*/ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
/*N*/ {
/*N*/ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
@@ -228,12 +226,8 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ OSL_ENSURE( pFmt, "invalid TOXBaseSection!" );
/*N*/ return pFmt->GetAttrSet();
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
-/* --------------------------------------------------
- --------------------------------------------------*/
/*--------------------------------------------------------------------
Beschreibung: Verzeichnis loeschen
@@ -258,9 +252,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ ++nCnt;
/*N*/ return nCnt;
/*N*/ }
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
/*N*/ const SwTOXType* SwDoc::GetTOXType( TOXTypes eTyp, USHORT nId ) const
/*N*/ {
/*N*/ const SwTOXTypePtr * ppTTypes = pTOXTypes->GetData();
@@ -277,18 +269,14 @@ DBG_BF_ASSERT(0, "STRIP");
#endif
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
/*N*/ const SwTOXType* SwDoc::InsertTOXType( const SwTOXType& rTyp )
/*N*/ {
/*N*/ SwTOXType * pNew = new SwTOXType( rTyp );
/*N*/ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
/*N*/ return pNew;
/*N*/ }
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
/*N*/ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
/*N*/ const String* pChkStr ) const
/*N*/ {
@@ -340,9 +328,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return aName += String::CreateFromInt32( ++nNum );
/*N*/ }
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
/*N*/ BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
/*N*/ {
/*N*/ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
@@ -359,9 +345,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
/* */
@@ -427,9 +411,7 @@ DBG_BF_ASSERT(0, "STRIP");
/* --------------------------------------------------
Description: generate content from sequence fields
--------------------------------------------------*/
-/* --------------------------------------------------
- --------------------------------------------------*/
/*--------------------------------------------------------------------
Beschreibung: Verzeichnisinhalt aus Inhaltsformen generieren
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index e853962..ef608df 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -75,18 +75,14 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ (~NO_NUMLEVEL & rNd.GetNum()->GetLevel() ) == nLevel )
/*N*/ rNd.NumRuleChgd();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwNumFmt::SwNumFmt() :
/*N*/ SwClient( 0 ),
/*N*/ SvxNumberFormat(SVX_NUM_ARABIC),
/*N*/ pVertOrient(new SwFmtVertOrient( 0, VERT_NONE))
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
/*N*/ SwClient( rFmt.pRegisteredIn ),
/*N*/ SvxNumberFormat(rFmt),
@@ -96,9 +92,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
/*N*/ &eVertOrient);
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
/*N*/ SvxNumberFormat(rNumFmt),
/*N*/ pVertOrient(new SwFmtVertOrient( 0, (SwVertOrient)rNumFmt.GetVertOrient()))
@@ -124,22 +118,16 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*?*/ pRegisteredIn->Remove( this );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwNumFmt::~SwNumFmt()
/*N*/ {
/*N*/ delete pVertOrient;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::NotifyGraphicArrived()
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
/*N*/ {
/*N*/ SvxNumberFormat::operator=(rNumFmt);
@@ -149,9 +137,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*?*/ pRegisteredIn->Remove( this );
/*N*/ return *this;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
/*N*/ {
/*N*/ BOOL bRet = SvxNumberFormat::operator==(rNumFmt) &&
@@ -159,15 +145,11 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ return bRet;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ const Graphic* SwNumFmt::GetGraphic() const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
/*N*/ {
/*N*/ if( pChFmt )
@@ -175,9 +157,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ else if( GetRegisteredIn() )
/*?*/ pRegisteredIn->Remove( this );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
/*N*/ // dann suche mal in dem Doc nach dem NumRules-Object, in dem dieses
@@ -196,23 +176,17 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ else
/*N*/ SwClient::Modify( pOld, pNew );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::SetCharFmtName(const String& rSet)
/*N*/ {
/*N*/ SvxNumberFormat::SetCharFmtName(rSet);
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ const String& SwNumFmt::GetCharFmtName() const
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ return aEmptyStr;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
/*N*/ const SvxFrameVertOrient* pOrient)
/*N*/ {
@@ -220,22 +194,16 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ pVertOrient->SetVertOrient( (SwVertOrient)*pOrient );
/*N*/ SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::SetVertOrient(SvxFrameVertOrient /*eSet*/)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SvxFrameVertOrient SwNumFmt::GetVertOrient() const
/*N*/ {
/*N*/ return SvxNumberFormat::GetVertOrient();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
/*N*/ {
/*N*/ BOOL bDocIsModified = pDoc->IsModified();
@@ -305,9 +273,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ if( bFnd && !bDocIsModified )
/*?*/ pDoc->ResetModified();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
index 1fa33dd..8a4690f 100644
--- a/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
+++ b/binfilter/bf_sw/source/core/draw/sw_dpage.cxx
@@ -120,9 +120,7 @@ Bug 29593: QuickHelp immer an der MausPosition anzeigen (besonders unter OS/2)
aRect.Right() = aPt.X();
aRect.Bottom() = aPt.Y();
*/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ Reference< XInterface > SwDPage::createUnoPage()
/*N*/ {
/*N*/ Reference<XModel> xModel = rDoc.GetDocShell()->GetBaseModel();
diff --git a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
index bbd2740..3ace2da 100644
--- a/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_authfld.cxx
@@ -80,9 +80,7 @@ SV_DECL_PTRARR_DEL( SortKeyArr, TOXSortKeyPtr, 5, 5 )
SV_IMPL_PTRARR( SortKeyArr, TOXSortKeyPtr )
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
: nRefCount(0)
{
@@ -131,9 +129,7 @@ BOOL SwAuthEntry::GetNextAuthorField(USHORT& nPos, String& rToFill)const
// --------------------------------------------------------
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthorityFieldType::SwAuthorityFieldType(SwDoc* pDoc)
: SwFieldType( RES_AUTHORITY ),
m_pDoc(pDoc),
@@ -164,9 +160,7 @@ SwAuthorityFieldType::SwAuthorityFieldType( const SwAuthorityFieldType& rFType)
m_pSortKeyArr->Insert((*rFType.m_pSortKeyArr)[i], i);
}
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthorityFieldType::~SwAuthorityFieldType()
{
// DBG_ASSERT(!m_pDataArr->Count(), "Array is not empty");
@@ -175,16 +169,12 @@ SwAuthorityFieldType::~SwAuthorityFieldType()
delete m_pSequArr;
delete m_pDataArr;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwFieldType* SwAuthorityFieldType::Copy() const
{
return new SwAuthorityFieldType(m_pDoc);
}
-/* --------------------------------------------------
- --------------------------------------------------*/
void SwAuthorityFieldType::RemoveField(long nHandle)
{
#ifdef DBG_UTIL
@@ -213,9 +203,7 @@ void SwAuthorityFieldType::RemoveField(long nHandle)
DBG_ASSERT(bRemoved, "Field unknown" );
#endif
}
-/* --------------------------------------------------
- --------------------------------------------------*/
long SwAuthorityFieldType::AddField(const String& rFieldContents)
{
long nRet = 0;
@@ -245,9 +233,7 @@ long SwAuthorityFieldType::AddField(const String& rFieldContents)
}
return nRet;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
BOOL SwAuthorityFieldType::AddField(long nHandle)
{
BOOL bRet = FALSE;
@@ -267,9 +253,7 @@ BOOL SwAuthorityFieldType::AddField(long nHandle)
DBG_ASSERT(bRet, "::AddField(long) failed");
return bRet;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
const SwAuthEntry* SwAuthorityFieldType::GetEntryByHandle(long nHandle) const
{
const SwAuthEntry* pRet = 0;
@@ -310,9 +294,7 @@ USHORT SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert )
return nRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
long SwAuthorityFieldType::GetHandle(USHORT nPos)
{
long nRet = 0;
@@ -323,9 +305,7 @@ long SwAuthorityFieldType::GetHandle(USHORT nPos)
}
return nRet;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
USHORT SwAuthorityFieldType::GetPosition(long nHandle)
{
USHORT j = 0;
@@ -343,16 +323,12 @@ USHORT SwAuthorityFieldType::GetPosition(long nHandle)
return j;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
USHORT SwAuthorityFieldType::GetEntryCount() const
{
return m_pDataArr->Count();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
const SwAuthEntry* SwAuthorityFieldType::GetEntryByPosition(USHORT nPos) const
{
if(nPos < m_pDataArr->Count())
@@ -360,9 +336,7 @@ const SwAuthEntry* SwAuthorityFieldType::GetEntryByPosition(USHORT nPos) const
OSL_FAIL("wrong index");
return 0;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
{
//find the field in a sorted array of handles,
@@ -450,9 +424,7 @@ USHORT SwAuthorityFieldType::GetSequencePos(long nHandle)
}
return nRet;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwAuthorityFieldType::QueryValue( Any& rVal, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -508,9 +480,7 @@ BOOL SwAuthorityFieldType::QueryValue( Any& rVal, BYTE nMId ) const
}
return TRUE;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwAuthorityFieldType::PutValue( const Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -584,25 +554,19 @@ BOOL SwAuthorityFieldType::PutValue( const Any& rAny, BYTE nMId )
}
return bRet;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
void SwAuthorityFieldType::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew )
{
//re-generate positions of the fields
DelSequenceArray();
SwModify::Modify( pOld, pNew );
}
-/* --------------------------------------------------
- --------------------------------------------------*/
USHORT SwAuthorityFieldType::GetSortKeyCount() const
{
return m_pSortKeyArr->Count();
}
-/* --------------------------------------------------
- --------------------------------------------------*/
const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(USHORT nIdx) const
{
SwTOXSortKey* pRet = 0;
@@ -611,9 +575,7 @@ const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(USHORT nIdx) const
DBG_ASSERT(pRet, "Sort key not found");
return pRet;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
void SwAuthorityFieldType::SetSortKeys(USHORT nKeyCount, SwTOXSortKey aKeys[])
{
m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count());
@@ -623,18 +585,14 @@ void SwAuthorityFieldType::SetSortKeys(USHORT nKeyCount, SwTOXSortKey aKeys[])
m_pSortKeyArr->Insert(new SwTOXSortKey(aKeys[i]), nArrIdx++);
}
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pType,
const String& rFieldContents )
: SwField(pType)
{
nHandle = pType->AddField( rFieldContents );
}
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pType,
long nSetHandle )
: SwField( pType ),
@@ -642,16 +600,12 @@ SwAuthorityField::SwAuthorityField( SwAuthorityFieldType* pType,
{
pType->AddField( nHandle );
}
-/* --------------------------------------------------
- --------------------------------------------------*/
SwAuthorityField::~SwAuthorityField()
{
((SwAuthorityFieldType* )GetTyp())->RemoveField(nHandle);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
String SwAuthorityField::Expand() const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
@@ -674,44 +628,34 @@ String SwAuthorityField::Expand() const
sRet += pAuthType->GetSuffix();
return sRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwField* SwAuthorityField::Copy() const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
return new SwAuthorityField(pAuthType, nHandle);
}
-/* --------------------------------------------------
- --------------------------------------------------*/
const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
const SwAuthEntry* pEntry = pAuthType->GetEntryByHandle( nHandle );
return pEntry->GetAuthorField( eField );
}
-/* --------------------------------------------------
- --------------------------------------------------*/
void SwAuthorityField::SetPar1(const String& rStr)
{
SwAuthorityFieldType* pType = (SwAuthorityFieldType* )GetTyp();
pType->RemoveField(nHandle);
nHandle = pType->AddField(rStr);
}
-/* --------------------------------------------------
- --------------------------------------------------*/
USHORT SwAuthorityField::GetHandlePosition() const
{
SwAuthorityFieldType* pAuthType = (SwAuthorityFieldType*)GetTyp();
DBG_ASSERT(pAuthType, "no field type");
return pAuthType->GetPosition(nHandle);
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
const char* aFieldNames[] =
{
"Identifier",
@@ -746,9 +690,7 @@ const char* aFieldNames[] =
"Custom5",
"ISBN"
};
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwAuthorityField::QueryValue( Any& rAny, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -771,9 +713,7 @@ BOOL SwAuthorityField::QueryValue( Any& rAny, BYTE nMId ) const
rAny <<= aRet;
return FALSE;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
sal_Int16 lcl_Find(const OUString& rFieldName)
{
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
@@ -818,9 +758,7 @@ BOOL SwAuthorityField::PutValue( const Any& rAny, BYTE nMId )
return FALSE;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
SwFieldType* SwAuthorityField::ChgTyp( SwFieldType* pFldTyp )
{
SwAuthorityFieldType* pSrcTyp = (SwAuthorityFieldType*)GetTyp(),
diff --git a/binfilter/bf_sw/source/core/fields/sw_chpfld.cxx b/binfilter/bf_sw/source/core/fields/sw_chpfld.cxx
index 28887be..529ad9c 100644
--- a/binfilter/bf_sw/source/core/fields/sw_chpfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_chpfld.cxx
@@ -179,9 +179,7 @@ SwFieldType* SwChapterFieldType::Copy() const
/*N*/ }
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwChapterField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -216,9 +214,7 @@ SwFieldType* SwChapterFieldType::Copy() const
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwChapterField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
BOOL bRet = TRUE;
diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
index 24e852f..8a42a7f 100644
--- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx
@@ -345,9 +345,7 @@ const String& SwDBField::GetPar1() const
/*N*/ nSubType = nType;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -377,9 +375,7 @@ const String& SwDBField::GetPar1() const
/*N*/ return TRUE;
/*N*/
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -462,9 +458,7 @@ SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, U
//------------------------------------------------------------------------------
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBNameInfField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -490,9 +484,7 @@ SwDBNameInfField::SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, U
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDBNameInfField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -612,9 +604,7 @@ void SwDBNextSetField::SetPar1(const String& rStr)
{
aCond = rStr;
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -629,9 +619,7 @@ void SwDBNextSetField::SetPar1(const String& rStr)
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDBNextSetField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -735,9 +723,7 @@ void SwDBNumSetField::SetPar2(const String& rStr)
{
aPar2 = rStr;
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBNumSetField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -755,9 +741,7 @@ void SwDBNumSetField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDBNumSetField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -839,16 +823,12 @@ BOOL SwDBNumSetField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE
/*N*/ return pTmp;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBNameField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ return SwDBNameInfField::QueryValue(rAny, nMId );
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDBNameField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
return SwDBNameInfField::PutValue(rAny, nMId );
@@ -917,9 +897,7 @@ BOOL SwDBNameField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId
/*N*/ pTmp->SetSubType(GetSubType());
/*N*/ return pTmp;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDBSetNumberField::QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ BOOL bRet = TRUE;
@@ -937,9 +915,7 @@ BOOL SwDBNameField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDBSetNumberField::PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMId )
{
BOOL bRet = TRUE;
diff --git a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
index 41b88b0..3709302 100644
--- a/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_ddefld.cxx
@@ -154,9 +154,7 @@ using ::rtl::OUString;
/*?*/ pDoc->GetLinkManager().Remove( refLink );
/*N*/ }
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwDDEFieldType::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMId ) const
{
BYTE nPart = 0;
@@ -206,9 +204,7 @@ BOOL SwDDEFieldType::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMId
}
return TRUE;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwDDEField::SwDDEField( SwDDEFieldType* _pType )
/*N*/ : SwField(_pType)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
index 078a88e..fa274e2 100644
--- a/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_docufld.cxx
@@ -209,9 +209,7 @@ void SwPageNumberField::SetPar2(const String& rStr)
/*N*/ return nSubType;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwPageNumberField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -243,9 +241,7 @@ void SwPageNumberField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ BOOL bRet = TRUE;
@@ -344,9 +340,7 @@ void SwPageNumberField::SetPar2(const String& rStr)
/*N*/ return pTmp;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwAuthorField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ sal_Bool bVal;
@@ -372,9 +366,7 @@ void SwPageNumberField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwAuthorField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -492,9 +484,7 @@ BOOL SwAuthorField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ return pTmp;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwFileNameField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -659,9 +649,7 @@ BOOL SwAuthorField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ return pTmp;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwTemplNameField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -814,9 +802,7 @@ void SwDocStatField::SetSubType(sal_uInt16 nSub)
/*?*/ pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() );
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDocStatField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -830,9 +816,7 @@ void SwDocStatField::SetSubType(sal_uInt16 nSub)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
{
BOOL bRet = FALSE;
@@ -868,9 +852,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwDocInfoFieldType::Copy() const
/*N*/ {
SwDocInfoFieldType* pType = new SwDocInfoFieldType(GetDoc());
@@ -889,9 +871,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ SvxCreateLocale( nLang ) );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
/*N*/ sal_uInt16 nLang) const
/*N*/ {
@@ -997,17 +977,13 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ return aStr;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwDocInfoField::SwDocInfoField(SwDocInfoFieldType* pType, sal_uInt16 nSub, sal_uInt32 nFmt) :
/*N*/ SwValueField(pType, nFmt), nSubType(nSub)
/*N*/ {
/*N*/ aContent = ((SwDocInfoFieldType*)GetTyp())->Expand(nSubType, nFmt, GetLanguage());
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwDocInfoField::Expand() const
/*N*/ {
/*N*/ if (!IsFixed()) // aContent fuer Umschaltung auf fixed mitpflegen
@@ -1015,9 +991,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return aContent;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwDocInfoField::GetCntnt(sal_Bool bName) const
/*N*/ {
/*N*/ if ( bName )
@@ -1026,9 +1000,7 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ }
/*N*/ return Expand();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwField* SwDocInfoField::Copy() const
/*N*/ {
/*N*/ SwDocInfoField* pFld = new SwDocInfoField((SwDocInfoFieldType*)GetTyp(), nSubType, GetFormat());
@@ -1037,23 +1009,17 @@ BOOL SwDocStatField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return pFld;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ sal_uInt16 SwDocInfoField::GetSubType() const
/*N*/ {
/*N*/ return nSubType;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwDocInfoField::SetSubType(sal_uInt16 nSub)
{
nSubType = nSub;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwDocInfoField::SetLanguage(sal_uInt16 nLng)
/*N*/ {
/*N*/ if (!GetFormat())
@@ -1061,9 +1027,7 @@ void SwDocInfoField::SetSubType(sal_uInt16 nSub)
/*N*/ else
/*N*/ SwValueField::SetLanguage(nLng);
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ BOOL SwDocInfoField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -1108,9 +1072,7 @@ void SwDocInfoField::SetSubType(sal_uInt16 nSub)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwDocInfoField::PutValue( const uno::Any& rAny, BYTE nMId )
{
sal_Int32 nValue(0);
@@ -1172,9 +1134,7 @@ BOOL SwDocInfoField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
return new SwHiddenTxtFieldType( bHidden );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwHiddenTxtField::SwHiddenTxtField(
SwHiddenTxtFieldType* pFldType,
sal_Bool bConditional,
@@ -1207,9 +1167,7 @@ SwHiddenTxtField::SwHiddenTxtField(
/*N*/ else
/*N*/ aTRUETxt = rStr;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwHiddenTxtField::SwHiddenTxtField(
SwHiddenTxtFieldType* pFldType,
const String& rCond,
@@ -1228,9 +1186,7 @@ SwHiddenTxtField::SwHiddenTxtField(
{
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwHiddenTxtField::Expand() const
/*N*/ {
/*N*/ // Type: !Hidden -> immer anzeigen
@@ -1290,9 +1246,7 @@ SwHiddenTxtField::SwHiddenTxtField(
/*N*/ }
/*N*/ }
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwHiddenTxtField::GetCntnt(sal_Bool bName) const
/*N*/ {
/*N*/ if ( bName )
@@ -1313,9 +1267,7 @@ SwHiddenTxtField::SwHiddenTxtField(
/*N*/ }
/*N*/ return Expand();
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwField* SwHiddenTxtField::Copy() const
/*N*/ {
/*N*/ SwHiddenTxtField* pFld =
@@ -1339,9 +1291,7 @@ SwHiddenTxtField::SwHiddenTxtField(
/*N*/ aCond = rStr;
/*N*/ bCanToggle = aCond.Len() > 0;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ const String& SwHiddenTxtField::GetPar1() const
/*N*/ {
/*N*/ return aCond;
@@ -1364,9 +1314,7 @@ void SwHiddenTxtField::SetPar2(const String& rStr)
else
aTRUETxt = rStr;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwHiddenTxtField::GetPar2() const
/*N*/ {
/*N*/ String aRet(aTRUETxt);
@@ -1377,16 +1325,12 @@ void SwHiddenTxtField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return aRet;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ sal_uInt16 SwHiddenTxtField::GetSubType() const
/*N*/ {
/*N*/ return nSubType;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ BOOL SwHiddenTxtField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ const String* pOut = 0;
@@ -1415,9 +1359,7 @@ void SwHiddenTxtField::SetPar2(const String& rStr)
/*N*/ rAny <<= OUString( *pOut );
/*N*/ return sal_True;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -1474,16 +1416,12 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ bIsHidden = sal_False;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwHiddenParaField::Expand() const
/*N*/ {
/*N*/ return aEmptyStr;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwField* SwHiddenParaField::Copy() const
/*N*/ {
/*N*/ SwHiddenParaField* pFld = new SwHiddenParaField((SwHiddenParaFieldType*)GetTyp(), aCond);
@@ -1491,9 +1429,7 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return pFld;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -1514,9 +1450,7 @@ BOOL SwHiddenTxtField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -1543,9 +1477,7 @@ void SwHiddenParaField::SetPar1(const String& rStr)
{
aCond = rStr;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ const String& SwHiddenParaField::GetPar1() const
/*N*/ {
/*N*/ return aCond;
@@ -1558,9 +1490,7 @@ void SwHiddenParaField::SetPar1(const String& rStr)
/*N*/ SwPostItFieldType::SwPostItFieldType()
/*N*/ : SwFieldType( RES_POSTITFLD )
/*N*/ {}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwPostItFieldType::Copy() const
/*N*/ {
return new SwPostItFieldType;
@@ -1575,16 +1505,12 @@ void SwHiddenParaField::SetPar1(const String& rStr)
/*?*/ : SwField( pType ), sTxt( rTxt ), sAuthor( rAuthor ), aDate( rDate )
/*?*/ {
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*?*/ String SwPostItField::Expand() const
/*?*/ {
/*?*/ return aEmptyStr;
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwField* SwPostItField::Copy() const
{
return new SwPostItField( (SwPostItFieldType*)GetTyp(), sAuthor,
@@ -1612,17 +1538,13 @@ void SwPostItField::SetPar2(const String& rStr)
{
sTxt = rStr;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
String SwPostItField::GetPar2() const
{
return sTxt;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwPostItField::QueryValue( uno::Any& rAny, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -1648,9 +1570,7 @@ BOOL SwPostItField::QueryValue( uno::Any& rAny, BYTE nMId ) const
}
return sal_True;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -1682,17 +1602,13 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ : SwFieldType( RES_EXTUSERFLD )
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwExtUserFieldType::Copy() const
/*N*/ {
SwExtUserFieldType* pType = new SwExtUserFieldType;
return pType;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwExtUserFieldType::Expand(sal_uInt16 nSub, sal_uInt32 /*nFormat*/) const
/*N*/ {
/*N*/ SvxAddressItem aAdr;
@@ -1724,17 +1640,13 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ aRet = aAdr.GetToken( nRet );
/*N*/ return aRet;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwExtUserField::SwExtUserField(SwExtUserFieldType* pType, sal_uInt16 nSubTyp, sal_uInt32 nFmt) :
/*N*/ SwField(pType, nFmt), nType(nSubTyp)
/*N*/ {
/*N*/ aContent = ((SwExtUserFieldType*)GetTyp())->Expand(nType, GetFormat());
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwExtUserField::Expand() const
/*N*/ {
/*N*/ if (!IsFixed())
@@ -1742,9 +1654,7 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return aContent;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwField* SwExtUserField::Copy() const
/*N*/ {
/*N*/ SwExtUserField* pFld = new SwExtUserField((SwExtUserFieldType*)GetTyp(), nType, GetFormat());
@@ -1752,24 +1662,18 @@ BOOL SwPostItField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return pFld;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ sal_uInt16 SwExtUserField::GetSubType() const
/*N*/ {
/*N*/ return nType;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwExtUserField::SetSubType(sal_uInt16 nSub)
{
nType = nSub;
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwExtUserField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -1796,9 +1700,7 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwExtUserField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -1836,16 +1738,12 @@ BOOL SwExtUserField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ : SwFieldType( RES_REFPAGESETFLD )
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwRefPageSetFieldType::Copy() const
/*N*/ {
return new SwRefPageSetFieldType;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
// ueberlagert, weil es nichts zum Updaten gibt!
/*--------------------------------------------------------------------
@@ -1857,38 +1755,28 @@ BOOL SwExtUserField::PutValue( const uno::Any& rAny, BYTE nMId )
/*?*/ : SwField( pType ), nOffset( nOff ), bOn( bFlag )
/*?*/ {
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*?*/ String SwRefPageSetField::Expand() const
/*?*/ {
/*?*/ return aEmptyStr;
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwField* SwRefPageSetField::Copy() const
{
return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn );
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
String SwRefPageSetField::GetPar2() const
{
return String::CreateFromInt32( GetOffset() );
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwRefPageSetField::SetPar2(const String& rStr)
{
SetOffset( (short) rStr.ToInt32() );
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -1905,9 +1793,7 @@ BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, BYTE nMId ) const
}
return sal_True;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -1935,18 +1821,14 @@ SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
{
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwRefPageGetFieldType::Copy() const
/*N*/ {
SwRefPageGetFieldType* pNew = new SwRefPageGetFieldType( pDoc );
pNew->nNumberingType = nNumberingType;
return pNew;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ void SwRefPageGetFieldType::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
/*N*/ {
/*N*/ // Update auf alle GetReferenz-Felder
@@ -1959,12 +1841,8 @@ SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
/*N*/ // weiter an die Text-Felder, diese "Expandieren" den Text
/*N*/ SwModify::Modify( pOld, pNew );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*--------------------------------------------------------------------
Beschreibung: Relative Seitennummerierung Abfragen
@@ -1975,16 +1853,12 @@ SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
/*?*/ : SwField( pType, nFmt )
/*?*/ {
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*?*/ String SwRefPageGetField::Expand() const
/*?*/ {
/*?*/ return sTxt;
/*?*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwField* SwRefPageGetField::Copy() const
{
SwRefPageGetField* pCpy = new SwRefPageGetField(
@@ -1992,12 +1866,8 @@ SwField* SwRefPageGetField::Copy() const
pCpy->SetText( sTxt );
return pCpy;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -2014,9 +1884,7 @@ BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, BYTE nMId ) const
}
return sal_True;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -2054,16 +1922,12 @@ BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ : SwFieldType( RES_JUMPEDITFLD ), pDoc( pD ), aDep( this, 0 )
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwFieldType* SwJumpEditFieldType::Copy() const
/*N*/ {
return new SwJumpEditFieldType( pDoc );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwCharFmt* SwJumpEditFieldType::GetCharFmt()
/*N*/ {
/*N*/ SwCharFmt* pFmt = pDoc->GetCharFmtFromPool( RES_POOLCHR_JUMPEDIT );
@@ -2074,67 +1938,51 @@ BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/
/*N*/ return pFmt;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nFormat,
/*N*/ const String& rTxt, const String& rHelp )
/*N*/ : SwField( pTyp, nFormat ), sTxt( rTxt ), sHelp( rHelp )
/*N*/ {
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwJumpEditField::Expand() const
/*N*/ {
/*N*/ String sTmp( '<' );
/*N*/ sTmp += sTxt;
/*N*/ return sTmp += '>';
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ SwField* SwJumpEditField::Copy() const
/*N*/ {
/*N*/ return new SwJumpEditField( (SwJumpEditFieldType*)GetTyp(), GetFormat(),
/*N*/ sTxt, sHelp );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
// Platzhalter-Text
/*N*/ const String& SwJumpEditField::GetPar1() const
/*N*/ {
/*N*/ return sTxt;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwJumpEditField::SetPar1(const String& rStr)
{
sTxt = rStr;
}
// HinweisText
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ String SwJumpEditField::GetPar2() const
/*N*/ {
/*N*/ return sHelp;
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwJumpEditField::SetPar2(const String& rStr)
{
sHelp = rStr;
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwJumpEditField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/fields/sw_expfld.cxx b/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
index d3286d6..4b41279 100644
--- a/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_expfld.cxx
@@ -381,9 +381,7 @@ void SwGetExpField::SetPar2(const String& rStr)
/*N*/ SwValueField::SetLanguage(nLng);
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwGetExpField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -421,9 +419,7 @@ void SwGetExpField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwGetExpField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -887,9 +883,7 @@ void SwSetExpField::SetPar2(const String& rStr)
/*N*/ return sRet;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwInputField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -906,9 +900,7 @@ void SwSetExpField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwInputField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
@@ -962,9 +954,7 @@ void SwInputField::SetSubType(USHORT nSub)
{
nSubType = nSub;
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwSetExpField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -1030,9 +1020,7 @@ void SwInputField::SetSubType(USHORT nSub)
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwSetExpField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
index 348c148..b1f5147 100644
--- a/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_flddat.cxx
@@ -220,9 +220,7 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ return (Time)aDT;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDateTimeField::QueryValue( uno::Any& rVal, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -266,9 +264,7 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwDateTimeField::PutValue( const uno::Any& rVal, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
index eb5c504..2f2eca3 100644
--- a/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_macrofld.cxx
@@ -149,9 +149,7 @@ void SwMacroField::SetPar2(const String& rStr)
/*N*/ return aText;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwMacroField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -171,9 +169,7 @@ void SwMacroField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwMacroField::PutValue( const uno::Any& rAny, BYTE nMId )
{
String sTmp;
diff --git a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
index 5328c13..f862347 100644
--- a/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_reffld.cxx
@@ -471,9 +471,7 @@ String SwGetRefField::GetPar2() const
return Expand();
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwGetRefField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -541,9 +539,7 @@ String SwGetRefField::GetPar2() const
/*N*/ }
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwGetRefField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ String sTmp;
diff --git a/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx b/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
index b8c988f..53cfa22 100644
--- a/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_scrptfld.cxx
@@ -102,9 +102,7 @@ String SwScriptField::GetPar2() const
{
return sCode;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwScriptField::QueryValue( uno::Any& rAny, BYTE nMId ) const
{
nMId &= ~CONVERT_TWIPS;
@@ -124,9 +122,7 @@ BOOL SwScriptField::QueryValue( uno::Any& rAny, BYTE nMId ) const
}
return TRUE;
}
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwScriptField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx b/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
index d1328dd..5e11121 100644
--- a/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_tblcalc.cxx
@@ -195,9 +195,7 @@ void SwTblField::SetPar2(const String& rStr)
}
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwTblField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -230,9 +228,7 @@ void SwTblField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return bRet;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
BOOL SwTblField::PutValue( const uno::Any& rAny, BYTE nMId )
{
nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
index 637bcee..a042198 100644
--- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
@@ -128,9 +128,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ nSubType = nSub & 0xff00;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwUserField::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -156,9 +154,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ sal_Bool SwUserField::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -303,9 +299,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwUserFieldType::QueryValue( uno::Any& rAny, BYTE nMId ) const
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
@@ -328,9 +322,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ }
/*N*/ return sal_True;
/*N*/ }
-/*--------------------------------------------------
---------------------------------------------------*/
/*N*/ BOOL SwUserFieldType::PutValue( const uno::Any& rAny, BYTE nMId )
/*N*/ {
/*N*/ nMId &= ~CONVERT_TWIPS;
diff --git a/binfilter/bf_sw/source/core/inc/doctxm.hxx b/binfilter/bf_sw/source/core/inc/doctxm.hxx
index acede96..ba66054 100644
--- a/binfilter/bf_sw/source/core/inc/doctxm.hxx
+++ b/binfilter/bf_sw/source/core/inc/doctxm.hxx
@@ -86,9 +86,7 @@ public:
TYPEINFO(); // fuers rtti
};
-/* --------------------------------------------------
- --------------------------------------------------*/
struct SwDefTOXBase_Impl
{
SwTOXBase* pContBase;
diff --git a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
index c6ceeac..b67db2d 100644
--- a/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx
@@ -1498,9 +1498,7 @@ SfxPoolItem* SwFmtAnchor::Clone( SfxItemPool* ) const
return new SwFmtAnchor( *this );
}
-/*--------------------------------------------------
- --------------------------------------------------*/
bool SwFmtAnchor::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
// hier wird immer konvertiert!
diff --git a/binfilter/bf_sw/source/core/para/sw_paratr.cxx b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
index 47d74a5..8525aca 100644
--- a/binfilter/bf_sw/source/core/para/sw_paratr.cxx
+++ b/binfilter/bf_sw/source/core/para/sw_paratr.cxx
@@ -270,9 +270,7 @@ using namespace ::com::sun::star;
/*N*/ {
/*N*/ return new SwNumRuleItem( *this );
/*N*/ }
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
/*N*/ bool SwNumRuleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
/*N*/ {
/*N*/ ::rtl::OUString sRet = SwStyleNameMapper::GetProgName(GetValue(), GET_POOLID_NUMRULE );
diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
index ff38401..8486e03 100644
--- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx
@@ -89,9 +89,7 @@ USHORT lcl_ConvertTextIntoPattern( String& rPattern,
return 8;
}
-/* --------------------------------------------------
- --------------------------------------------------*/
struct PatternIni
{
USHORT n1;
@@ -134,9 +132,7 @@ const PatternIni aPatternIni[] =
{AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX}, //AUTH_FIELD_CUSTOM5,
{USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX}
};
-/* --------------------------------------------------
- --------------------------------------------------*/
String lcl_GetAuthPattern(USHORT nTypeId)
{
String sAuth; sAuth.AssignAscii( SwForm::aFormAuth );
@@ -621,9 +617,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ //rturn true if the first level contains two ore more tabstops
/*N*/ return 2 <= lcl_GetPatternCount(aPattern[ 1 ], SwForm::aFormTab);
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
/*N*/ String SwForm::ConvertPatternTo51(const String& rSource)
/*N*/ {
/*N*/ SwFormTokenEnumerator aEnum(rSource);
@@ -668,9 +662,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ }
/*N*/ return sRet;
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
/*N*/ String SwForm::ConvertPatternFrom51(const String& rSource, TOXTypes eType)
/*N*/ {
/*N*/ String sRet( rSource );
@@ -834,9 +826,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ // delete aData.pTemplateName;
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
/*N*/ SwFormTokenEnumerator::SwFormTokenEnumerator( const String& rPattern )
/*N*/ : sPattern( rPattern ), nCurPatternPos( 0 ), nCurPatternLen( 0 )
/*N*/ {
@@ -862,9 +852,7 @@ void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; }
/*N*/ #endif
/*N*/ }
-/* --------------------------------------------------
- --------------------------------------------------*/
/*N*/ SwFormToken SwFormTokenEnumerator::GetNextToken()
/*N*/ {
/*N*/ xub_StrLen nTokenLen, nEnd;
diff --git a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
index bd66d77..4438847 100644
--- a/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
+++ b/binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx
@@ -383,9 +383,7 @@ BOOL SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwTOXAuthority::SwTOXAuthority( const SwCntntNode& rNd,
SwFmtFld& rField, const SwTOXInternational& rIntl ) :
@@ -410,18 +408,14 @@ USHORT SwTOXAuthority::GetLevel() const
nRet = 0;
return nRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwTOXAuthority::_GetText( String& rTxt, String& /*rTxtReading*/ )
{
//
rTxt = m_rField.GetFld()->Expand();
}
-/* --------------------------------------------------
- --------------------------------------------------*/
void SwTOXAuthority::FillText( SwTxtNode& rNd,
const SwIndex& rInsPos, USHORT nAuthField ) const
{
@@ -448,18 +442,14 @@ void SwTOXAuthority::FillText( SwTxtNode& rNd,
sText = (pField->GetFieldText((ToxAuthorityField) nAuthField));
rNd.Insert( sText, rInsPos );
}
-/* --------------------------------------------------
- --------------------------------------------------*/
BOOL SwTOXAuthority::operator==( const SwTOXSortTabBase& rCmp)
{
return nType == rCmp.nType &&
((SwAuthorityField*)m_rField.GetFld())->GetHandle() ==
((SwAuthorityField*)((SwTOXAuthority&)rCmp).m_rField.GetFld())->GetHandle();
}
-/* --------------------------------------------------
- --------------------------------------------------*/
BOOL SwTOXAuthority::operator<( const SwTOXSortTabBase& rBase)
{
BOOL bRet = FALSE;
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
index 622ab39..7b49f7d 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoevtlstnr.cxx
@@ -46,17 +46,13 @@ using namespace ::com::sun::star::uno;
SV_IMPL_PTRARR(SwEvtLstnrArray, XEventListenerPtr);
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwEventListenerContainer::SwEventListenerContainer( uno::XInterface* pxInParent) :
pListenerArr(0),
pxParent(pxInParent)
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwEventListenerContainer::~SwEventListenerContainer()
{
if(pListenerArr && pListenerArr->Count())
@@ -65,9 +61,7 @@ SwEventListenerContainer::~SwEventListenerContainer()
}
delete pListenerArr;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEventListener > & rxListener)
{
if(!pListenerArr)
@@ -76,9 +70,7 @@ void SwEventListenerContainer::AddListener(const uno::Reference< lang::XEventLi
*pInsert = rxListener;
pListenerArr->Insert(pInsert, pListenerArr->Count());
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XEventListener > & rxListener)
{
if(!pListenerArr)
@@ -100,9 +92,7 @@ sal_Bool SwEventListenerContainer::RemoveListener(const uno::Reference< lang::XE
}
return sal_False;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwEventListenerContainer::Disposing()
{
if(!pListenerArr)
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
index a3b7ddf..05e3ffd 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unofield.cxx
@@ -420,17 +420,13 @@ USHORT lcl_GetPropertyMapOfService( USHORT nServiceId )
* SwXFieldMaster
******************************************************************/
TYPEINIT1(SwXFieldMaster, SwClient);
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
const ::com::sun::star::uno::Sequence< sal_Int8 > & SwXFieldMaster::getUnoTunnelId()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
return aSeq;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const uno::Sequence< sal_Int8 >& rId )
throw(uno::RuntimeException)
{
@@ -442,16 +438,12 @@ sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const uno::Sequence< sal_Int8 >
}
return 0;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXFieldMaster::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXFieldMaster");
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwXFieldMaster::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
sal_Bool bRet = sal_False;
@@ -480,9 +472,7 @@ BOOL SwXFieldMaster::supportsService(const OUString& rServiceName) throw( Runtim
}
return bRet;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXFieldMaster::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(2);
@@ -507,9 +497,7 @@ Sequence< OUString > SwXFieldMaster::getSupportedServiceNames(void) throw( Runti
}
return aRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) :
aLstnrCntnr( (XPropertySet*)this),
nResTypeId(nResId),
@@ -522,9 +510,7 @@ SwXFieldMaster::SwXFieldMaster(SwDoc* pDoc, sal_uInt16 nResId) :
{
pDoc->GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFieldMaster::SwXFieldMaster(SwFieldType& rType, SwDoc* pDoc) :
SwClient(&rType),
aLstnrCntnr( (XPropertySet*)this),
@@ -537,16 +523,12 @@ SwXFieldMaster::SwXFieldMaster(SwFieldType& rType, SwDoc* pDoc) :
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFieldMaster::~SwXFieldMaster()
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void)
throw( uno::RuntimeException )
{
@@ -556,9 +538,7 @@ uno::Reference< XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void)
lcl_GetPropMapIdForFieldType( nResTypeId ) ));
return aRef;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
const uno::Any& rValue)
throw( UnknownPropertyException, PropertyVetoException,
@@ -725,9 +705,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName,
}
}
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const
{
if(!bDontCreate && RES_DBFLD == nResTypeId && m_bIsDescriptor && m_pDoc)
@@ -748,9 +726,7 @@ SwFieldType* SwXFieldMaster::GetFldType(sal_Bool bDontCreate) const
return (SwFieldType*)GetRegisteredIn();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
typedef SwFmtFld* SwFmtFldPtr;
SV_DECL_PTRARR(SwDependentFields, SwFmtFldPtr, 5, 5)
SV_IMPL_PTRARR(SwDependentFields, SwFmtFldPtr)
@@ -883,42 +859,32 @@ uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName)
}
return aRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::dispose(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -956,9 +922,7 @@ void SwXFieldMaster::dispose(void) throw( uno::RuntimeException )
else
throw uno::RuntimeException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::addEventListener(const uno::Reference< XEventListener > & aListener)
throw( uno::RuntimeException )
{
@@ -966,9 +930,7 @@ void SwXFieldMaster::addEventListener(const uno::Reference< XEventListener > & a
throw uno::RuntimeException();
aLstnrCntnr.AddListener(aListener);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::removeEventListener(const uno::Reference< XEventListener > & aListener)
throw( uno::RuntimeException )
{
@@ -976,9 +938,7 @@ void SwXFieldMaster::removeEventListener(const uno::Reference< XEventListener >
throw uno::RuntimeException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXFieldMaster::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
{
ClientModify(this, pOld, pNew);
@@ -1010,9 +970,7 @@ const Programmatic2UIName_Impl* lcl_GetFieldNameTable()
return &aFieldNames[0];
}
---------------------------------------------------------------------------*/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc)
{
OUString sRet(rType.GetName());
@@ -1030,9 +988,7 @@ OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rD
}
return sRet;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXFieldMaster::LocalizeFormula(
const SwSetExpField& rFld,
const OUString& rFormula,
@@ -1101,17 +1057,13 @@ struct SwFieldProperties_Impl
};
TYPEINIT1(SwXTextField, SwClient);
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
const ::com::sun::star::uno::Sequence< sal_Int8 > & SwXTextField::getUnoTunnelId()
{
static uno::Sequence< sal_Int8 > aSeq = ::binfilter::CreateUnoTunnelId();
return aSeq;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
sal_Int64 SAL_CALL SwXTextField::getSomething( const uno::Sequence< sal_Int8 >& rId )
throw(uno::RuntimeException)
{
@@ -1123,9 +1075,7 @@ sal_Int64 SAL_CALL SwXTextField::getSomething( const uno::Sequence< sal_Int8 >&
}
return 0;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextField::SwXTextField(sal_uInt16 nServiceId) :
aLstnrCntnr( (XTextContent*)this),
@@ -1146,9 +1096,7 @@ SwXTextField::SwXTextField(sal_uInt16 nServiceId) :
m_pProps->bBool1 = sal_True;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextField::SwXTextField(const SwFmtFld& rFmt, SwDoc* pDc) :
aLstnrCntnr( (XTextContent*)this),
pFmtFld(&rFmt),
@@ -1160,16 +1108,12 @@ SwXTextField::SwXTextField(const SwFmtFld& rFmt, SwDoc* pDc) :
{
pDc->GetUnoCallBack()->Add(this);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextField::~SwXTextField()
{
delete m_pProps;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::attachTextFieldMaster(const uno::Reference< XPropertySet > & xFieldMaster)
throw( IllegalArgumentException, uno::RuntimeException )
{
@@ -1191,9 +1135,7 @@ void SwXTextField::attachTextFieldMaster(const uno::Reference< XPropertySet > &
throw IllegalArgumentException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XPropertySet > SwXTextField::getTextFieldMaster(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1207,9 +1149,7 @@ uno::Reference< XPropertySet > SwXTextField::getTextFieldMaster(void) throw( un
return pMaster;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
OUString SwXTextField::getPresentation(sal_Bool bShowCommand) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1737,18 +1677,14 @@ void SwXTextField::attachToRange(
else
throw IllegalArgumentException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::attach(const uno::Reference< XTextRange > & xTextRange)
throw( IllegalArgumentException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
attachToRange( xTextRange );
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XTextRange > SwXTextField::getAnchor(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1769,9 +1705,7 @@ uno::Reference< XTextRange > SwXTextField::getAnchor(void) throw( uno::RuntimeE
return aRef;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::dispose(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -1787,26 +1721,20 @@ void SwXTextField::dispose(void) throw( uno::RuntimeException )
GetDoc()->DeleteAndJoin(aPam);
}
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::addEventListener(const uno::Reference< XEventListener > & aListener) throw( uno::RuntimeException )
{
if(!GetRegisteredIn())
throw uno::RuntimeException();
aLstnrCntnr.AddListener(aListener);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::removeEventListener(const uno::Reference< XEventListener > & aListener) throw( uno::RuntimeException )
{
if(!GetRegisteredIn() || !aLstnrCntnr.RemoveListener(aListener))
throw uno::RuntimeException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XPropertySetInfo > SwXTextField::getPropertySetInfo(void)
throw( uno::RuntimeException )
{
@@ -1828,9 +1756,7 @@ uno::Reference< XPropertySetInfo > SwXTextField::getPropertySetInfo(void)
throw uno::RuntimeException();
return aRef;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::Any& rValue)
throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
WrappedTargetException, uno::RuntimeException )
@@ -1956,9 +1882,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
else
throw uno::RuntimeException();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
@@ -2065,41 +1989,31 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
}
return aRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::addPropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::removePropertyChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XPropertyChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::addVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener > & /*aListener*/)
throw( UnknownPropertyException, WrappedTargetException, uno::RuntimeException )
{
DBG_WARNING("not implemented");
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
void SwXTextField::update( ) throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -2209,9 +2123,7 @@ void SwXTextField::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
break;
}
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
const SwField* SwXTextField::GetField() const
{
if(GetRegisteredIn() && pFmtFld)
@@ -2224,24 +2136,18 @@ const SwField* SwXTextField::GetField() const
/******************************************************************
* SwXTextFieldMasters
******************************************************************/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXTextFieldMasters::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXTextFieldMasters");
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.text.TextFieldMasters" ));
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
@@ -2249,16 +2155,12 @@ Sequence< OUString > SwXTextFieldMasters::getSupportedServiceNames(void) throw(
pArray[0] = C2U("com.sun.star.text.TextFieldMasters");
return aRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextFieldMasters::SwXTextFieldMasters(SwDoc* pInDoc) :
SwUnoCollection(pInDoc)
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextFieldMasters::~SwXTextFieldMasters()
{
@@ -2390,9 +2292,7 @@ sal_Bool SwXTextFieldMasters::getInstanceName(
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
throw( uno::RuntimeException )
{
@@ -2429,9 +2329,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void)
return aSeq;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( RuntimeException )
{
SolarMutexGuard aGuard;
@@ -2448,17 +2346,13 @@ sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( RuntimeExc
}
return bRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Type SwXTextFieldMasters::getElementType(void) throw( uno::RuntimeException )
{
return ::getCppuType((const uno::Reference<XPropertySet>*)0);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -2470,24 +2364,18 @@ sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException )
/******************************************************************
*
******************************************************************/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXTextFieldTypes::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXTextFieldTypes");
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.text.TextFields" ));
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
@@ -2495,31 +2383,23 @@ Sequence< OUString > SwXTextFieldTypes::getSupportedServiceNames(void) throw( Ru
pArray[0] = C2U("com.sun.star.text.TextFields");
return aRet;
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextFieldTypes::SwXTextFieldTypes(SwDoc* pInDoc) :
SwUnoCollection (pInDoc),
aRefreshCont ( static_cast< XEnumerationAccess * >(this) )
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXTextFieldTypes::~SwXTextFieldTypes()
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
void SwXTextFieldTypes::Invalidate()
{
SwUnoCollection::Invalidate();
aRefreshCont.Disposing();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Reference< XEnumeration > SwXTextFieldTypes::createEnumeration(void)
throw( uno::RuntimeException )
{
@@ -2529,16 +2409,12 @@ uno::Reference< XEnumeration > SwXTextFieldTypes::createEnumeration(void)
return new SwXFieldEnumeration(GetDoc());
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Type SwXTextFieldTypes::getElementType(void) throw( uno::RuntimeException )
{
return ::getCppuType((const uno::Reference<XDependentTextField>*)0);
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXTextFieldTypes::hasElements(void) throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
@@ -2581,24 +2457,18 @@ void SwXTextFieldTypes::removeRefreshListener(const uno::Reference< util::XRefre
/******************************************************************
* SwXFieldEnumeration
******************************************************************/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
OUString SwXFieldEnumeration::getImplementationName(void) throw( RuntimeException )
{
return C2U("SwXFieldEnumeration");
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.text.FieldEnumeration" ));
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
Sequence< OUString > SwXFieldEnumeration::getSupportedServiceNames(void) throw( RuntimeException )
{
Sequence< OUString > aRet(1);
@@ -2649,25 +2519,19 @@ SwXFieldEnumeration::SwXFieldEnumeration(SwDoc* pDc) :
// resize sequence to actual used size
aItems.realloc( nFillPos );
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
SwXFieldEnumeration::~SwXFieldEnumeration()
{
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
sal_Bool SwXFieldEnumeration::hasMoreElements(void)
throw( uno::RuntimeException )
{
SolarMutexGuard aGuard;
return nNextIndex < aItems.getLength();
}
-/*-----------------------------------------------------------------------
- -----------------------------------------------------------------------*/
uno::Any SwXFieldEnumeration::nextElement(void)
throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException )
{
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
index 74bcbbc..2fcfb7c 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx
@@ -64,17 +64,13 @@ using rtl::OUString;
/******************************************************************
*
******************************************************************/
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
const uno::Sequence< sal_Int8 > & SwXFootnote::getUnoTunnelId()
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list