This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1d5e86edaf Cleanup
1d5e86edaf is described below
commit 1d5e86edaf776a6786797a27a19628955e5b21b8
Author: mseidel <[email protected]>
AuthorDate: Sat Aug 30 15:25:24 2025 +0200
Cleanup
(cherry picked from commit 639fde025cdba4d7f19dfd6dc1ab3cad83e007c1)
---
main/sw/source/filter/writer/writer.cxx | 299 +++++++++++++++---------------
main/sw/source/filter/writer/wrt_fn.cxx | 16 +-
main/sw/source/filter/writer/wrtswtbl.cxx | 180 +++++++++---------
3 files changed, 245 insertions(+), 250 deletions(-)
diff --git a/main/sw/source/filter/writer/writer.cxx
b/main/sw/source/filter/writer/writer.cxx
index 31bae7a5c5..c65402131c 100644
--- a/main/sw/source/filter/writer/writer.cxx
+++ b/main/sw/source/filter/writer/writer.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <hintids.hxx>
@@ -45,8 +43,7 @@
using namespace ::com::sun::star;
-
-// Stringbuffer fuer die umgewandelten Zahlen
+// Stringbuffer für die umgewandelten Zahlen
static sal_Char aNToABuf[] = "0000000000000000000000000";
#define NTOABUFLEN (sizeof(aNToABuf))
@@ -54,13 +51,13 @@ DECLARE_TABLE( SwBookmarkNodeTable, SvPtrarr* )
struct Writer_Impl
{
- SvStream * m_pStream;
+ SvStream * m_pStream;
SvStringsSortDtor *pSrcArr, *pDestArr;
SvPtrarr* pFontRemoveLst, *pBkmkArr;
SwBookmarkNodeTable* pBkmkNodePos;
- Writer_Impl();
+ Writer_Impl();
~Writer_Impl();
void RemoveFontList( SwDoc& rDoc );
@@ -68,8 +65,8 @@ struct Writer_Impl
};
Writer_Impl::Writer_Impl()
- : m_pStream(0)
- , pSrcArr( 0 ), pDestArr( 0 ), pFontRemoveLst( 0 ), pBkmkNodePos( 0 )
+ : m_pStream(0)
+ , pSrcArr( 0 ), pDestArr( 0 ), pFontRemoveLst( 0 ), pBkmkNodePos( 0 )
{
}
@@ -99,55 +96,55 @@ void Writer_Impl::RemoveFontList( SwDoc& rDoc )
void Writer_Impl::InsertBkmk(const ::sw::mark::IMark& rBkmk)
{
- if( !pBkmkNodePos )
- pBkmkNodePos = new SwBookmarkNodeTable;
-
- sal_uLong nNd = rBkmk.GetMarkPos().nNode.GetIndex();
- SvPtrarr* pArr = pBkmkNodePos->Get( nNd );
- if( !pArr )
- {
- pArr = new SvPtrarr( 1, 4 );
- pBkmkNodePos->Insert( nNd, pArr );
- }
-
- void* p = (void*)&rBkmk;
- pArr->Insert( p, pArr->Count() );
-
- if(rBkmk.IsExpanded() && rBkmk.GetOtherMarkPos().nNode != nNd)
- {
- nNd = rBkmk.GetOtherMarkPos().nNode.GetIndex();
- pArr = pBkmkNodePos->Get( nNd );
- if( !pArr )
- {
- pArr = new SvPtrarr( 1, 4 );
- pBkmkNodePos->Insert( nNd, pArr );
- }
- pArr->Insert( p, pArr->Count() );
- }
+ if( !pBkmkNodePos )
+ pBkmkNodePos = new SwBookmarkNodeTable;
+
+ sal_uLong nNd = rBkmk.GetMarkPos().nNode.GetIndex();
+ SvPtrarr* pArr = pBkmkNodePos->Get( nNd );
+ if( !pArr )
+ {
+ pArr = new SvPtrarr( 1, 4 );
+ pBkmkNodePos->Insert( nNd, pArr );
+ }
+
+ void* p = (void*)&rBkmk;
+ pArr->Insert( p, pArr->Count() );
+
+ if(rBkmk.IsExpanded() && rBkmk.GetOtherMarkPos().nNode != nNd)
+ {
+ nNd = rBkmk.GetOtherMarkPos().nNode.GetIndex();
+ pArr = pBkmkNodePos->Get( nNd );
+ if( !pArr )
+ {
+ pArr = new SvPtrarr( 1, 4 );
+ pBkmkNodePos->Insert( nNd, pArr );
+ }
+ pArr->Insert( p, pArr->Count() );
+ }
}
/*
- * Dieses Modul ist die Zentrale-Sammelstelle fuer alle Write-Filter
+ * Dieses Modul ist die Zentrale-Sammelstelle für alle Write-Filter
* und ist eine DLL !
*
* Damit der Writer mit den unterschiedlichen Writern arbeiten kann,
- * muessen fuer diese die Ausgabe-Funktionen der Inhalts tragenden
+ * müssen für diese die Ausgabe-Funktionen der Inhalts tragenden
* Objecte auf die verschiedenen Ausgabe-Funktionen gemappt werden.
*
- * Dazu kann fuer jedes Object ueber den Which-Wert in einen Tabelle ge-
+ * Dazu kann für jedes Object über den Which-Wert in einen Tabelle ge-
* griffen werden, um seine Ausgabe-Funktion zu erfragen.
* Diese Funktionen stehen in den entsprechenden Writer-DLL's.
*/
Writer::Writer()
- : m_pImpl(new Writer_Impl)
- , pOrigPam(0), pOrigFileName(0), pDoc(0), pCurPam(0)
+ : m_pImpl(new Writer_Impl)
+ , pOrigPam(0), pOrigFileName(0), pDoc(0), pCurPam(0)
{
bWriteAll = bShowProgress = bUCS2_WithStartChar = true;
bASCII_NoLastLineEnd = bASCII_ParaAsBlanc = bASCII_ParaAsCR =
bWriteClipboardDoc = bWriteOnlyFirstTable = bBlock =
bOrganizerMode = false;
- bExportPargraphNumbering = sal_True;
+ bExportPargraphNumbering = sal_True;
}
Writer::~Writer()
@@ -164,11 +161,11 @@ const IDocumentStylePoolAccess*
Writer::getIDocumentStylePoolAccess() const { re
void Writer::ResetWriter()
{
- if (m_pImpl->pFontRemoveLst)
- {
- m_pImpl->RemoveFontList( *pDoc );
- }
- m_pImpl.reset(new Writer_Impl);
+ if (m_pImpl->pFontRemoveLst)
+ {
+ m_pImpl->RemoveFontList( *pDoc );
+ }
+ m_pImpl.reset(new Writer_Impl);
if( pCurPam )
{
@@ -194,7 +191,7 @@ sal_Bool Writer::CopyNextPam( SwPaM ** ppPam )
return sal_False; // Ende vom Ring
}
- // ansonsten kopiere den die Werte aus dem naechsten Pam
+ // ansonsten kopiere den die Werte aus dem nächsten Pam
*ppPam = ((SwPaM*)(*ppPam)->GetNext() );
*pCurPam->GetPoint() = *(*ppPam)->Start();
@@ -203,42 +200,42 @@ sal_Bool Writer::CopyNextPam( SwPaM ** ppPam )
return sal_True;
}
-// suche die naechste Bookmark-Position aus der Bookmark-Tabelle
+// suche die nächste Bookmark-Position aus der Bookmark-Tabelle
sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const
{
- const IDocumentMarkAccess* const pMarkAccess =
pDoc->getIDocumentMarkAccess();
- const IDocumentMarkAccess::const_iterator_t ppBkmk = ::std::lower_bound(
- pMarkAccess->getAllMarksBegin(),
- pMarkAccess->getAllMarksEnd(),
- rPos,
- ::boost::bind(&::sw::mark::IMark::StartsBefore, _1, _2)); // find the
first Mark that does not start before
- if(ppBkmk != pMarkAccess->getAllMarksEnd())
- return ppBkmk - pMarkAccess->getAllMarksBegin();
- return -1;
+ const IDocumentMarkAccess* const pMarkAccess =
pDoc->getIDocumentMarkAccess();
+ const IDocumentMarkAccess::const_iterator_t ppBkmk = ::std::lower_bound(
+ pMarkAccess->getAllMarksBegin(),
+ pMarkAccess->getAllMarksEnd(),
+ rPos,
+ ::boost::bind(&::sw::mark::IMark::StartsBefore, _1, _2)); //
find the first Mark that does not start before
+ if(ppBkmk != pMarkAccess->getAllMarksEnd())
+ return ppBkmk - pMarkAccess->getAllMarksBegin();
+ return -1;
}
SwPaM *
Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const
nEndIdx)
{
- SwNodes *const pNds = &rDoc.GetNodes();
+ SwNodes *const pNds = &rDoc.GetNodes();
SwNodeIndex aStt( *pNds, nStartIdx );
SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
if( !pCNode && 0 == ( pCNode = pNds->GoNext( &aStt )) )
- {
+ {
ASSERT( false, "An StartPos kein ContentNode mehr" );
- }
+ }
SwPaM* pNew = new SwPaM( aStt );
pNew->SetMark();
aStt = nEndIdx;
if( 0 == (pCNode = aStt.GetNode().GetCntntNode()) &&
0 == (pCNode = pNds->GoPrevious( &aStt )) )
- {
+ {
ASSERT( false, "An StartPos kein ContentNode mehr" );
- }
+ }
pCNode->MakeEndIndex( &pNew->GetPoint()->nContent );
pNew->GetPoint()->nNode = aStt;
return pNew;
@@ -249,8 +246,8 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx,
sal_uLong const nEndId
// Stream-spezifisches
SvStream& Writer::Strm()
{
- ASSERT( m_pImpl->m_pStream, "Oh-oh. Writer with no Stream!" );
- return *m_pImpl->m_pStream;
+ ASSERT( m_pImpl->m_pStream, "Oh-oh. Writer with no Stream!" );
+ return *m_pImpl->m_pStream;
}
void Writer::SetStream(SvStream *const pStream)
@@ -258,7 +255,7 @@ void Writer::SetStream(SvStream *const pStream)
SvStream& Writer::OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen )
-{
// in einen Stream aus
+{
// in einen Stream aus
// Pointer an das Bufferende setzen
sal_Char* pStr = aNToABuf + (NTOABUFLEN-1);
for( sal_uInt8 n = 0; n < nLen; ++n )
@@ -307,20 +304,20 @@ SvStream& Writer::OutULong( SvStream& rStrm, sal_uLong
nVal )
sal_uLong Writer::Write( SwPaM& rPaM, SvStream& rStrm, const String* pFName )
{
- if ( IsStgWriter() )
- {
- SotStorageRef aRef = new SotStorage( rStrm );
- sal_uLong nResult = Write( rPaM, *aRef, pFName );
+ if ( IsStgWriter() )
+ {
+ SotStorageRef aRef = new SotStorage( rStrm );
+ sal_uLong nResult = Write( rPaM, *aRef, pFName );
if ( nResult == ERRCODE_NONE )
aRef->Commit();
return nResult;
- }
+ }
pDoc = rPaM.GetDoc();
pOrigFileName = pFName;
- m_pImpl->m_pStream = &rStrm;
+ m_pImpl->m_pStream = &rStrm;
- // PaM kopieren, damit er veraendert werden kann
+ // PaM kopieren, damit er verändert werden kann
pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
// zum Vergleich auf den akt. Pam sichern
pOrigPam = &rPaM;
@@ -335,7 +332,7 @@ sal_uLong Writer::Write( SwPaM& rPaM, SvStream& rStrm,
const String* pFName )
sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMed, const String* pFileName
)
{
// This method must be overloaded in SwXMLWriter a storage from medium
will be used there.
- // The microsoft format can write to storage but the storage will be
based on the stream.
+ // The Microsoft format can write to storage but the storage will be
based on the stream.
return Write( rPam, *rMed.GetOutStream(), pFileName );
}
@@ -353,8 +350,8 @@ sal_uLong Writer::Write( SwPaM&, const uno::Reference <
embed::XStorage >&, cons
sal_Bool Writer::CopyLocalFileToINet( String& rFileNm )
{
- if( !pOrigFileName ) // can be happen, by example if
we
- return sal_False; // write into the clipboard
+ if( !pOrigFileName ) // can be happen, by example if we
+ return sal_False; // write into the clipboard
sal_Bool bRet = sal_False;
INetURLObject aFileUrl( rFileNm ), aTargetUrl( *pOrigFileName );
@@ -363,27 +360,27 @@ sal_Bool Writer::CopyLocalFileToINet( String& rFileNm )
// if( aFileUrl.GetProtocol() == aFileUrl.GetProtocol() )
// return bRet;
// this is our old without the Mail-Export
- if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() &&
+ if( ! ( INET_PROT_FILE == aFileUrl.GetProtocol() &&
INET_PROT_FILE != aTargetUrl.GetProtocol() &&
- INET_PROT_FTP <= aTargetUrl.GetProtocol() &&
- INET_PROT_NEWS >= aTargetUrl.GetProtocol() ) )
+ INET_PROT_FTP <= aTargetUrl.GetProtocol() &&
+ INET_PROT_NEWS >= aTargetUrl.GetProtocol() ) )
return bRet;
- if (m_pImpl->pSrcArr)
+ if (m_pImpl->pSrcArr)
{
// wurde die Datei schon verschoben
sal_uInt16 nPos;
- if (m_pImpl->pSrcArr->Seek_Entry( &rFileNm, &nPos ))
- {
- rFileNm = *(*m_pImpl->pDestArr)[ nPos ];
+ if (m_pImpl->pSrcArr->Seek_Entry( &rFileNm, &nPos ))
+ {
+ rFileNm = *(*m_pImpl->pDestArr)[ nPos ];
return sal_True;
}
}
else
- {
- m_pImpl->pSrcArr = new SvStringsSortDtor( 4, 4 );
- m_pImpl->pDestArr = new SvStringsSortDtor( 4, 4 );
- }
+ {
+ m_pImpl->pSrcArr = new SvStringsSortDtor( 4, 4 );
+ m_pImpl->pDestArr = new SvStringsSortDtor( 4, 4 );
+ }
String *pSrc = new String( rFileNm );
String *pDest = new String( aTargetUrl.GetPartBeforeLastName() );
@@ -400,9 +397,9 @@ sal_Bool Writer::CopyLocalFileToINet( String& rFileNm )
bRet = 0 == aDstFile.GetError();
if( bRet )
- {
- m_pImpl->pSrcArr->Insert( pSrc );
- m_pImpl->pDestArr->Insert( pDest );
+ {
+ m_pImpl->pSrcArr->Insert( pSrc );
+ m_pImpl->pDestArr->Insert( pDest );
rFileNm = *pDest;
}
else
@@ -423,11 +420,11 @@ void Writer::PutNumFmtFontsInAttrPool()
const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
const SwNumRule* pRule;
const SwNumFmt* pFmt;
- // --> OD 2006-06-27 #b644095#
-// const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
- const Font* pFont;
- const Font* pDefFont = &numfunc::GetDefBulletFont();
- // <--
+ // --> OD 2006-06-27 #b644095#
+// const Font *pFont, *pDefFont = &SwNumRule::GetDefBulletFont();
+ const Font* pFont;
+ const Font* pDefFont = &numfunc::GetDefBulletFont();
+ // <--
sal_Bool bCheck = sal_False;
for( sal_uInt16 nGet = rListTbl.Count(); nGet; )
@@ -449,7 +446,7 @@ void Writer::PutNumFmtFontsInAttrPool()
_AddFontItem( rPool, SvxFontItem(
pFont->GetFamily(),
pFont->GetName(), pFont->GetStyleName(),
- pFont->GetPitch(), pFont->GetCharSet(),
RES_CHRATR_FONT ));
+
pFont->GetPitch(), pFont->GetCharSet(), RES_CHRATR_FONT ));
}
}
@@ -504,14 +501,14 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const
SvxFontItem& rFont )
if( 1 < pItem->GetRefCount() )
rPool.Remove( *pItem );
else
- {
- if (!m_pImpl->pFontRemoveLst)
- {
- m_pImpl->pFontRemoveLst = new SvPtrarr( 0, 10 );
- }
+ {
+ if (!m_pImpl->pFontRemoveLst)
+ {
+ m_pImpl->pFontRemoveLst = new SvPtrarr( 0, 10 );
+ }
void* p = (void*)pItem;
- m_pImpl->pFontRemoveLst->Insert( p, m_pImpl->pFontRemoveLst->Count() );
+ m_pImpl->pFontRemoveLst->Insert( p,
m_pImpl->pFontRemoveLst->Count() );
}
}
@@ -519,56 +516,56 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const
SvxFontItem& rFont )
// OtherPos of the bookmarks also inserted.
void Writer::CreateBookmarkTbl()
{
- const IDocumentMarkAccess* const pMarkAccess =
pDoc->getIDocumentMarkAccess();
- for(IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess->getBookmarksBegin();
- ppBkmk != pMarkAccess->getBookmarksEnd();
- ++ppBkmk)
- {
- m_pImpl->InsertBkmk(**ppBkmk);
- }
+ const IDocumentMarkAccess* const pMarkAccess =
pDoc->getIDocumentMarkAccess();
+ for(IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess->getBookmarksBegin();
+ ppBkmk != pMarkAccess->getBookmarksEnd();
+ ++ppBkmk)
+ {
+ m_pImpl->InsertBkmk(**ppBkmk);
+ }
}
-// search alle Bookmarks in the range and return it in the Array
+// search all Bookmarks in the range and return it in the Array
sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, xub_StrLen nStt,
- xub_StrLen nEnd, SvPtrarr& rArr)
+ xub_StrLen nEnd, SvPtrarr& rArr)
{
- ASSERT( !rArr.Count(), "es sind noch Eintraege vorhanden" );
-
- sal_uLong nNd = rNd.GetIndex();
- SvPtrarr* pArr = (m_pImpl->pBkmkNodePos) ?
- m_pImpl->pBkmkNodePos->Get( nNd ) : 0;
- if( pArr )
- {
- // there exist some bookmarks, search now all which is in the range
- if( !nStt && nEnd == rNd.Len() )
- // all
- rArr.Insert( pArr, 0 );
- else
- {
- sal_uInt16 n;
- xub_StrLen nCntnt;
- for( n = 0; n < pArr->Count(); ++n )
- {
- void* p = (*pArr)[ n ];
- const ::sw::mark::IMark& rBkmk = *(::sw::mark::IMark *)p;
- if( rBkmk.GetMarkPos().nNode == nNd &&
- (nCntnt = rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt
&&
- nCntnt < nEnd )
- {
- rArr.Insert( p, rArr.Count() );
- }
- else if( rBkmk.IsExpanded() && nNd ==
- rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nCntnt =
- rBkmk.GetOtherMarkPos().nContent.GetIndex() ) >= nStt
&&
- nCntnt < nEnd )
- {
- rArr.Insert( p, rArr.Count() );
- }
- }
- }
- }
- return rArr.Count();
+ ASSERT( !rArr.Count(), "es sind noch Einträge vorhanden" );
+
+ sal_uLong nNd = rNd.GetIndex();
+ SvPtrarr* pArr = (m_pImpl->pBkmkNodePos) ?
+ m_pImpl->pBkmkNodePos->Get( nNd ) : 0;
+ if( pArr )
+ {
+ // there exist some bookmarks, search now all which is in the
range
+ if( !nStt && nEnd == rNd.Len() )
+ // all
+ rArr.Insert( pArr, 0 );
+ else
+ {
+ sal_uInt16 n;
+ xub_StrLen nCntnt;
+ for( n = 0; n < pArr->Count(); ++n )
+ {
+ void* p = (*pArr)[ n ];
+ const ::sw::mark::IMark& rBkmk =
*(::sw::mark::IMark *)p;
+ if( rBkmk.GetMarkPos().nNode == nNd &&
+ (nCntnt =
rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt &&
+ nCntnt < nEnd )
+ {
+ rArr.Insert( p, rArr.Count() );
+ }
+ else if( rBkmk.IsExpanded() && nNd ==
+
rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nCntnt =
+
rBkmk.GetOtherMarkPos().nContent.GetIndex() ) >= nStt &&
+ nCntnt < nEnd )
+ {
+ rArr.Insert( p, rArr.Count() );
+ }
+ }
+ }
+ }
+ return rArr.Count();
}
////////////////////////////////////////////////////////////////////////////
@@ -583,12 +580,12 @@ sal_uLong StgWriter::WriteStream()
sal_uLong StgWriter::Write( SwPaM& rPaM, SvStorage& rStg, const String* pFName
)
{
- SetStream(0);
+ SetStream(0);
pStg = &rStg;
pDoc = rPaM.GetDoc();
pOrigFileName = pFName;
- // PaM kopieren, damit er veraendert werden kann
+ // PaM kopieren, damit er verändert werden kann
pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
// zum Vergleich auf den akt. Pam sichern
pOrigPam = &rPaM;
@@ -603,13 +600,13 @@ sal_uLong StgWriter::Write( SwPaM& rPaM, SvStorage& rStg,
const String* pFName )
sal_uLong StgWriter::Write( SwPaM& rPaM, const uno::Reference <
embed::XStorage >& rStg, const String* pFName, SfxMedium* pMedium )
{
- SetStream(0);
- pStg = 0;
- xStg = rStg;
+ SetStream(0);
+ pStg = 0;
+ xStg = rStg;
pDoc = rPaM.GetDoc();
pOrigFileName = pFName;
- // PaM kopieren, damit er veraendert werden kann
+ // PaM kopieren, damit er verändert werden kann
pCurPam = new SwPaM( *rPaM.End(), *rPaM.Start() );
// zum Vergleich auf den akt. Pam sichern
pOrigPam = &rPaM;
@@ -621,3 +618,5 @@ sal_uLong StgWriter::Write( SwPaM& rPaM, const
uno::Reference < embed::XStorage
return nRet;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/writer/wrt_fn.cxx
b/main/sw/source/filter/writer/wrt_fn.cxx
index 916a26f4c0..7f60968be7 100644
--- a/main/sw/source/filter/writer/wrt_fn.cxx
+++ b/main/sw/source/filter/writer/wrt_fn.cxx
@@ -19,31 +19,25 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <svl/itemiter.hxx>
#include <svl/whiter.hxx>
-
#include "shellio.hxx"
#include "wrt_fn.hxx"
#include "pam.hxx"
#include "node.hxx"
#include "format.hxx"
-
-
Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
{
sal_uInt16 nId = rHt.Which();
- ASSERT( nId < POOLATTR_END && nId >= POOLATTR_BEGIN,
"SwAttrFnTab::Out()" );
+ ASSERT( nId < POOLATTR_END && nId >= POOLATTR_BEGIN,
"SwAttrFnTab::Out()" );
FnAttrOut pOut;
if( 0 != ( pOut = pTab[ nId - RES_CHRATR_BEGIN] ))
(*pOut)( rWrt, rHt );
return rWrt;
-
}
Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
@@ -53,7 +47,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
// erst die eigenen Attribute ausgeben
const SfxItemPool& rPool = *rSet.GetPool();
const SfxItemSet* pSet = &rSet;
- if( !pSet->Count() ) // Optimierung - leere Sets
+ if( !pSet->Count() ) // Optimierung - leere Sets
{
if( !bDeep )
return rWrt;
@@ -97,7 +91,7 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
{
- // es muss ein CntntNode sein !!
+ // es muss ein CntntNode sein!
SwCntntNode * pCNd = rNode.GetCntntNode();
if( !pCNd )
return rWrt;
@@ -115,7 +109,7 @@ Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer
& rWrt )
nId = RES_OLENODE;
break;
default:
- ASSERT(false, "was fuer ein Node ist es denn nun?");
+ ASSERT(false, "was für ein Node ist es denn nun?");
break;
}
FnNodeOut pOut;
@@ -123,3 +117,5 @@ Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer
& rWrt )
(*pOut)( rWrt, *pCNd );
return rWrt;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/filter/writer/wrtswtbl.cxx
b/main/sw/source/filter/writer/wrtswtbl.cxx
index 3423c576ca..90ad24bf33 100644
--- a/main/sw/source/filter/writer/wrtswtbl.cxx
+++ b/main/sw/source/filter/writer/wrtswtbl.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
#include <hintids.hxx>
@@ -46,16 +44,16 @@ SV_IMPL_OP_PTRARR_SORT( SwWriteTableCols,
SwWriteTableColPtr )
sal_Int16 SwWriteTableCell::GetVertOri() const
{
- sal_Int16 eCellVertOri = text::VertOrientation::TOP;
+ sal_Int16 eCellVertOri = text::VertOrientation::TOP;
if( pBox->GetSttNd() )
{
const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
const SfxPoolItem *pItem;
if( SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT,
sal_False, &pItem ) )
{
- sal_Int16 eBoxVertOri =
+ sal_Int16 eBoxVertOri =
((const SwFmtVertOrient
*)pItem)->GetVertOrient();
- if( text::VertOrientation::CENTER==eBoxVertOri ||
text::VertOrientation::BOTTOM==eBoxVertOri)
+ if( text::VertOrientation::CENTER==eBoxVertOri ||
text::VertOrientation::BOTTOM==eBoxVertOri)
eCellVertOri = eBoxVertOri;
}
}
@@ -100,7 +98,7 @@ sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox
)
{
const SwFrmFmt *pFmt = pBox->GetFrmFmt();
const SwFmtFrmSize& aFrmSize=
- (const SwFmtFrmSize&)pFmt->GetFmtAttr( RES_FRM_SIZE );
+ (const SwFmtFrmSize&)pFmt->GetFmtAttr( RES_FRM_SIZE );
return sal::static_int_cast<sal_uInt32>(aFrmSize.GetSize().Width());
}
@@ -115,21 +113,21 @@ long SwWriteTable::GetLineHeight( const SwTableLine
*pLine )
long nHeight = 0;
if( bUseLayoutHeights )
{
- // Erstmal versuchen wir die Hoehe ueber das Layout zu bekommen
- bool bLayoutAvailable = false;
- nHeight = pLine->GetTableLineHeight(bLayoutAvailable);
+ // Erstmal versuchen wir die Höhe über das Layout zu bekommen
+ bool bLayoutAvailable = false;
+ nHeight = pLine->GetTableLineHeight(bLayoutAvailable);
if( nHeight > 0 )
return nHeight;
- // Wenn kein Layout gefunden wurde, gehen wir von festen Hoehen
aus.
- // --> FME 2007-3-26 #i60390# in some cases we still want to continue
- // to use the layout heights even if one of the rows has a height of 0
- // ('hidden' rows)
- // <--
+ // Wenn kein Layout gefunden wurde, gehen wir von festen Höhen
aus.
+ // --> FME 2007-3-26 #i60390# in some cases we still want to
continue
+ // to use the layout heights even if one of the rows has a
height of 0
+ // ('hidden' rows)
+ // <--
bUseLayoutHeights = bLayoutAvailable; /*sal_False;*/
#ifdef DBG_UTIL
- ASSERT( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout
ungueltig?" );
+ ASSERT( bLayoutAvailable || !bOldGetLineHeightCalled, "Layout
ungültig?" );
#endif
}
@@ -251,7 +249,7 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox
*pBox,
sal_uInt16 nBorderMask = 0;
const SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
- const SvxBoxItem& rBoxItem = (const SvxBoxItem&)pFrmFmt->GetFmtAttr(
RES_BOX );
+ const SvxBoxItem& rBoxItem = (const SvxBoxItem&)pFrmFmt->GetFmtAttr(
RES_BOX );
if( rBoxItem.GetTop() )
{
@@ -302,11 +300,11 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const
SwTableBox *pBox,
}
-sal_uInt32 SwWriteTable::GetRawWidth( sal_uInt16 nCol, sal_uInt16 nColSpan )
const
+sal_uInt32 SwWriteTable::GetRawWidth( sal_uInt16 nCol, sal_uInt16 nColSpan )
const
{
- sal_uInt32 nWidth = aCols[nCol+nColSpan-1]->GetPos();
+ sal_uInt32 nWidth = aCols[nCol+nColSpan-1]->GetPos();
if( nCol > 0 )
- nWidth = nWidth - aCols[nCol-1]->GetPos();
+ nWidth = nWidth - aCols[nCol-1]->GetPos();
return nWidth;
}
@@ -318,11 +316,11 @@ sal_uInt16 SwWriteTable::GetLeftSpace( sal_uInt16 nCol )
const
// In der ersten Spalte auch noch die Liniendicke abziehen
if( nCol==0 )
{
- nSpace = nSpace + nLeftSub;
+ nSpace = nSpace + nLeftSub;
const SwWriteTableCol *pCol = aCols[nCol];
if( pCol->HasLeftBorder() )
- nSpace = nSpace + nBorder;
+ nSpace = nSpace + nBorder;
}
return nSpace;
@@ -332,7 +330,7 @@ sal_uInt16 SwWriteTable::GetRightSpace( sal_uInt16 nCol,
sal_uInt16 nColSpan ) c
{
sal_uInt16 nSpace = nCellPadding;
- // In der letzten Spalte noch einmal zusaetzlich CELLSPACING und
+ // In der letzten Spalte noch einmal zusätzlich CELLSPACING und
// und die Liniendicke abziehen
if( nCol+nColSpan==aCols.Count() )
{
@@ -340,7 +338,7 @@ sal_uInt16 SwWriteTable::GetRightSpace( sal_uInt16 nCol,
sal_uInt16 nColSpan ) c
const SwWriteTableCol *pCol = aCols[nCol+nColSpan-1];
if( pCol->HasRightBorder() )
- nSpace = nSpace + nBorder;
+ nSpace = nSpace + nBorder;
}
return nSpace;
@@ -348,7 +346,7 @@ sal_uInt16 SwWriteTable::GetRightSpace( sal_uInt16 nCol,
sal_uInt16 nColSpan ) c
sal_uInt16 SwWriteTable::GetAbsWidth( sal_uInt16 nCol, sal_uInt16 nColSpan )
const
{
- sal_uInt32 nWidth = GetRawWidth( nCol, nColSpan );
+ sal_uInt32 nWidth = GetRawWidth( nCol, nColSpan );
if( nBaseWidth != nTabWidth )
{
nWidth *= nTabWidth;
@@ -374,7 +372,7 @@ sal_uInt16 SwWriteTable::GetPrcWidth( sal_uInt16 nCol,
sal_uInt16 nColSpan ) con
long nWidth = GetRawWidth( nCol, nColSpan );
// sieht komisch aus, ist aber nichts anderes als
- // [(100 * nWidth) + .5] ohne Rundungsfehler
+ // [(100 * nWidth) + .5] ohne Rundungsfehler
return (sal_uInt16)(long)Fraction( nWidth*100 + GetBaseWidth()/2,
GetBaseWidth() );
}
@@ -384,7 +382,7 @@ long SwWriteTable::GetAbsHeight( long nRawHeight,
sal_uInt16 nRow,
{
nRawHeight -= (2*nCellPadding + nCellSpacing);
- // In der ersten Zeile noch einmal zusaetzlich CELLSPACING und
+ // In der ersten Zeile noch einmal zusätzlich CELLSPACING und
// und die Liniendicke abziehen
const SwWriteTableRow *pRow = 0;
if( nRow==0 )
@@ -425,7 +423,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
sal_uInt16 nLines = rLines.Count();
#ifdef DBG_UTIL
- sal_uInt32 nEndCPos = 0;
+ sal_uInt32 nEndCPos = 0;
#endif
long nRPos = nStartRPos;
@@ -435,22 +433,22 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
long nOldRPos = nRPos;
- if( nLine < nLines-1 || nParentLineHeight==0 )
+ if( nLine < nLines-1 || nParentLineHeight==0 )
{
- long nLineHeight = GetLineHeight( pLine );
+ long nLineHeight = GetLineHeight( pLine );
nRPos += nLineHeight;
- if( nParentLineHeight && nStartRPos + nParentLineHeight <= nRPos )
- {
- /* If you have corrupt line height information, e.g. breaking
rows in complex table
- layout, you may run into this robust code.
- It's not allowed that subrows leaves their parentrow. If this
would happen the line
- height of subrow is reduced to a part of the remaining height
*/
- ASSERT( sal_False, "Corrupt line height I" );
- nRPos -= nLineHeight;
- nLineHeight = nStartRPos + nParentLineHeight - nRPos; //
remaining parent height
- nLineHeight /= nLines - nLine; // divided through the number
of remaining sub rows
- nRPos += nLineHeight;
- }
+ if( nParentLineHeight && nStartRPos + nParentLineHeight
<= nRPos )
+ {
+ /* If you have corrupt line height information,
e.g. breaking rows in complex table
+ layout, you may run into this robust code.
+ It's not allowed that subrows leaves their
parentrow. If this would happen the line
+ height of subrow is reduced to a part of the
remaining height */
+ ASSERT( sal_False, "Corrupt line height I" );
+ nRPos -= nLineHeight;
+ nLineHeight = nStartRPos + nParentLineHeight -
nRPos; // remaining parent height
+ nLineHeight /= nLines - nLine; // divided
through the number of remaining sub rows
+ nRPos += nLineHeight;
+ }
SwWriteTableRow *pRow = new SwWriteTableRow( nRPos,
bUseLayoutHeights);
sal_uInt16 nRow;
if( aRows.Seek_Entry( pRow, &nRow ) )
@@ -468,15 +466,15 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
SwWriteTableRow aRow( nStartRPos + nParentLineHeight,
bUseLayoutHeights );
ASSERT( aRows.Seek_Entry(&aRow),
"Parent-Zeile nicht gefunden" );
- SwWriteTableRow aRowCheckPos(nCheckPos,bUseLayoutHeights);
- SwWriteTableRow aRowRPos(nRPos,bUseLayoutHeights);
+ SwWriteTableRow
aRowCheckPos(nCheckPos,bUseLayoutHeights);
+ SwWriteTableRow aRowRPos(nRPos,bUseLayoutHeights);
ASSERT( !bUseLayoutHeights ||
- aRowCheckPos == aRowRPos,
- "Hoehe der Zeilen stimmt nicht mit
Parent ueberein" );
+ aRowCheckPos == aRowRPos,
+ "Höhe der Zeilen stimmt nicht mit
Parent überein" );
#endif
}
- // Fuer alle Boxen der Zeile ggf. eine Spalte einfuegen
+ // Für alle Boxen der Zeile ggf. eine Spalte einfügen
const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
sal_uInt16 nBoxes = rBoxes.Count();
@@ -487,9 +485,9 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
sal_uInt32 nOldCPos = nCPos;
- if( nBox < nBoxes-1 || (nParentLineWidth==0 &&
nLine==0) )
+ if( nBox < nBoxes-1 || (nParentLineWidth==0 &&
nLine==0) )
{
- nCPos = nCPos + GetBoxWidth( pBox );
+ nCPos = nCPos + GetBoxWidth( pBox );
SwWriteTableCol *pCol = new SwWriteTableCol(
nCPos );
sal_uInt16 nCol;
@@ -508,7 +506,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
else
{
#ifdef DBG_UTIL
- sal_uInt32 nCheckPos = nCPos + GetBoxWidth( pBox );
+ sal_uInt32 nCheckPos = nCPos + GetBoxWidth(
pBox );
if( !nEndCPos )
{
nEndCPos = nCheckPos;
@@ -517,7 +515,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
{
ASSERT( SwWriteTableCol(nCheckPos) ==
SwWriteTableCol(nEndCPos),
- "Zelle enthaelt unterschiedlich breite
Zeilen" );
+ "Zelle enthält unterschiedlich breite
Zeilen" );
}
#endif
nCPos = nStartCPos + nParentLineWidth;
@@ -527,7 +525,7 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
"Parent-Zelle nicht gefunden" );
ASSERT( SwWriteTableCol(nCheckPos) ==
SwWriteTableCol(nCPos),
- "Breite der Zellen stimmt nicht
mit Parent ueberein" );
+ "Breite der Zellen stimmt nicht
mit Parent überein" );
#endif
}
@@ -565,22 +563,22 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
{
const SwTableLine *pLine = rLines[nLine];
- // Position der letzten ueberdeckten Zeile ermitteln
+ // Position der letzten überdeckten Zeile ermitteln
long nOldRPos = nRPos;
if( nLine < nLines-1 || nParentLineHeight==0 )
- {
- long nLineHeight = GetLineHeight( pLine );
+ {
+ long nLineHeight = GetLineHeight( pLine );
nRPos += nLineHeight;
- if( nParentLineHeight && nStartRPos + nParentLineHeight <= nRPos )
- {
- /* See comment in CollectTableRowCols */
- ASSERT( sal_False, "Corrupt line height II" );
- nRPos -= nLineHeight;
- nLineHeight = nStartRPos + nParentLineHeight - nRPos; //
remaining parent height
- nLineHeight /= nLines - nLine; // divided through the number
of remaining sub rows
- nRPos += nLineHeight;
- }
- }
+ if( nParentLineHeight && nStartRPos + nParentLineHeight
<= nRPos )
+ {
+ /* See comment in CollectTableRowCols */
+ ASSERT( sal_False, "Corrupt line height II" );
+ nRPos -= nLineHeight;
+ nLineHeight = nStartRPos + nParentLineHeight -
nRPos; // remaining parent height
+ nLineHeight /= nLines - nLine; // divided
through the number of remaining sub rows
+ nRPos += nLineHeight;
+ }
+ }
else
nRPos = nStartRPos + nParentLineHeight;
@@ -593,13 +591,13 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
aRows.Seek_Entry( &aRow, &nRow );
ASSERT( bFound, "Wo ist die Zeile geblieben?" );
- ASSERT( nOldRow <= nRow, "Don't look back!" );
- if( nOldRow > nRow )
- {
- nOldRow = nRow;
- if( nOldRow )
- --nOldRow;
- }
+ ASSERT( nOldRow <= nRow, "Don't look back!" );
+ if( nOldRow > nRow )
+ {
+ nOldRow = nRow;
+ if( nOldRow )
+ --nOldRow;
+ }
SwWriteTableRow *pRow = aRows[nOldRow];
@@ -625,8 +623,8 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
{
pLineBrush = (const SvxBrushItem *)pItem;
- // Wenn die Zeile die gesamte Tabelle umspannt, koennen
- // Wir den Hintergrund an der Zeile ausgeben. Sonst
muessen
+ // Wenn die Zeile die gesamte Tabelle umspannt, können
+ // Wir den Hintergrund an der Zeile ausgeben. Sonst
müssen
// wir in an den Zelle ausgeben.
sal_Bool bOutAtRow = !nParentLineWidth;
if( !bOutAtRow && nStartCPos==0 )
@@ -658,11 +656,11 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
{
const SwTableBox *pBox = rBoxes[nBox];
- // Position der letzten ueberdeckten Spalte ermitteln
+ // Position der letzten überdeckten Spalte ermitteln
sal_uInt32 nOldCPos = nCPos;
if( nBox < nBoxes-1 || (nParentLineWidth==0 &&
nLine==0) )
{
- nCPos = nCPos + GetBoxWidth( pBox );
+ nCPos = nCPos + GetBoxWidth( pBox );
if( nBox==nBoxes-1 )
nParentLineWidth = nCPos - nStartCPos;
}
@@ -682,18 +680,18 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
{
sal_uInt16 nRowSpan = nRow - nOldRow + 1;
- // The new table model may have true row span attributes
- const long nAttrRowSpan = pBox->getRowSpan();
- if ( 1 < nAttrRowSpan )
- nRowSpan = (sal_uInt16)nAttrRowSpan;
- else if ( nAttrRowSpan < 1 )
- nRowSpan = 0;
+ // The new table model may have true row span
attributes
+ const long nAttrRowSpan = pBox->getRowSpan();
+ if ( 1 < nAttrRowSpan )
+ nRowSpan = (sal_uInt16)nAttrRowSpan;
+ else if ( nAttrRowSpan < 1 )
+ nRowSpan = 0;
sal_uInt16 nColSpan = nCol - nOldCol + 1;
pRow->AddCell( pBox, nOldRow, nOldCol,
nRowSpan, nColSpan,
nHeight,
pBrushItem );
- nHeight = 0; // Die Hoehe braucht nur einmal
geschieben werden
+ nHeight = 0; // Die Höhe braucht nur einmal
geschieben werden
if( pBox->GetSttNd() )
{
@@ -756,7 +754,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
bSubExpanded = sal_True;
}
- nCol++; // Die naechste Zelle faengt in der nachten
Spalte an
+ nCol++; // Die nächste Zelle fängt in der nächsten
Spalte an
}
nRow++;
@@ -764,7 +762,7 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos,
sal_uInt16 nStartRow,
}
SwWriteTable::SwWriteTable(const SwTableLines& rLines, long nWidth,
- sal_uInt32 nBWidth, sal_Bool bRel, sal_uInt16 nMaxDepth, sal_uInt16 nLSub,
sal_uInt16 nRSub, sal_uInt32 nNumOfRowsToRepeat)
+ sal_uInt32 nBWidth, sal_Bool bRel, sal_uInt16 nMaxDepth, sal_uInt16
nLSub, sal_uInt16 nRSub, sal_uInt32 nNumOfRowsToRepeat)
: nBorderColor((sal_uInt32)-1), nCellSpacing(0), nCellPadding(0),
nBorder(0),
nInnerBorder(0), nBaseWidth(nBWidth), nHeadEndRow(USHRT_MAX),
nLeftSub(nLSub), nRightSub(nRSub), nTabWidth(nWidth), bRelWidths(bRel),
@@ -775,7 +773,7 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long
nWidth,
bColsOption(false), bColTags(true), bLayoutExport(false),
bCollectBorderWidth(true)
{
- sal_uInt32 nParentWidth = nBaseWidth + nLeftSub + nRightSub;
+ sal_uInt32 nParentWidth = nBaseWidth + nLeftSub + nRightSub;
// Erstmal die Tabellen-Struktur festlegen. Hinter der Tabelle ist in
// jedem Fall eine Spalte zu Ende
@@ -783,8 +781,8 @@ SwWriteTable::SwWriteTable(const SwTableLines& rLines, long
nWidth,
aCols.Insert( pCol );
CollectTableRowsCols( 0, 0, 0, nParentWidth, rLines, nMaxDepth - 1 );
- // Und jetzt mit leben fuellen
- FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth - 1,
static_cast< sal_uInt16 >(nNumOfRowsToRepeat) );
+ // Und jetzt mit leben füllen
+ FillTableRowsCols( 0, 0, 0, 0, 0, nParentWidth, rLines, 0, nMaxDepth -
1, static_cast< sal_uInt16 >(nNumOfRowsToRepeat) );
// Einige Twip-Werte an Pixel-Grenzen anpassen
if( !nBorder )
@@ -840,7 +838,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout
*pLayoutInfo )
aRows.Insert( pRow );
}
- // Und jetzt mit leben fuellen
+ // Und jetzt mit Leben füllen
for( nRow=0; nRow<nRows; nRow++ )
{
SwWriteTableRow *pRow = aRows[nRow];
@@ -868,7 +866,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout
*pLayoutInfo )
sal_uInt16 nColSpan = pLayoutCell->GetColSpan();
const SwTableBox *pBox = pLayoutCnts->GetTableBox();
ASSERT( pBox,
- "Tabelle in Tabelle kann nicht ueber
Layout exportiert werden" );
+ "Tabelle in Tabelle kann nicht über
Layout exportiert werden" );
long nHeight = bHeightExported ? 0 : GetLineHeight(
pBox );
const SvxBrushItem *pBrushItem = GetLineBrush( pBox,
pRow );
@@ -899,7 +897,7 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout
*pLayoutInfo )
if( !(nBorderMask & 2) )
pEndRow->bBottomBorder = sal_False;
- // Die Hoehe braucht nur einmal geschieben werden
+ // Die Höhe braucht nur einmal geschrieben werden
if( nHeight )
bHeightExported = sal_True;
}
@@ -913,3 +911,5 @@ SwWriteTable::SwWriteTable( const SwHTMLTableLayout
*pLayoutInfo )
SwWriteTable::~SwWriteTable()
{
}
+
+/* vim: set noet sw=4 ts=4: */
