summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 21:01:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 09:41:00 -0600
commita27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch)
tree065df066de07f3d7194178352f3449702bc34bd5 /sw/source/filter
parent150420cbff39967e9376cab05b6af45b642edae8 (diff)
Remove visual noise from sw
Conflicts: sw/inc/unodraw.hxx sw/inc/unoframe.hxx sw/sdi/swriter.sdi sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unoparagraph.cxx sw/source/filter/ww8/rtfexportfilter.cxx sw/source/ui/inc/unotxvw.hxx sw/source/ui/lingu/hyp.cxx sw/source/ui/lingu/sdrhhcwrap.cxx sw/source/ui/uno/swdetect.hxx Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908 Reviewed-on: https://gerrit.libreoffice.org/8322 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ascii/ascatr.cxx6
-rw-r--r--sw/source/filter/ascii/parasc.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx4
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/basflt/docfact.cxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx14
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx20
-rw-r--r--sw/source/filter/html/css1atr.cxx20
-rw-r--r--sw/source/filter/html/css1kywd.cxx20
-rw-r--r--sw/source/filter/html/css1kywd.hxx22
-rw-r--r--sw/source/filter/html/htmlatr.cxx32
-rw-r--r--sw/source/filter/html/htmlbas.cxx4
-rw-r--r--sw/source/filter/html/htmlcss1.cxx19
-rw-r--r--sw/source/filter/html/htmlctxt.cxx10
-rw-r--r--sw/source/filter/html/htmldraw.cxx7
-rw-r--r--sw/source/filter/html/htmlfld.cxx3
-rw-r--r--sw/source/filter/html/htmlfld.hxx1
-rw-r--r--sw/source/filter/html/htmlfldw.cxx2
-rw-r--r--sw/source/filter/html/htmlfly.cxx23
-rw-r--r--sw/source/filter/html/htmlfly.hxx1
-rw-r--r--sw/source/filter/html/htmlflyt.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx1
-rw-r--r--sw/source/filter/html/htmlform.hxx5
-rw-r--r--sw/source/filter/html/htmlforw.cxx8
-rw-r--r--sw/source/filter/html/htmlftn.cxx1
-rw-r--r--sw/source/filter/html/htmlgrin.cxx6
-rw-r--r--sw/source/filter/html/htmlnum.cxx8
-rw-r--r--sw/source/filter/html/htmlnum.hxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx7
-rw-r--r--sw/source/filter/html/htmlsect.cxx5
-rw-r--r--sw/source/filter/html/htmltab.cxx46
-rw-r--r--sw/source/filter/html/htmltabw.cxx9
-rw-r--r--sw/source/filter/html/htmlvsh.hxx4
-rw-r--r--sw/source/filter/html/parcss1.cxx53
-rw-r--r--sw/source/filter/html/svxcss1.cxx44
-rw-r--r--sw/source/filter/html/svxcss1.hxx4
-rw-r--r--sw/source/filter/html/swcss1.hxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx40
-rw-r--r--sw/source/filter/html/swhtml.hxx18
-rw-r--r--sw/source/filter/html/wrthtml.cxx7
-rw-r--r--sw/source/filter/html/wrthtml.hxx4
-rw-r--r--sw/source/filter/inc/fltini.hxx1
-rw-r--r--sw/source/filter/inc/fltshell.hxx15
-rw-r--r--sw/source/filter/inc/rtf.hxx1
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx4
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx18
-rw-r--r--sw/source/filter/writer/writer.cxx3
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx5
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx6
-rw-r--r--sw/source/filter/ww1/fltshell.cxx14
-rw-r--r--sw/source/filter/ww1/w1class.cxx6
-rw-r--r--sw/source/filter/ww1/w1filter.cxx4
-rw-r--r--sw/source/filter/ww1/w1par.hxx1
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx2
-rw-r--r--sw/source/filter/ww1/w1struct.hxx5
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx1
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx7
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx1
-rw-r--r--sw/source/filter/ww8/docxexport.cxx3
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx1
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx1
-rw-r--r--sw/source/filter/ww8/fields.cxx1
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx1
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx1
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx3
-rw-r--r--sw/source/filter/ww8/styles.cxx1
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx6
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx8
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx8
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx10
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx21
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx31
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx3
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx1
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx10
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx12
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx29
-rw-r--r--sw/source/filter/ww8/ww8par.hxx29
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx31
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx1
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx121
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx3
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx16
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx27
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx32
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx12
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx15
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx2
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx3
-rw-r--r--sw/source/filter/xml/swxml.cxx1
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/filter/xml/wrtxml.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx1
-rw-r--r--sw/source/filter/xml/xmlexp.cxx8
-rw-r--r--sw/source/filter/xml/xmlexp.hxx1
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx1
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx3
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.hxx1
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx2
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx4
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx1
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx3
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx7
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx1
116 files changed, 141 insertions, 964 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 097145bbdc07..1fb879fb2fd4 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -66,7 +66,6 @@ public:
bool OutAttr( sal_Int32 nSwPos );
};
-
SwASC_AttrIter::SwASC_AttrIter(
SwASCWriter& rWr,
const SwTxtNode& rTxtNd,
@@ -78,7 +77,6 @@ SwASC_AttrIter::SwASC_AttrIter(
nAktSwPos = SearchNext( nStt + 1 );
}
-
sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
{
sal_Int32 nMinPos = SAL_MAX_INT32;
@@ -119,7 +117,6 @@ sal_Int32 SwASC_AttrIter::SearchNext( sal_Int32 nStartPos )
return nMinPos;
}
-
bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
{
bool bRet = false;
@@ -168,11 +165,8 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
return bRet;
}
-
-
// Output of the node
-
static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
{
const SwTxtNode& rNd = (SwTxtNode&)rNode;
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 320447832169..8371f1536bbf 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -67,7 +67,6 @@ public:
sal_uLong CallParser();
};
-
// Call for the general reader interface
sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OUString & )
{
@@ -130,7 +129,6 @@ SwASCIIParser::~SwASCIIParser()
delete pItemSet;
}
-
// Calling the parser
sal_uLong SwASCIIParser::CallParser()
{
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 67ac4c6a7234..8b89a9a8a815 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -31,8 +31,6 @@
#include <statstr.hrc>
-
-
SwASCWriter::SwASCWriter( const OUString& rFltNm )
{
SwAsciiOptions aNewOpts;
@@ -193,11 +191,9 @@ sal_uLong SwASCWriter::WriteStream()
return 0;
}
-
void GetASCWriter( const OUString& rFltNm, const OUString& /*rBaseURL*/, WriterRef& xRet )
{
xRet = new SwASCWriter( rFltNm );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index 0c6d5b69d5e0..5a76ef7eb1bc 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.hxx
@@ -24,7 +24,6 @@
extern SwNodeFnTab aASCNodeFnTab;
-
// The ASC writer
class SwASCWriter : public Writer
@@ -40,7 +39,6 @@ public:
OUString GetLineEnd() const { return m_sLineEnd; }
};
-
#endif // _ INCLUDED_SW_SOURCE_FILTER_ASCII_WRTASC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/basflt/docfact.cxx b/sw/source/filter/basflt/docfact.cxx
index 15f73ae79818..a95d122bbd24 100644
--- a/sw/source/filter/basflt/docfact.cxx
+++ b/sw/source/filter/basflt/docfact.cxx
@@ -23,7 +23,6 @@
#include <cmdid.h>
-
/******************************************************************************
* Methode : SwDocFac::SwDocFac( SwDoc *pDoc )
******************************************************************************/
@@ -39,7 +38,6 @@ SwDocFac::SwDocFac( SwDoc *pDc )
* Methode : SwDocFac::~SwDocFac()
******************************************************************************/
-
SwDocFac::~SwDocFac()
{
if( pDoc && !pDoc->release() )
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 12e7c93eaa96..00b6e9aa9346 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -200,31 +200,22 @@ SwRead GetReader( const OUString& rFltName )
void Writer::SetVersion( const OUString&, long ) {}
-
sal_Bool Writer::IsStgWriter() const { return sal_False; }
sal_Bool StgWriter::IsStgWriter() const { return sal_True; }
-
-
-
sal_Bool SwReader::NeedsPasswd( const Reader& /*rOptions*/ )
{
return sal_False;
}
-
sal_Bool SwReader::CheckPasswd( const OUString& /*rPasswd*/, const Reader& /*rOptions*/ )
{
return sal_True;
}
-
-
-
// Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt.
-
/*
<FilterFlags>
<Excel_Lotus>
@@ -296,16 +287,12 @@ void SwFilterOptions::GetValues( sal_uInt16 nCnt, const sal_Char** ppNames,
void SwFilterOptions::Commit() {}
void SwFilterOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
-
-
void StgReader::SetFltName( const OUString& rFltNm )
{
if( SW_STORAGE_READER & GetReaderType() )
aFltName = rFltNm;
}
-
-
SwRelNumRuleSpaces::SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNDoc )
{
pNumRuleTbl = new SwNumRuleTbl();
@@ -601,7 +588,6 @@ OUString NameFromCharSet(rtl_TextEncoding nChrSet)
// 3. Fontname
// 4. Language
// the delimiter character is ","
-//
void SwAsciiOptions::ReadUserData( const OUString& rStr )
{
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index e8c6729a6c90..f53ad3b62b25 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <iodetect.hxx>
#include <boost/scoped_array.hpp>
#include <osl/endian.h>
@@ -373,7 +372,6 @@ const SfxFilter* SwIoSystem::GetFileFilter(const OUString& rFileName,
TerminateBuffer(aBuffer, nBytesRead, sizeof(aBuffer));
-
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
/* suche nach dem bestimmten Filter, falls kein entsprechender */
/* gefunden wird, so wird der ASCII-Filter returnt. */
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 4e7c6bfa48b1..0d2b4431476c 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
@@ -57,8 +56,6 @@
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////
-
sal_uLong SwReader::Read( const Reader& rOptions )
{
// Variable uebertragen
@@ -399,7 +396,6 @@ sal_uLong SwReader::Read( const Reader& rOptions )
return nError;
}
-
/*
* Konstruktoren, Destruktor
*/
@@ -616,18 +612,15 @@ int Reader::SetStrmStgPtr()
return sal_False;
}
-
int Reader::GetReaderType()
{
return SW_STREAM_READER;
}
-
void Reader::SetFltName( const OUString& )
{
}
-
void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet )
{
rFrmSet.Put( SvxLRSpaceItem(RES_LR_SPACE) );
@@ -635,7 +628,6 @@ void Reader::ResetFrmFmtAttrs( SfxItemSet &rFrmSet )
rFrmSet.Put( SvxBoxItem(RES_BOX) );
}
-
void Reader::ResetFrmFmts( SwDoc& rDoc )
{
for (sal_uInt16 i=0; i<3; ++i)
@@ -672,7 +664,6 @@ size_t Reader::GetSectionList( SfxMedium&, std::vector<OUString*>& ) const
return 0;
}
-
sal_Bool SwReader::HasGlossaries( const Reader& rOptions )
{
// Variable uebertragen
@@ -714,16 +705,11 @@ sal_Bool Reader::ReadGlossaries( SwTextBlocks&, sal_Bool ) const
return sal_False;
}
-
-
int StgReader::GetReaderType()
{
return SW_STORAGE_READER;
}
-
-
-
/*
* Writer
*/
@@ -944,11 +930,6 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
return nError;
}
-
-
-
-
-
sal_Bool SetHTMLTemplate( SwDoc & rDoc )
{
// Vorlagennamen von den Sfx-HTML-Filter besorgen!!!
@@ -970,5 +951,4 @@ sal_Bool SetHTMLTemplate( SwDoc & rDoc )
return bRet;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index ac8162d55541..819b21388c08 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -110,8 +110,6 @@ using ::editeng::SvxBorderLine;
#define CSS1_FRMSIZE_ANYHEIGHT 0x0e
#define CSS1_FRMSIZE_PIXEL 0x10
-
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" );
const sal_Char cCSS1_style_opt_end = '\"';
@@ -203,8 +201,6 @@ public:
}
};
-
-
void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
const sal_Char *pVal,
const OUString *pSVal )
@@ -258,7 +254,6 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
sOut.append("; ");
}
-
sOut.append(OString(pProp) + ": ");
if( nCSS1OutMode & CSS1_OUTMODE_ENCODE )
{
@@ -582,7 +577,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
}
// /Feature: PrintExt
-
// The text body style has to be exported always (if it is changed compared
// to the template), because it is used as reference for any style
// that maps to <P>, and that's especially the standard style
@@ -643,8 +637,6 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
nDfltBottomMargin = 0;
}
-
-
// wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben,
// sonst wird nur nach Token und Class fuer ein Format gesucht
sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString& rToken,
@@ -1644,7 +1636,6 @@ static Writer& OutCSS1_SwFmt( Writer& rWrt, const SwFmt& rFmt,
RES_POOLCHR_INET_VISIT==nRefPoolId) )
bCheckForPseudo = true;
-
// jetzt die Attribute (inkl. Selektor) ausgeben
bool bHasScriptDependencies = false;
if( OutCSS1Rule( rHTMLWrt, aSelector, aItemSet, CSS1_FMT_ISTAG != nDeep,
@@ -1841,7 +1832,6 @@ Writer& OutCSS1_BodyTagStyleOpt( Writer& rWrt, const SfxItemSet& rItemSet )
SwCSS1OutMode aMode( rHTMLWrt, CSS1_OUTMODE_STYLE_OPT_ON |
CSS1_OUTMODE_ENCODE|CSS1_OUTMODE_BODY );
-
// Es werden nur die Attribute der Seiten-Vorlage ausgegeben.
// Die Attribute der Standard-Absatz-Vorlage werden schon beim
// Export der Absatz-Vorlagen beruecksichtigt.
@@ -1927,7 +1917,6 @@ Writer& OutCSS1_TableBGStyleOpt( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
sal_uInt8 nLevel )
{
@@ -1962,8 +1951,6 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
return rWrt;
}
-
-
void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
sal_uInt32 nFrmOpts,
const SdrObject *pSdrObj,
@@ -2322,8 +2309,6 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
}
}
-
-
static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
const SvxUnderlineItem *pUItem,
const SvxOverlineItem *pOItem,
@@ -2452,7 +2437,6 @@ static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
return rWrt;
}
-
static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2481,7 +2465,6 @@ static Writer& OutCSS1_SvxCaseMap( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2502,7 +2485,6 @@ static Writer& OutCSS1_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutCSS1_SvxCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
{
// Mit dieser Methode werden nur Hints ausgegeben!
@@ -2689,7 +2671,6 @@ static Writer& OutCSS1_SvxUnderline( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt )
{
// Mit dieser Methode werden nur Hints ausgegeben!
@@ -3564,7 +3545,6 @@ static Writer& OutCSS1_SvxFrameDirection( Writer& rWrt, const SfxPoolItem& rHt )
* bekannt sein muessen.
*/
-
SwAttrFnTab aCSS1AttrFnTab = {
/* RES_CHRATR_CASEMAP */ OutCSS1_SvxCaseMap,
/* RES_CHRATR_CHARSETCOLOR */ 0,
diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
index ef3a0ebc7a43..0ac6b283bba8 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -19,10 +19,8 @@
#include "css1kywd.hxx"
-
sal_Char CSS1_CONSTASCII_DEF( sCSS_mimetype, "text/css" );
-
// ein par allgemeine Strings
sal_Char CSS1_CONSTASCII_DEF( sCSS1_import, "import" );
@@ -56,7 +54,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_px, "px" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_em, "em" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_UNIT_ex, "ex" );
-
// Strings fuer Font-Properties
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_family, "font-family" );
@@ -67,20 +64,17 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_cursive, "cursive" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_fantasy, "fantasy" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_monospace, "monospace" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_style, "font-style" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_italic, "italic" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_oblique, "oblique" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_variant, "font-variant" );
//sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_normal, "normal" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_small_caps, "small-caps" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font_weight, "font-weight" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_extra_light, "extra-light" );
@@ -112,17 +106,12 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_xx_large, "xx-large" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_larger, "larger" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_smaller, "smaller" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_font, "font" );
-
-
-
// Strings fuer Farb- und Hintergrund-Properties
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_color, "color" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background, "background" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_background_color, "background-color" );
@@ -139,13 +128,10 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_bottom, "bottom" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_scroll, "scroll" );
-
-
// Strings fuer Text-Properties
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_letter_spacing, "letter-spacing" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_decoration, "text-decoration" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_none, "none" );
@@ -154,7 +140,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_overline, "overline" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_line_through, "line-through" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_blink, "blink" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_align, "text-align" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_left, "left" );
@@ -162,14 +147,10 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_center, "center" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_right, "right" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_justify, "justify" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_text_indent, "text-indent" );
-
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_line_height, "line-height" );
-
-
// Strings fuer Box-Properties
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_margin_left, "margin-left" );
@@ -233,7 +214,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_left, "left" );
sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_top, "top" );
-
// Feature: PrintExt
// Strings fuer Printing Extensions
diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
index 257893893041..755d0de9bd83 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -29,10 +29,8 @@
#define CSS1_CONSTASCII_DEF( n, s ) n[sizeof(s)] = s
#endif
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS_mimetype, "text/css" );
-
// ein par allgemeine Strings
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_import, "import" );
@@ -66,7 +64,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_px, "px" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_em, "em" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_UNIT_ex, "ex" );
-
// Strings fuer Font-Properties
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_family, "font-family" );
@@ -77,14 +74,12 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_cursive, "cursive" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_fantasy, "fantasy" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_monospace, "monospace" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_style, "font-style" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_italic, "italic" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_oblique, "oblique" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_variant, "font-variant" );
//sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_normal, "normal" );
@@ -108,7 +103,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_extra_bold, "extra-bold" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_lighter, "lighter" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bolder, "bolder" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font_size, "font-size" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_small, "xx-small" );
@@ -122,17 +116,12 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_xx_large, "xx-large" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_larger, "larger" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_smaller, "smaller" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_font, "font" );
-
-
-
// Strings fuer Farb- und Hintergrund-Properties
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_color, "color" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background, "background" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_background_color, "background-color" );
@@ -149,13 +138,10 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_bottom, "bottom" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_scroll, "scroll" );
-
-
// Strings fuer Text-Properties
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_letter_spacing, "letter-spacing" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_decoration, "text-decoration" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_none, "none" );
@@ -164,7 +150,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_overline, "overline" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_line_through, "line-through" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_blink, "blink" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_align, "text-align" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_left, "left" );
@@ -172,14 +157,10 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_center, "center" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_right, "right" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_justify, "justify" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_text_indent, "text-indent" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_line_height, "line-height" );
-
-
// Strings fuer Box-Properties
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_margin_left, "margin-left" );
@@ -243,7 +224,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_left, "left" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_top, "top" );
-
// Feature: PrintExt
// Strings fuer Printing Extensions
@@ -269,7 +249,6 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_landscape, "landscape" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_class_abs_pos, "sd-abs-pos" );
-
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_so_language, "so-language" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_direction, "direction" );
extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" );
@@ -280,5 +259,4 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_display, "display" );
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 083b282c8693..65bb022a1dbd 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -149,7 +149,6 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
nDefListLvl = nNewLvl;
}
-
void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew )
{
if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken )
@@ -389,7 +388,6 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
}
}
-
// Die diversen default-Abstaende aus der Vorlage oder der
// Vergleischs-Vorlage merken
const SvxLRSpaceItem &rLRSpace =
@@ -605,7 +603,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
pNodeItemSet ? ((const SvxULSpaceItem &)pNodeItemSet->Get(RES_UL_SPACE))
: rFmt.GetULSpace();
-
if( (rHWrt.bOutHeader &&
rWrt.pCurPam->GetPoint()->nNode.GetIndex() ==
rWrt.pCurPam->GetMark()->nNode.GetIndex()) ||
@@ -639,7 +636,6 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
return;
}
-
// soll ein ALIGN=... geschrieben werden?
const SfxPoolItem* pAdjItem = 0;
const SfxPoolItem* pItem;
@@ -1040,7 +1036,6 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
}
}
-
class HTMLSttEndPos
{
sal_Int32 nStart;
@@ -1085,7 +1080,6 @@ enum HTMLOnOffState { HTML_NOT_SUPPORTED, // nicht unterst. Attribut
HTML_DROPCAP_VALUE, // DropCap-Attributs
HTML_AUTOFMT_VALUE }; // Attribute for automatic character styles
-
class HTMLEndPosLst
{
_HTMLEndLst aStartLst; // nach Anfangs-Psoitionen sortierte Liste
@@ -1100,12 +1094,11 @@ class HTMLEndPosLst
SwDoc *pDoc; // das aktuelle Dokument
SwDoc* pTemplate; // die HTML-Vorlage (oder 0)
const Color* pDfltColor;// die Default-Vordergrund-Farbe
- std::set<OUString>& rScriptTxtStyles; //
+ std::set<OUString>& rScriptTxtStyles;
sal_uLong nHTMLMode;
sal_Bool bOutStyles : 1; // werden Styles exportiert
-
// die Position eines Items in der Start-/Ende-Liste suchen
sal_uInt16 _FindStartPos( const HTMLSttEndPos *pPos ) const;
sal_uInt16 _FindEndPos( const HTMLSttEndPos *pPos ) const;
@@ -1126,7 +1119,6 @@ class HTMLEndPosLst
sal_Bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
sal_Int32 nEndPos );
-
// das Ende eines gesplitteten Items anpassen
void FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd,
sal_uInt16 nStartPos );
@@ -1176,7 +1168,6 @@ public:
sal_Bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; }
};
-
sal_uInt16 HTMLEndPosLst::_FindStartPos( const HTMLSttEndPos *pPos ) const
{
sal_uInt16 i;
@@ -1200,7 +1191,6 @@ sal_uInt16 HTMLEndPosLst::_FindEndPos( const HTMLSttEndPos *pPos ) const
return i==aEndLst.size() ? USHRT_MAX : i;
}
-
void HTMLEndPosLst::_InsertItem( HTMLSttEndPos *pPos, sal_uInt16 nEndPos )
{
// In der Start-Liste das Attribut hinter allen vorher und an
@@ -1503,7 +1493,6 @@ void HTMLEndPosLst::FixSplittedItem( HTMLSttEndPos *pPos, sal_Int32 nNewEnd,
}
}
-
void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart,
sal_Int32 nEnd )
{
@@ -1536,8 +1525,6 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart,
_InsertItem( new HTMLSttEndPos( rItem, nStart, nEnd ), i );
}
-
-
void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart,
sal_Int32 nEnd )
{
@@ -1652,8 +1639,6 @@ HTMLEndPosLst::~HTMLEndPosLst()
OSL_ENSURE(aEndLst.empty(), "End List not empty in destructor");
}
-
-
void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
sal_Int32 nStart, sal_Int32 nEnd,
SwHTMLFmtInfos& rFmtInfos, sal_Bool bParaAttrs )
@@ -2056,7 +2041,6 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
}
}
-
/* Ausgabe der Nodes */
Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
{
@@ -2286,7 +2270,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
if( !bOldLFPossible && rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
-
// dann die Bookmarks (inkl. End-Tag)
rHTMLWrt.bOutOpts = sal_False;
rHTMLWrt.OutBookmarks();
@@ -2334,7 +2317,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
rHTMLWrt.aChrFmtInfos, sal_False, sal_True );
}
-
if( !aOutlineTxt.isEmpty() || rHTMLWrt.pFmtFtn )
{
// Absatz-Attribute ausgeben, damit der Text die Attribute des
@@ -2361,7 +2343,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
// ausgegeben, so muessen auch da die Attribute stimmen!!
rHTMLWrt.bTxtAttr = sal_True;
-
sal_uInt16 nAttrPos = 0;
sal_Int32 nStrPos = rHTMLWrt.pCurPam->GetPoint()->nContent.GetIndex();
const SwTxtAttr * pHt = 0;
@@ -2651,7 +2632,6 @@ Writer& OutHTML_SwTxtNode( Writer& rWrt, const SwCntntNode& rNode )
return rHTMLWrt;
}
-
sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const
{
if( Application::GetDefaultDevice() && nVal )
@@ -2665,7 +2645,6 @@ sal_uInt32 SwHTMLWriter::ToPixel( sal_uInt32 nVal, const bool bVert ) const
return nVal;
}
-
static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
{
// wenn gerade Hints geschrieben werden versuchen wir den Hint als
@@ -2677,7 +2656,6 @@ static Writer& OutHTML_CSS1Attr( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
/* File CHRATR.HXX: */
static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
@@ -2711,7 +2689,6 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutHTML_SwPosture( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2833,7 +2810,6 @@ static Writer& OutHTML_SwWeight( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2855,7 +2831,6 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2886,8 +2861,6 @@ static Writer& OutHTML_SvxEscapement( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
-
static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2908,7 +2881,6 @@ static Writer& OutHTML_SwUnderline( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -2924,7 +2896,6 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
// Das ist jetzt unser Blink-Item. Blinkend wird eingeschaltet, indem man
// das Item auf sal_True setzt!
static Writer& OutHTML_SwBlink( Writer& rWrt, const SfxPoolItem& rHt )
@@ -3222,7 +3193,6 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
* bekannt sein muessen.
*/
-
SwAttrFnTab aHTMLAttrFnTab = {
/* RES_CHRATR_CASEMAP */ OutHTML_CSS1Attr,
/* RES_CHRATR_CHARSETCOLOR */ 0,
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 2bcf3b578b0d..b54789245d8c 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -42,12 +42,10 @@
#include "wrthtml.hxx"
#include "swhtml.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-
static HTMLOutEvent aBodyEventTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_O_SDonload, OOO_STRING_SVTOOLS_HTML_O_onload, SFX_EVENT_OPENDOC },
@@ -57,7 +55,6 @@ static HTMLOutEvent aBodyEventTable[] =
{ 0, 0, 0 }
};
-
void SwHTMLParser::NewScript()
{
ParseScriptOptions( aScriptType, sBaseURL, eScriptLang, aScriptURL,
@@ -341,5 +338,4 @@ void SwHTMLWriter::OutBasicBodyEvents()
bCfgStarBasic, eDestEnc, &aNonConvertableCharacters );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 74cc7bcd2aab..186fe93ca0c2 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -62,7 +62,6 @@
using namespace ::com::sun::star;
-
// Wie viele Zeilen/Zeichen sind fuer DropCaps erlaubt?
// (Gibt es vielleicht woanders entsprechende Werte?)
#define MAX_DROPCAP_LINES 9
@@ -70,7 +69,6 @@ using namespace ::com::sun::star;
static void lcl_swcss1_setEncoding( SwFmt& rFmt, rtl_TextEncoding eEnc );
-
// Implementierung des SwCSS1Parsers (eigentlich swcss1.cxx)
static struct SwCSS1ItemIds
{
@@ -131,8 +129,6 @@ SwCSS1Parser::~SwCSS1Parser()
{
}
-
-
// Feature: PrintExt
sal_Bool SwCSS1Parser::SetFmtBreak( SfxItemSet& rItemSet,
const SvxCSS1PropertyInfo& rPropInfo )
@@ -1149,7 +1145,6 @@ const FontList *SwCSS1Parser::GetFontList() const
return pFList;
}
-
SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass ) const
{
// die entsprechende Vorlage suchen
@@ -1229,8 +1224,6 @@ SwCharFmt* SwCSS1Parser::GetChrFmt( sal_uInt16 nToken2, const OUString& rClass )
return pCFmt;
}
-
-
SwTxtFmtColl *SwCSS1Parser::GetTxtCollFromPool( sal_uInt16 nPoolId ) const
{
sal_uInt16 nOldArrLen = pDoc->GetTxtFmtColls()->size();
@@ -1448,18 +1441,17 @@ const SwPageDesc *SwCSS1Parser::GetPageDesc( sal_uInt16 nPoolId, sal_Bool bCreat
return pPageDesc;
}
-
sal_Bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
sal_Bool bAutoWidth )
{
// abs-pos
// left/top none auto twip perc
- //
+
// none Z Z - -
// auto Z Z - -
// twip Z Z S/R -
// perc - - - -
- //
+
// - das Tag wird absolut positioniert und left/top sind beide
// gegeben und enthalten auch keine %-Angabe, oder
// - das Tag soll fliessen, und
@@ -1475,8 +1467,6 @@ sal_Bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType );
}
-
-
void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass )
{
OSL_ENSURE( !rClass.isEmpty(), "Style-Klasse ohne Laenge?" );
@@ -1484,7 +1474,6 @@ void SwCSS1Parser::AddClassName( OUString& rFmtName, const OUString& rClass )
rFmtName += "." + rClass;
}
-
void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
SfxItemSet& rItemSet,
const OUString *pName )
@@ -1561,7 +1550,6 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop,
}
}
-
// CSS1-sezifisches des SwHTMLParsers
_HTMLAttr **SwHTMLParser::GetAttrTabEntry( sal_uInt16 nWhich )
@@ -1737,7 +1725,6 @@ sal_Bool SwHTMLParser::FileDownload( const OUString& rURL,
GetSrcEncoding());
}
-
// wurde abgebrochen?
if( ( pDoc->GetDocShell() && pDoc->GetDocShell()->IsAbortingImport() )
|| 1 == pDoc->getReferenceCount() )
@@ -2149,8 +2136,6 @@ void SwHTMLParser::SetFrmFmtAttrs( SfxItemSet &rItemSet,
}
}
-
-
_HTMLAttrContext *SwHTMLParser::PopContext( sal_uInt16 nToken, sal_uInt16 nLimit,
sal_Bool bRemove )
{
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index fb077664de28..adcd9256d7f1 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -38,9 +38,6 @@
using namespace ::com::sun::star;
-
-
-
class _HTMLAttrContext_SaveDoc
{
SwHTMLNumRuleInfo aNumRuleInfo; // In Umgebung gueltige Numerierung
@@ -112,7 +109,6 @@ _HTMLAttrTable *_HTMLAttrContext_SaveDoc::GetAttrTab( sal_Bool bCreate )
return pAttrTab;
}
-
_HTMLAttrContext_SaveDoc *_HTMLAttrContext::GetSaveDocContext( sal_Bool bCreate )
{
if( !pSaveDocContext && bCreate )
@@ -127,7 +123,6 @@ void _HTMLAttrContext::ClearSaveDocContext()
pSaveDocContext = 0;
}
-
void SwHTMLParser::SplitAttrTab( const SwPosition& rNewPos )
{
// preliminary paragraph attributes are not allowed here, they could
@@ -263,7 +258,6 @@ void SwHTMLParser::SaveDocContext( _HTMLAttrContext *pCntxt,
SaveAttrTab( *pSaveAttrTab );
}
-
pSave->SetPos( *pPam->GetPoint() );
*pPam->GetPoint() = *pNewPos;
}
@@ -332,7 +326,6 @@ void SwHTMLParser::RestoreDocContext( _HTMLAttrContext *pCntxt )
pCntxt->ClearSaveDocContext();
}
-
void SwHTMLParser::EndContext( _HTMLAttrContext *pContext )
{
if( pContext->GetPopStack() )
@@ -418,7 +411,6 @@ void SwHTMLParser::ClearContext( _HTMLAttrContext *pContext )
StartListing();
}
-
sal_Bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
SvxCSS1PropertyInfo &rPropInfo,
_HTMLAttrContext *pContext )
@@ -491,7 +483,6 @@ sal_Bool SwHTMLParser::CreateContainer( const OUString& rClass,
return bRet;
}
-
void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
SvxCSS1PropertyInfo &rPropInfo,
_HTMLAttrContext *pContext,
@@ -556,7 +547,6 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
GetMarginsFromContext( nOldLeft, nOldRight, nOldIndent,
bIgnoreTop );
-
// und noch die aktuell gueltigen
sal_uInt16 nLeft = nOldLeft, nRight = nOldRight;
short nIndent = nOldIndent;
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 1dbaedce8ba7..6636a77e40e5 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -38,7 +38,6 @@
#include <svtools/htmlkywd.hxx>
#include <svx/svdpool.hxx>
-
#include "charatr.hxx"
#include <frmfmt.hxx>
#include <fmtanchr.hxx>
@@ -54,7 +53,6 @@
using namespace ::com::sun::star;
-
const sal_uInt32 HTML_FRMOPTS_MARQUEE =
HTML_FRMOPT_ALIGN |
HTML_FRMOPT_SPACE;
@@ -211,7 +209,6 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
pDoc->InsertDrawObj( *pPam, *pNewDrawObj, aFrmSet );
}
-
static void PutEEPoolItem( SfxItemSet &rEEItemSet,
const SfxPoolItem& rSwItem )
{
@@ -599,7 +596,6 @@ void SwHTMLParser::ResizeDrawObject( SdrObject* pObj, SwTwips nWidth )
pObj->SetLogicRect( Rectangle( rOldRect.TopLeft(), aNewSz ) );
}
-
const SdrObject *SwHTMLWriter::GetMarqueeTextObj( const SwDrawFrmFmt& rFmt )
{
const SdrObject* pObj = rFmt.FindSdrObject();
@@ -666,7 +662,6 @@ void SwHTMLWriter::GetEEAttrsFromDrwObj( SfxItemSet& rItemSet,
}
}
-
Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
const SwDrawFrmFmt& rFmt,
const SdrObject& rSdrObject )
@@ -827,7 +822,6 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFmt, nFrmFlags, &rSdrObject );
-
rWrt.Strm().WriteChar( '>' );
// Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText()
@@ -847,5 +841,4 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
return rWrt;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index 1155a34f83b0..69b0fcdb9634 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -101,7 +101,6 @@ static HTMLOptionEnum aHTMLPageNumFldFmtTable[] =
{ 0, 0 }
};
-
static HTMLOptionEnum aHTMLExtUsrFldSubTable[] =
{
{ OOO_STRING_SW_HTML_FS_company, EU_COMPANY },
@@ -190,7 +189,6 @@ static HTMLOptionEnum aHTMLFileNameFldFmtTable[] =
{ 0, 0 }
};
-
sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType )
{
sal_uInt16 nType = nDfltType;
@@ -207,7 +205,6 @@ sal_uInt16 SwHTMLParser::GetNumType( const OUString& rStr, sal_uInt16 nDfltType
return nType;
}
-
void SwHTMLParser::NewField()
{
sal_Bool bKnownType = sal_False, bFixed = sal_False,
diff --git a/sw/source/filter/html/htmlfld.hxx b/sw/source/filter/html/htmlfld.hxx
index 7af294944bf9..87948a7b6e7b 100644
--- a/sw/source/filter/html/htmlfld.hxx
+++ b/sw/source/filter/html/htmlfld.hxx
@@ -81,5 +81,4 @@
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 02057ee0e3f9..19a3314a78ac 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -431,7 +431,6 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
return rWrt;
}
-
Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
{
SwFmtFld & rFld = (SwFmtFld&)rHt;
@@ -542,5 +541,4 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index c6446cd76c70..d2b7fd6e1d3e 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
@@ -63,7 +62,6 @@
#include "htmlfly.hxx"
using namespace ::com::sun::star;
-////////////////////////////////////////////////////////////
const sal_uLong HTML_FRMOPTS_IMG_ALL =
HTML_FRMOPT_ALT |
@@ -126,7 +124,6 @@ const sal_uLong HTML_FRMOPTS_CNTNR =
HTML_FRMOPT_ABSSIZE |
HTML_FRMOPT_S_PIXSIZE;
-
static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt );
static Writer& OutHTML_FrmFmtAsMulticol( Writer& rWrt, const SwFrmFmt& rFmt,
sal_Bool bInCntnr );
@@ -142,8 +139,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
const SdrObject& rSdrObj );
-
-
extern HTMLOutEvent aAnchorEventTable[];
static HTMLOutEvent aImageEventTable[] =
@@ -161,8 +156,6 @@ static HTMLOutEvent aIMapEventTable[] =
{ 0, 0, 0 }
};
-
-
sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt,
const SdrObject*& rpSdrObj )
{
@@ -524,7 +517,6 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
}
-
OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
const OUString& rAlternateTxt,
sal_uInt32 nFrmOpts,
@@ -556,7 +548,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
OutDirection( nDir );
}
-
// ALT
if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateTxt.isEmpty() )
{
@@ -611,7 +602,6 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
append(pStr).append("\"");
}
-
// HSPACE und VSPACE
Size aTwipSpc( 0, 0 );
if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
@@ -1149,7 +1139,6 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
rHTMLWrt.OutCSS1_FrmFmtOptions( rFrmFmt, nFrmOpts );
-
if( nFrmOpts & HTML_FRMOPT_BORDER )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border).
@@ -1225,9 +1214,6 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
return rWrt;
}
-
-
-
static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
{
SwHTMLWriter & rHTMLWrt = (SwHTMLWriter&)rWrt;
@@ -1459,7 +1445,6 @@ static Writer & OutHTML_FrmFmtAsImage( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-
static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sal_Bool bInCntnr )
{
@@ -1483,7 +1468,6 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-
static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
const SdrObject& rSdrObj )
{
@@ -1514,8 +1498,6 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-
-
Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
sal_Bool bHeader )
{
@@ -1595,7 +1577,6 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-
void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
{
if( rURL.isEmpty() || rURL[0] != '#' )
@@ -1673,7 +1654,7 @@ void SwHTMLWriter::AddLinkTarget( const OUString& rURL )
}
else if( sCmp == "text" )
{
- //
+
}
}
@@ -1720,8 +1701,6 @@ void SwHTMLWriter::CollectLinkTargets()
}
}
-
-
SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
const SdrObject *pSdrObj,
sal_uInt8 nOutMode ) :
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 371824cd24be..3cdee81cd1ca 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -73,7 +73,6 @@ enum SwHTMLFrmType
#define HTML_CNTNR_DIV 0x80
#define HTML_CNTNR_MASK 0xc0
-
const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END;
const sal_uInt16 MAX_BROWSERS = 4;
diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx
index e311a23216a3..21fd0c75dcff 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -17,10 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "htmlfly.hxx"
-
#define TE(t,p,c) (sal_uInt8)( HTML_OUT_##t | HTML_POS_##p | HTML_CNTNR_##c )
sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 294c84f9a7da..b67db8c9c772 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -2074,7 +2074,6 @@ void SwHTMLParser::NewTextArea()
}
}
-
const uno::Reference< lang::XMultiServiceFactory > & rSrvcMgr =
pFormImpl->GetServiceFactory();
if( !rSrvcMgr.is() )
diff --git a/sw/source/filter/html/htmlform.hxx b/sw/source/filter/html/htmlform.hxx
index fd3a822907fc..c3a7388c4bbf 100644
--- a/sw/source/filter/html/htmlform.hxx
+++ b/sw/source/filter/html/htmlform.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX
#define INCLUDED_SW_SOURCE_FILTER_HTML_HTMLFORM_HXX
-
enum HTMLEventType
{
HTML_ET_ONSUBMITFORM, HTML_ET_ONRESETFORM,
@@ -36,10 +35,6 @@ extern const sal_Char * aEventMethodTable[];
extern const sal_Char * aEventSDOptionTable[];
extern const sal_Char * aEventOptionTable[];
-
-
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 1a718c0e4e11..1c7da56b52f1 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -78,8 +78,6 @@ const sal_uInt32 HTML_FRMOPTS_IMG_CONTROL_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
-
-
static void lcl_html_outEvents( SvStream& rStrm,
const uno::Reference< form::XFormComponent > rFormComp,
sal_Bool bCfgStarBasic,
@@ -649,7 +647,6 @@ void SwHTMLWriter::OutHiddenControls(
}
}
-
// hier folgen die Ausgabe-Routinen, dadurch sind die form::Forms gebuendelt:
const SdrObject *SwHTMLWriter::GetHTMLControl( const SwDrawFrmFmt& rFmt )
@@ -952,7 +949,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
}
break;
-
case form::FormComponentType::IMAGEBUTTON:
eType = TYPE_IMAGE;
nFrmOpts = HTML_FRMOPTS_IMG_CONTROL;
@@ -1335,7 +1331,6 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
return rWrt;
}
-
// Ermitteln, ob eine Format zu einem Control gehoert und wenn ja
// dessen Form zurueckgeben
static void AddControl( HTMLControls& rControls,
@@ -1370,7 +1365,6 @@ static void AddControl( HTMLControls& rControls,
}
}
-
void SwHTMLWriter::GetControls()
{
// Idee: die absatz- und zeichengebundenen Controls werden erst einmal
@@ -1420,14 +1414,12 @@ void SwHTMLWriter::GetControls()
}
}
-
HTMLControl::HTMLControl(
const uno::Reference< container::XIndexContainer > & rFormComps,
sal_uInt32 nIdx ) :
xFormComps( rFormComps ), nNdIdx( nIdx ), nCount( 1 )
{}
-
HTMLControl::~HTMLControl()
{}
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 98609a6ebf6b..28994f72af9d 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -42,7 +42,6 @@ struct SwHTMLFootEndNote_Impl
sal_Bool bFixed;
};
-
sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent,
sal_Int32 nPos )
{
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 0ca80885d0d9..5ff6a3b6f4ab 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
@@ -73,7 +72,6 @@
using namespace ::com::sun::star;
-
HTMLOptionEnum aHTMLImgHAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_AL_left, text::HoriOrientation::LEFT },
@@ -81,7 +79,6 @@ HTMLOptionEnum aHTMLImgHAlignTable[] =
{ 0, 0 }
};
-
HTMLOptionEnum aHTMLImgVAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::LINE_TOP },
@@ -154,7 +151,6 @@ void SwHTMLParser::ConnectImageMaps()
}
}
-
/* */
void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
@@ -508,7 +504,6 @@ IMAGE_SETEVENT:
aVBorderLine.SetColor( aHBorderLine.GetColor() );
}
-
SvxBoxItem aBoxItem( RES_BOX );
aBoxItem.SetLine( &aHBorderLine, BOX_LINE_TOP );
aBoxItem.SetLine( &aHBorderLine, BOX_LINE_BOTTOM );
@@ -919,7 +914,6 @@ void SwHTMLParser::InsertBodyOptions()
pCSS1Parser->SetBodyTextSet();
}
-
// Die Item fuer die Seitenvorlage vorbereiten (Hintergrund, Umrandung)
// Beim BrushItem muessen schon gesetzte werte erhalten bleiben!
SvxBrushItem aBrushItem( pCSS1Parser->GetPageDescBackground() );
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index d4bb2976786f..cc83d3d5dcf1 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -49,7 +49,6 @@ using namespace ::com::sun::star;
#define HTML_BULLETCHAR_CIRCLE (0xe009)
#define HTML_BULLETCHAR_SQUARE (0xe00b)
-
// <UL TYPE=...>
static HTMLOptionEnum aHTMLULTypeTable[] =
{
@@ -59,7 +58,6 @@ static HTMLOptionEnum aHTMLULTypeTable[] =
{ 0, 0 }
};
-
void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
{
const SwNumRule* pTxtNdNumRule( rTxtNd.GetNumRule() );
@@ -84,7 +82,6 @@ void SwHTMLNumRuleInfo::Set( const SwTxtNode& rTxtNd )
}
}
-
void SwHTMLParser::NewNumBulList( int nToken )
{
SwHTMLNumRuleInfo& rInfo = GetNumInfo();
@@ -460,7 +457,6 @@ void SwHTMLParser::EndNumBulList( int nToken )
}
-
void SwHTMLParser::NewNumBulListItem( int nToken )
{
sal_uInt8 nLevel = GetNumInfo().GetLevel();
@@ -632,7 +628,6 @@ void SwHTMLParser::EndNumBulListItem( int nToken, sal_Bool bSetColl,
SetTxtCollAttrs();
}
-
void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
{
SwTxtNode* pTxtNode = pPam->GetNode()->GetTxtNode();
@@ -650,8 +645,6 @@ void SwHTMLParser::SetNodeNum( sal_uInt8 nLevel, bool bCountedInList )
GetNumInfo().GetNumRule()->SetInvalidRule( sal_False );
}
-
-
void SwHTMLWriter::FillNextNumInfo()
{
pNextNumRuleInfo = 0;
@@ -779,7 +772,6 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
}
}
-
OSL_ENSURE( rWrt.nLastParaToken == 0,
"<PRE> wurde nicht vor <OL> beendet." );
sal_uInt16 nPrevDepth =
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index 2c0b3c9852ed..4f64ac9be5e1 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -117,8 +117,6 @@ inline void SwHTMLNumRuleInfo::SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVa
aNumStarts[nLvl] = nVal;
}
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 379edb4c70ae..0b06d56ceac2 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -119,7 +119,6 @@ const sal_uLong HTML_FRMOPTS_OLE_CSS1 =
HTML_FRMOPT_S_ALIGN |
HTML_FRMOPT_S_SPACE;
-
void SwHTMLParser::SetFixSize( const Size& rPixSize,
const Size& rTwipDfltSize,
sal_Bool bPrcWidth, sal_Bool bPrcHeight,
@@ -292,7 +291,6 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
}
}
-
void SwHTMLParser::InsertEmbed()
{
OUString aURL, aType, aName, aAlt, aId, aStyle, aClass;
@@ -485,7 +483,6 @@ void SwHTMLParser::InsertEmbed()
}
}
-
#if HAVE_FEATURE_JAVA
void SwHTMLParser::NewObject()
{
@@ -818,8 +815,6 @@ void SwHTMLParser::InsertParam()
#endif
}
-
-
void SwHTMLParser::InsertFloatingFrame()
{
OUString aAlt, aId, aStyle, aClass;
@@ -954,7 +949,6 @@ void SwHTMLParser::InsertFloatingFrame()
bInFloatingFrame = true;
}
-
sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
{
SwOLEObj& rObj = ((SwOLENode*)rNode.GetOLENode())->GetOLEObj();
@@ -1275,5 +1269,4 @@ Writer& OutHTML_FrmFmtOLENodeGrf( Writer& rWrt, const SwFrmFmt& rFrmFmt,
return rWrt;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 54871c6ddb12..36676e929881 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <rtl/uri.hxx>
#include <svl/urihelper.hxx>
@@ -59,7 +58,6 @@
#define CONTEXT_FLAGS_HDRFTR (CONTEXT_FLAGS_MULTICOL)
#define CONTEXT_FLAGS_FTN (CONTEXT_FLAGS_MULTICOL)
-
using namespace ::com::sun::star;
void SwHTMLParser::NewDivision( int nToken )
@@ -764,7 +762,6 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
PushContext( pCntxt );
}
-
void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
_HTMLAttrContext *pCntxt,
const OUString& rName,
@@ -791,8 +788,6 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
SaveDocContext( pCntxt, nFlags, &aNewPos );
}
-
-
void SwHTMLParser::MovePageDescAttrs( SwNode *pSrcNd,
sal_uLong nDestIdx,
sal_Bool bFmtBreak )
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 592ae51b079c..d117be32677b 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "hintids.hxx"
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -33,7 +32,6 @@
#include <svtools/htmlkywd.hxx>
#include <svl/urihelper.hxx>
-
#include <fmtornt.hxx>
#include <frmfmt.hxx>
#include <fmtfsize.hxx>
@@ -63,7 +61,6 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-
static HTMLOptionEnum aHTMLTblVAlignTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_VA_top, text::VertOrientation::NONE },
@@ -155,7 +152,6 @@ public:
sal_uInt16 GetContextStAttrMin() const { return nContextStAttrMin; }
};
-
// Cell content is a linked list with SwStartNodes and
// HTMLTables.
@@ -199,7 +195,6 @@ public:
SwHTMLTableLayoutCnts *CreateLayoutInfo();
};
-
// Cell of a HTML table
class HTMLTableCell
{
@@ -269,7 +264,6 @@ public:
sal_Bool IsCovered() const { return mbCovered; }
};
-
// Row of a HTML table
typedef boost::ptr_vector<HTMLTableCell> HTMLTableCells;
@@ -326,7 +320,6 @@ public:
sal_Bool IsSplitable() const { return bSplitable; }
};
-
// Column of a HTML table
class HTMLTableColumn
{
@@ -368,7 +361,6 @@ public:
SwHTMLTableLayoutColumn *CreateLayoutInfo();
};
-
// HTML table
typedef boost::ptr_vector<HTMLTableRow> HTMLTableRows;
@@ -454,7 +446,6 @@ class HTMLTable
SwHTMLTableLayout *pLayoutInfo;
-
// die folgenden Parameter stammen aus der dem <TABLE>-Tag
sal_uInt16 nWidth; // die Breite der Tabelle
sal_uInt16 nHeight; // absolute Hoehe der Tabelle
@@ -522,7 +513,6 @@ class HTMLTable
void InheritVertBorders( const HTMLTable *pParent,
sal_uInt16 nCol, sal_uInt16 nColSpan );
-
// Setzen der Umrandung anhand der Benutzervorgaben
void SetBorders();
@@ -651,8 +641,6 @@ public:
sal_Bool IsOverflowing() const { return nBoxes > 64000; }
};
-
-
void HTMLTableCnts::InitCtor()
{
pNext = 0;
@@ -710,7 +698,6 @@ SwHTMLTableLayoutCnts *HTMLTableCnts::CreateLayoutInfo()
return pLayoutInfo;
}
-
HTMLTableCell::HTMLTableCell():
pContents(0),
pBGBrush(0),
@@ -805,7 +792,6 @@ SwHTMLTableLayoutCell *HTMLTableCell::CreateLayoutInfo()
bRelWidth, bNoWrap );
}
-
HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ):
pCells(new HTMLTableCells),
bIsEndOfGroup(sal_False),
@@ -905,7 +891,6 @@ void HTMLTableRow::Shrink( sal_uInt16 nCells )
pCells->erase( pCells->begin() + nCells, pCells->end() );
}
-
HTMLTableColumn::HTMLTableColumn():
bIsEndOfGroup(sal_False),
nWidth(0), bRelWidth(sal_False),
@@ -960,8 +945,6 @@ inline SwFrmFmt *HTMLTableColumn::GetFrmFmt( sal_Bool bBorderLine,
return aFrmFmts[GetFrmFmtIdx(bBorderLine,eVertOrient)];
}
-
-
void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
{
pResizeDrawObjs = 0;
@@ -1123,7 +1106,6 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
pColumns->push_back( new HTMLTableColumn );
}
-
HTMLTable::~HTMLTable()
{
delete pResizeDrawObjs;
@@ -1224,7 +1206,6 @@ void HTMLTable::ProtectRowSpan( sal_uInt16 nRow, sal_uInt16 nCol, sal_uInt16 nRo
}
}
-
// Suchen des SwStartNodes der letzten belegten Vorgaengerbox
const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 nCol ) const
{
@@ -1284,7 +1265,6 @@ const SwStartNode* HTMLTable::GetPrevBoxStartNode( sal_uInt16 nRow, sal_uInt16 n
: pPrevCnts->GetTable()->GetPrevBoxStartNode( USHRT_MAX, USHRT_MAX ) );
}
-
static sal_Bool IsBoxEmpty( const SwTableBox *pBox )
{
const SwStartNode *pSttNd = pBox->GetSttNd();
@@ -1659,7 +1639,6 @@ SwTableBox *HTMLTable::NewTableBox( const SwStartNode *pStNd,
return pBox;
}
-
static void ResetLineFrmFmtAttrs( SwFrmFmt *pFrmFmt )
{
pFrmFmt->ResetFmtAttr( RES_FRM_SIZE );
@@ -1734,7 +1713,6 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
ResetLineFrmFmtAttrs( pLineFrmFmtNoHeight );
}
-
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
sal_uInt16 nStartCol = nLeftCol;
@@ -1922,7 +1900,7 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent,
// ob eine Umrandung der Tabelle noetig/moeglich ist, weil das davon
// abhaengt, ob "Filler"-Zellen eingefuegt werden. Hier werden deshalb
// erstmal nur Informationen gesammelt
- //
+
if( 0==nRow && pParent->bTopBorder && bFirstPara )
{
bTopBorder = true;
@@ -1938,7 +1916,6 @@ void HTMLTable::InheritBorders( const HTMLTable *pParent,
: pParent->aBorderLine;
}
-
// Die Child Tabelle darf keinen oberen oder linken Rahmen bekommen,
// wenn der bereits durch die umgebende Tabelle gesetzt ist.
// Sie darf jedoch immer einen oberen Rand bekommen, wenn die Tabelle
@@ -2082,7 +2059,6 @@ inline HTMLTableCell *HTMLTable::GetCell( sal_uInt16 nRow,
return (*pRows)[nRow].GetCell( nCell );
}
-
SvxAdjust HTMLTable::GetInheritedAdjust() const
{
SvxAdjust eAdjust = (nCurCol<nCols ? ((*pColumns)[nCurCol]).GetAdjust()
@@ -2297,7 +2273,6 @@ void HTMLTable::CloseRow( sal_Bool bEmpty )
break;
}
-
nCurRow++;
}
@@ -2355,7 +2330,6 @@ void HTMLTable::InsertCol( sal_uInt16 nSpan, sal_uInt16 nColWidth, bool bRelWidt
nCurCol = nColsReq;
}
-
void HTMLTable::CloseTable()
{
sal_uInt16 i;
@@ -2644,7 +2618,6 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
pFrmFmt->ResetFmtAttr( RES_VERT_ORIENT );
pFrmFmt->ResetFmtAttr( RES_BOXATR_FORMAT );
-
_MakeTable( pNewBox );
// und noch ggf. rechts eine Zelle einfuegen
@@ -2834,7 +2807,6 @@ void _HTMLTableContext::RestorePREListingXMP( SwHTMLParser& rParser )
rParser.StartListing();
}
-
const SwStartNode *SwHTMLParser::InsertTableSection
( const SwStartNode *pPrevStNd )
{
@@ -2937,7 +2909,6 @@ SwStartNode *SwHTMLParser::InsertTempTableCaptionSection()
return pStNd;
}
-
sal_Int32 SwHTMLParser::StripTrailingLF()
{
sal_Int32 nStripped = 0;
@@ -3037,7 +3008,6 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor,
return pBrushItem;
}
-
class _SectionSaveStruct : public SwPendingStackData
{
sal_uInt16 nBaseFontStMinSave, nFontStMinSave, nFontStHeadStartSave;
@@ -3091,7 +3061,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
rParser.aBaseFontStack.end() );
rParser.nBaseFontStMin = nBaseFontStMinSave;
-
nMin = rParser.nFontStMin;
if( rParser.aFontStack.size() > nMin )
rParser.aFontStack.erase( rParser.aFontStack.begin() + nMin,
@@ -3116,7 +3085,6 @@ void _SectionSaveStruct::Restore( SwHTMLParser& rParser )
rParser.aParaAttrs.clear();
}
-
class _CellSaveStruct : public _SectionSaveStruct
{
OUString aStyle, aId, aClass, aLang, aDir;
@@ -3169,7 +3137,6 @@ public:
void CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc );
};
-
_CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
sal_Bool bHd, sal_Bool bReadOpt ) :
_SectionSaveStruct( rParser ),
@@ -3440,8 +3407,6 @@ void _CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ )
}
}
-
-
HTMLTableCnts *SwHTMLParser::InsertTableContents(
sal_Bool bHead )
{
@@ -4009,7 +3974,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
pSubTable->GetTableAdjust(sal_False)!= SVX_ADJUST_RIGHT,
"links oder rechts ausgerichtete Tabellen gehoehren in Rahmen" );
-
HTMLTableCnts *pParentContents =
pSubTable->GetParentContents();
if( pParentContents )
@@ -4205,7 +4169,6 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
delete pSaveStruct;
}
-
class _RowSaveStruct : public SwPendingStackData
{
public:
@@ -4218,7 +4181,6 @@ public:
{}
};
-
void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
SvxAdjust eGrpAdjust,
sal_Int16 eGrpVertOri )
@@ -4595,7 +4557,6 @@ struct _TblColGrpSaveStruct : public SwPendingStackData
inline _TblColGrpSaveStruct();
-
inline void CloseColGroup( HTMLTable *pTable );
};
@@ -4605,7 +4566,6 @@ inline _TblColGrpSaveStruct::_TblColGrpSaveStruct() :
eColGrpVertOri( text::VertOrientation::TOP )
{}
-
inline void _TblColGrpSaveStruct::CloseColGroup( HTMLTable *pTable )
{
pTable->CloseColGroup( nColGrpSpan, nColGrpWidth,
@@ -5049,7 +5009,6 @@ public:
_TblSaveStruct::~_TblSaveStruct()
{}
-
void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc )
{
pCurTable->MakeTable( 0, nWidth );
@@ -5084,7 +5043,6 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
rPos = *pTCntxt->GetPos();
}
-
HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
SvxAdjust eParentAdjust ) :
nCols( 0 ),
@@ -5220,7 +5178,6 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
}
}
-
HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
sal_Bool bIsParentHead,
sal_Bool bHasParentSection,
@@ -5509,5 +5466,4 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
return pRetTbl;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 16319b42eeb3..021a431126db 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -61,7 +61,6 @@
using namespace ::com::sun::star;
-
class SwHTMLWrtTable : public SwWriteTable
{
void Pixelize( sal_uInt16& rValue );
@@ -94,7 +93,6 @@ public:
sal_uInt16 nHSpace=0, sal_uInt16 nVSpace=0 ) const;
};
-
SwHTMLWrtTable::SwHTMLWrtTable( const SwTableLines& rLines, long nWidth,
sal_uInt32 nBWidth, sal_Bool bRel,
sal_uInt16 nLSub, sal_uInt16 nRSub,
@@ -237,7 +235,6 @@ static sal_Bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool
return !*pBorders;
}
-
sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
sal_Bool bExpandedBefore,
sal_uInt16 nDepth ) const
@@ -257,7 +254,6 @@ sal_Bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox,
return bExpand;
}
-
// Eine Box als einzelne Zelle schreiben
void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
const SwWriteTableCell *pCell,
@@ -505,7 +501,6 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.bLFPossible = sal_True;
}
-
// Eine Line als Zeilen ausgeben
void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
const SwWriteTableCells& rCells,
@@ -566,8 +561,6 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False );
}
-
-
void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
sal_Bool bTHead, const SwFrmFmt *pFrmFmt,
const OUString *pCaption, sal_Bool bTopCaption,
@@ -625,7 +618,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
pCol = pNextCol;
}
-
// vorhergende Aufzaehlung etc. beenden
rWrt.ChangeParaToken( 0 );
@@ -1185,5 +1177,4 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
return rWrt;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index d43fc99f0682..0db12f9f6ede 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -23,7 +23,6 @@
#include <calbck.hxx>
class SwViewShell;
-
class SwHTMLViewShellClient : public SwClient
{
protected:
@@ -41,9 +40,6 @@ public:
SwViewShell *GetViewShell();
};
-
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 692474b97d4b..675e6a1b5762 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
@@ -29,7 +28,6 @@
#include "css1kywd.hxx"
#include "parcss1.hxx"
-
// Loop-Check: Um Endlos-Schleifen zu vermeiden, wird in jeder
// Schalife geprueft, ob ein Fortschritt in der Eingabe-Position
// stattgefunden hat
@@ -56,10 +54,8 @@
#endif
-
const sal_Int32 MAX_LEN = 1024;
-
void CSS1Parser::InitRead( const OUString& rIn )
{
nlLineNr = 0;
@@ -99,13 +95,13 @@ sal_Unicode CSS1Parser::GetNextChar()
}
// Diese Funktion realisiert den in
-//
+
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
// bzw. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
-//
+
// beschriebenen Scanner fuer CSS1. Es handelt sich um eine direkte
// Umsetzung der dort beschriebenen Lex-Grammatik
-//
+
CSS1Token CSS1Parser::GetNextToken()
{
CSS1Token nRet = CSS1_NULL;
@@ -659,24 +655,23 @@ CSS1Token CSS1Parser::GetNextToken()
return nRet;
}
-
// Dies folegenden Funktionen realisieren den in
-//
+
// http://www.w3.orh/pub/WWW/TR/WD-css1.html
// bzw. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
-//
+
// beschriebenen Parser fuer CSS1. Es handelt sich um eine direkte
// Umsetzung der dort beschriebenen Grammatik
// stylesheet
// : import* rule*
-//
+
// import
// : IMPORT_SYM url
-//
+
// url
// : STRING
-//
+
void CSS1Parser::ParseStyleSheet()
{
LOOP_CHECK_DECL
@@ -741,7 +736,7 @@ void CSS1Parser::ParseStyleSheet()
// rule
// : selector [ ',' selector ]*
// '{' declaration [ ';' declaration ]* '}'
-//
+
void CSS1Parser::ParseRule()
{
// selector
@@ -818,24 +813,24 @@ void CSS1Parser::ParseRule()
// selector
// : simple_selector+ [ ':' pseudo_element ]?
-//
+
// simple_selector
// : element_name [ DOT_WO_WS class ]?
// | DOT_W_WS class
// | id_selector
-//
+
// element_name
// : IDENT
-//
+
// class
// : IDENT
-//
+
// id_selector
// : '#' IDENT
-//
+
// pseude_element
// : IDENT
-//
+
CSS1Selector *CSS1Parser::ParseSelector()
{
CSS1Selector *pRoot = 0, *pLast = 0;
@@ -985,24 +980,24 @@ CSS1Selector *CSS1Parser::ParseSelector()
// declaration
// : property ':' expr prio?
// | /* empty */
-//
+
// expression
// : term [ operator term ]*
-//
+
// term
// : unary_operator?
// [ NUMBER | STRING | PERCENTAGE | LENGTH | EMS | EXS | IDENT |
// HEXCOLOR | URL | RGB ]
-//
+
// operator
// : '/' | ',' | /* empty */
-//
+
// unary_operator
// : '-' | '+'
-//
+
// property
// : ident
-//
+
// das Vorzeichen wird nur fuer numerische Werte (ausser PERCENTAGE)
// beruecksichtigt und wird auf nValue angewendet!
CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
@@ -1019,7 +1014,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
nToken = GetNextToken();
-
// ':'
if( CSS1_COLON != nToken )
{
@@ -1119,7 +1113,6 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
return pRoot;
}
-
CSS1Parser::CSS1Parser()
: nValue(0)
, eState(CSS1_PAR_ACCEPTED)
@@ -1131,7 +1124,6 @@ CSS1Parser::~CSS1Parser()
{
}
-
sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn )
{
OUString aTmp( rIn );
@@ -1164,7 +1156,6 @@ sal_Bool CSS1Parser::ParseStyleSheet( const OUString& rIn )
return sal_True;
}
-
sal_Bool CSS1Parser::ParseStyleOption( const OUString& rIn )
{
if( rIn.isEmpty() )
@@ -1225,7 +1216,6 @@ sal_Bool CSS1Parser::DeclarationParsed( const OUString& /*rProperty*/,
return sal_True;
}
-
CSS1Selector::~CSS1Selector()
{
delete pNext;
@@ -1377,7 +1367,6 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
;
}
-
if( bRet && nColor!=SAL_MAX_UINT32 )
{
rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000UL) >> 16) );
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 83b13fb5e21c..cfc0d6bb465b 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -54,7 +54,6 @@
#include <memory>
-
using namespace ::com::sun::star;
// die Funktionen zum Parsen einer CSS1-Property sind von folgendem Typ:
@@ -265,11 +264,8 @@ struct SvxCSS1ItemIds
sal_uInt16 nDirection;
};
-
static SvxCSS1ItemIds aItemIds;
-
-
struct SvxCSS1BorderInfo
{
Color aColor;
@@ -689,7 +685,6 @@ bool SvxCSS1Parser::SelectorParsed( CSS1Selector *pSelector, bool bFirst )
return false; // den Selektor haben wir gespeichert. Loeschen toedlich!
}
-
sal_Bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
const CSS1Expression *pExpr )
{
@@ -703,7 +698,6 @@ sal_Bool SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
return sal_True; // die Deklaration brauchen wir nicht mehr. Loeschen!
}
-
SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL, sal_uInt16 nMinFixLineSp,
sal_uInt16 *pWhichIds, sal_uInt16 nWhichIds ) :
CSS1Parser(),
@@ -871,7 +865,6 @@ sal_Bool SvxCSS1Parser::ParseStyleOption( const OUString& rIn,
return bSuccess;
}
-
sal_Bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable,
const OUString &rValue, sal_uInt16& rEnum )
{
@@ -1001,7 +994,6 @@ void SvxCSS1Parser::SetDfltEncoding( rtl_TextEncoding eEnc )
eDfltEnc = eEnc;
}
-
static void ParseCSS1_font_size( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1064,8 +1056,6 @@ static void ParseCSS1_font_size( const CSS1Expression *pExpr,
}
}
-
-
static void ParseCSS1_font_family( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1145,7 +1135,6 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_font_weight( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1203,7 +1192,6 @@ static void ParseCSS1_font_weight( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_font_style( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1273,7 +1261,6 @@ static void ParseCSS1_font_style( const CSS1Expression *pExpr,
rItemSet.Put( SvxCaseMapItem( eCaseMap, aItemIds.nCaseMap ) );
}
-
static void ParseCSS1_font_variant( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1326,7 +1313,6 @@ static void ParseCSS1_text_transform( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_color( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1351,7 +1337,6 @@ static void ParseCSS1_color( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_column_count( const CSS1Expression *pExpr,
SfxItemSet& /*rItemSet*/,
SvxCSS1PropertyInfo &rPropInfo,
@@ -1369,7 +1354,6 @@ static void ParseCSS1_column_count( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_direction( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1395,7 +1379,6 @@ static void ParseCSS1_direction( const CSS1Expression *pExpr,
}
}
-
static void MergeHori( SvxGraphicPosition& ePos, SvxGraphicPosition eHori )
{
OSL_ENSURE( GPOS_LT==eHori || GPOS_MT==eHori || GPOS_RT==eHori,
@@ -1642,7 +1625,6 @@ static void ParseCSS1_background_color( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_line_height( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1706,7 +1688,6 @@ static void ParseCSS1_line_height( const CSS1Expression *pExpr,
}
-
static void ParseCSS1_font( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -1788,7 +1769,6 @@ static void ParseCSS1_font( const CSS1Expression *pExpr,
rItemSet.Put( aWeight );
}
-
// font-size
CSS1Expression aExpr( pExpr->GetType(), pExpr->GetString(),
pExpr->GetNumber() );
@@ -1815,7 +1795,6 @@ static void ParseCSS1_font( const CSS1Expression *pExpr,
ParseCSS1_font_family( pExpr, rItemSet, rPropInfo, rParser );
}
-
static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1859,7 +1838,6 @@ static void ParseCSS1_letter_spacing( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_text_decoration( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1967,7 +1945,6 @@ static void ParseCSS1_text_decoration( const CSS1Expression *pExpr,
rItemSet.Put( SvxBlinkItem( bBlinkOn, aItemIds.nBlink ) );
}
-
static void ParseCSS1_text_align( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& /*rPropInfo*/,
@@ -1988,7 +1965,6 @@ static void ParseCSS1_text_align( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2040,7 +2016,6 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2096,7 +2071,6 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2152,7 +2126,6 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2211,7 +2184,6 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2270,7 +2242,6 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_margin( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2411,7 +2382,6 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
}
}
-
static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2470,7 +2440,6 @@ static sal_Bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
return bSet;
}
-
static void ParseCSS1_padding_top( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2531,7 +2500,6 @@ static void ParseCSS1_padding( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_border_xxx( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2675,7 +2643,6 @@ static void ParseCSS1_border_xxx_width( const CSS1Expression *pExpr,
pInfo->nNamedWidth = nNWidth;
}
-
static void ParseCSS1_border_top_width( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2776,7 +2743,6 @@ static void ParseCSS1_border_style( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_border_top( const CSS1Expression *pExpr,
SfxItemSet &rItemSet,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2817,7 +2783,6 @@ static void ParseCSS1_border( const CSS1Expression *pExpr,
ParseCSS1_border_xxx( pExpr, rItemSet, rPropInfo, rParser, 0, sal_True );
}
-
static void ParseCSS1_float( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2833,8 +2798,6 @@ static void ParseCSS1_float( const CSS1Expression *pExpr,
}
}
-
-
static void ParseCSS1_position( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2850,7 +2813,6 @@ static void ParseCSS1_position( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_length( const CSS1Expression *pExpr,
long& rLength,
SvxCSS1LengthType& rLengthType,
@@ -2895,7 +2857,6 @@ static void ParseCSS1_length( const CSS1Expression *pExpr,
}
}
-
static void ParseCSS1_width( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
SvxCSS1PropertyInfo& rPropInfo,
@@ -2928,7 +2889,6 @@ static void ParseCSS1_top( const CSS1Expression *pExpr,
ParseCSS1_length( pExpr, rPropInfo.nTop, rPropInfo.eTopType, sal_False );
}
-
// Feature: PrintExt
static void ParseCSS1_size( const CSS1Expression *pExpr,
SfxItemSet & /*rItemSet*/,
@@ -2981,7 +2941,6 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
// /Feature: PrintExt
-
// Feature: PrintExt
static void ParseCSS1_page_break_xxx( const CSS1Expression *pExpr,
@@ -3099,7 +3058,6 @@ static void ParseCSS1_so_language( const CSS1Expression *pExpr,
}
}
-
// die Zuordung Property zu parsender Funktion
struct CSS1PropEntry
{
@@ -3114,7 +3072,6 @@ struct CSS1PropEntry
#define CSS1_PROP_ENTRY(p) \
{ { sCSS1_P_##p }, ParseCSS1_##p }
-
// die Tabelle mit den Zuordnungen
static CSS1PropEntry aCSS1PropFnTab[] =
{
@@ -3174,7 +3131,6 @@ static CSS1PropEntry aCSS1PropFnTab[] =
CSS1_PROP_ENTRY(so_language)
};
-
static int bSortedPropFns = sal_False;
extern "C"
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 2de079894110..1ba92df1f8f9 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -40,7 +40,6 @@ enum SvxCSS1Position
SVX_CSS1_POS_END
};
-
enum SvxCSS1LengthType
{
SVX_CSS1_LTYPE_NONE, // nichts angegeben
@@ -166,7 +165,6 @@ public:
SvxCSS1MapEntry( const OUString& rKey, const SfxItemSet& rItemSet,
const SvxCSS1PropertyInfo& rProp );
-
const SfxItemSet& GetItemSet() const { return aItemSet; }
SfxItemSet& GetItemSet() { return aItemSet; }
@@ -263,7 +261,6 @@ protected:
public:
-
SvxCSS1Parser( SfxItemPool& rPool,
const OUString& rBaseURL,
sal_uInt16 nMinFixLineSp,
@@ -341,5 +338,4 @@ public:
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 1bc5ca6cb499..cdf24be7f927 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -35,7 +35,6 @@ class SwPageDesc;
// ganz unauffaellig das ein oder andere! Andererseits wird diese
// Klasse recht selten benoetigt. Deshalb ein eigener Header.
-
class SwCSS1Parser : public SvxCSS1Parser
{
SwDoc *pDoc;
@@ -129,7 +128,6 @@ public:
sal_Bool SetFmtBreak( SfxItemSet& rItemSet,
const SvxCSS1PropertyInfo& rPropInfo );
-
static void AddClassName( OUString& rFmtName, const OUString& rClass );
static inline void AddFirstLetterExt( OUString& rFmtName );
@@ -165,7 +163,6 @@ public:
virtual void SetDfltEncoding( rtl_TextEncoding eEnc );
};
-
inline void SwCSS1Parser::AddFirstLetterExt( OUString& rFmtName )
{
rFmtName += ".FL"; // first letter
@@ -198,7 +195,6 @@ inline void SwCSS1Parser::SetTDTagStyles()
SetTableTxtColl( sal_False );
}
-
inline void SwCSS1Parser::SetATagStyles()
{
if( !bLinkCharFmtsSet )
@@ -212,8 +208,6 @@ inline void SwCSS1Parser::SetDelayedStyles()
SetATagStyles();
}
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index ab79860ac6ce..8948542bd503 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -19,7 +19,6 @@
#include <config_features.h>
-
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
@@ -63,7 +62,6 @@
#include <editeng/protitem.hxx>
#include <editeng/flstitem.hxx>
-
#include <frmatr.hxx>
#include <charatr.hxx>
#include <fmtfld.hxx>
@@ -223,12 +221,9 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR );
}
-
return nRet;
}
-
-
SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
const OUString& rPath,
const OUString& rBaseURL,
@@ -889,7 +884,6 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( false ).nNode.GetIndex() )
}
}
-
// Wenn die Dokuemnt-SwViewShell noch existiert und eine Action
// offen ist (muss bei Abbruch nicht sein), die Action beenden,
// uns von der Shell abmelden und schliesslich die alte Shell
@@ -1758,7 +1752,6 @@ void SwHTMLParser::NextToken( int nToken )
}
break;
-
case HTML_STRIKE_ON:
case HTML_STRIKETHROUGH_ON:
{
@@ -1799,7 +1792,6 @@ void SwHTMLParser::NextToken( int nToken )
NewStdAttr( HTML_SPAN_ON );
break;
-
case HTML_ITALIC_OFF:
case HTML_BOLD_OFF:
case HTML_STRIKE_OFF:
@@ -2040,7 +2032,6 @@ void SwHTMLParser::NextToken( int nToken )
aParaAttrs.clear();
}
-
extern bool swhtml_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 );
static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
@@ -2380,7 +2371,6 @@ sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNu
}
}
-
if( !pTable && !--nParaCnt )
Show();
@@ -2468,7 +2458,6 @@ void SwHTMLParser::AddParSpace()
}
}
-
void SwHTMLParser::Show()
{
// Hier wird
@@ -2648,7 +2637,6 @@ SwViewShell *SwHTMLParser::CheckActionViewShell()
return pActionViewShell;
}
-
void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
_HTMLAttrs *pPostIts )
{
@@ -2710,7 +2698,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
aParaAttrs.pop_back();
}
-
// dann also setzen
aSetAttrTab.erase( aSetAttrTab.begin() + n );
@@ -2725,7 +2712,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
continue; //break;
}
-
pCNd = pAttr->nSttPara.GetNode().GetCntntNode();
if( !pCNd )
{
@@ -2754,8 +2740,6 @@ void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable,
}
pAttrPam->GetPoint()->nNode = pAttr->nSttPara;
-
-
// durch das Loeschen von BRs kann der Start-Index
// auch mal hinter das Ende des Textes zeigen
if( pAttr->nSttCntnt > pCNd->Len() )
@@ -3002,7 +2986,6 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem )
(*ppAttr) = new _HTMLAttr( *pPam->GetPoint(), rItem, ppAttr );
}
-
void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
sal_Bool bChkEmpty )
{
@@ -3046,7 +3029,6 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr,
// nun das Attrubut beenden
_HTMLAttr *pNext = pAttr->GetNext();
-
sal_Bool bInsert;
sal_uInt16 nScriptItem = 0;
sal_Bool bScript = sal_False, bFont = sal_False;
@@ -3564,7 +3546,6 @@ void SwHTMLParser::EndTag( int nToken )
}
}
-
void SwHTMLParser::NewBasefontAttr()
{
OUString aId, aStyle, aClass, aLang, aDir;
@@ -3806,7 +3787,6 @@ void SwHTMLParser::NewFontAttr( int nToken )
}
}
-
// einen neuen Kontext anlegen
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( static_cast< sal_uInt16 >(nToken) );
@@ -3837,7 +3817,6 @@ void SwHTMLParser::NewFontAttr( int nToken )
aItemSet.Put( aFontCTL );
}
-
if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) )
DoPositioning( aItemSet, aPropInfo, pCntxt );
@@ -3882,7 +3861,6 @@ void SwHTMLParser::EndFontAttr( int nToken )
aFontStack.erase( aFontStack.begin() + aFontStack.size() - 1 );
}
-
void SwHTMLParser::NewPara()
{
if( pPam->GetPoint()->nContent.GetIndex() )
@@ -4006,7 +3984,6 @@ void SwHTMLParser::EndPara( sal_Bool bReal )
nOpenParaToken = 0;
}
-
void SwHTMLParser::NewHeading( int nToken )
{
eParaAdjust = SVX_ADJUST_END;
@@ -4133,7 +4110,6 @@ void SwHTMLParser::EndHeading()
nFontStHeadStart = nFontStMin;
}
-
void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl )
{
OUString aId, aStyle, aClass, aLang, aDir;
@@ -4261,7 +4237,6 @@ void SwHTMLParser::EndTxtFmtColl( int nToken )
SetTxtCollAttrs();
}
-
void SwHTMLParser::NewDefList()
{
OUString aId, aStyle, aClass, aLang, aDir;
@@ -4300,7 +4275,6 @@ void SwHTMLParser::NewDefList()
// ein Level mehr
nDefListDeep++;
-
sal_Bool bInDD = sal_False, bNotInDD = sal_False;
sal_uInt16 nPos = aContexts.size();
while( !bInDD && !bNotInDD && nPos>nContextStMin )
@@ -4321,7 +4295,6 @@ void SwHTMLParser::NewDefList()
}
}
-
// ... und in einem Kontext merken
_HTMLAttrContext *pCntxt = new _HTMLAttrContext( HTML_DEFLIST_ON );
@@ -4477,7 +4450,6 @@ void SwHTMLParser::EndDefListItem( int nToken, sal_Bool bSetColl,
SetTxtCollAttrs();
}
-
sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
sal_Bool bSurroundOnly ) const
{
@@ -4548,7 +4520,6 @@ sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly,
return bFound;
}
-
// die speziellen Methoden zum Einfuegen von Objecten
const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const
@@ -4557,7 +4528,6 @@ const SwFmtColl *SwHTMLParser::GetCurrFmtColl() const
return &pCNd->GetAnyFmtColl();
}
-
void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
{
SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage
@@ -4781,7 +4751,6 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext )
}
}
-
void SwHTMLParser::NewCharFmt( int nToken )
{
OUString aId, aStyle, aLang, aDir;
@@ -4818,7 +4787,6 @@ void SwHTMLParser::NewCharFmt( int nToken )
SwCharFmt* pCFmt = pCSS1Parser->GetChrFmt( static_cast< sal_uInt16 >(nToken), aClass );
OSL_ENSURE( pCFmt, "keine Zeichenvorlage zu Token gefunden" );
-
// Styles parsen (zu Class siehe auch NewPara)
if( HasStyleOptions( aStyle, aId, aEmptyOUStr, &aLang, &aDir ) )
{
@@ -4844,8 +4812,6 @@ void SwHTMLParser::NewCharFmt( int nToken )
PushContext( pCntxt );
}
-
-
void SwHTMLParser::InsertSpacer()
{
// und es ggf. durch die Optionen veraendern
@@ -5057,8 +5023,6 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth()
return aHTMLPageSize.Width();
}
-
-
void SwHTMLParser::InsertIDOption()
{
OUString aId;
@@ -5077,9 +5041,6 @@ void SwHTMLParser::InsertIDOption()
InsertBookmark( aId );
}
-
-
-
void SwHTMLParser::InsertLineBreak()
{
// <BR CLEAR=xxx> wird wie folgt behandelt:
@@ -5471,7 +5432,6 @@ void SwHTMLParser::ParseMoreMetaOptions()
InsertAttr( aFmtFld );
}
-
_HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
_HTMLAttr **ppHd ) :
nSttPara( rPos.nNode ),
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 878ba65854c9..52e48712868f 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -60,7 +60,6 @@ extern HTMLOptionEnum aHTMLPAlignTable[];
extern HTMLOptionEnum aHTMLImgHAlignTable[];
extern HTMLOptionEnum aHTMLImgVAlignTable[];
-
// der Attribut Stack:
class _HTMLAttr;
@@ -409,9 +408,9 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
sal_uInt32 nScriptStartLineNr; // Zeilennummer eines Script-Blocks
sal_uLong nEventId;
- sal_uInt16 nBaseFontStMin; //
- sal_uInt16 nFontStMin; //
- sal_uInt16 nDefListDeep; //
+ sal_uInt16 nBaseFontStMin;
+ sal_uInt16 nFontStMin;
+ sal_uInt16 nDefListDeep;
sal_uInt16 nFontStHeadStart; // Elemente im Font-Stack bei <Hn>
sal_uInt16 nSBModuleCnt; // Zaehler fuer Basic-Module
sal_uInt16 nMissingImgMaps; // Wie viele Image-Maps fehlen noch?
@@ -572,7 +571,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
short& nIndent ) const;
void GetULSpaceFromContext( sal_uInt16 &rUpper, sal_uInt16 &rLower ) const;
-
void MovePageDescAttrs( SwNode *pSrcNd, sal_uLong nDestIdx, sal_Bool bFmtBreak );
// Behandlung von Tags auf Absatz-Ebene
@@ -627,7 +625,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
void EndDefListItem( int nToken=0, sal_Bool bSetColl=sal_True,
sal_Bool bLastPara=sal_False );
-
// Behandlung von Tags auf Zeichen-Ebene
// Tags wie <B>, <I> etc behandeln, die ein bestimmtes Attribut
@@ -724,7 +721,6 @@ private:
// <BODY>-Tag auswerten: Hintergrund-Grafiken und -Farben setzen (htmlgrin.cxx)
void InsertBodyOptions();
-
// Einfuegen von Links und ::com::sun::star::text::Bookmarks (htmlgrin.cxx)
// <A>-Tag auswerten: einen Link bzw. eine ::com::sun::star::text::Bookmark einfuegen
@@ -734,14 +730,12 @@ private:
// eine ::com::sun::star::text::Bookmark einfuegen
void InsertBookmark( const OUString& rName );
-
void InsertCommentText( const sal_Char *pTag = 0 );
void InsertComment( const OUString& rName, const sal_Char *pTag = 0 );
// sind im aktuellen Absatz ::com::sun::star::text::Bookmarks vorhanden?
sal_Bool HasCurrentParaBookmarks( sal_Bool bIgnoreStack=sal_False ) const;
-
// Einfuegen von Script/Basic-Elementen
// das zueletzt gelsene Basic-Modul parsen (htmlbas.cxx)
@@ -771,7 +765,6 @@ private:
SvxCSS1PropertyInfo &rPropInfo,
const OUString *pLang=0, const OUString *pDir=0 );
-
// Inserting Controls and ::com::sun::star::form::Forms (htmlform.cxx)
// Insert draw object into document
@@ -847,7 +840,6 @@ private:
sal_Bool bIsInMulticol = sal_False,
sal_Bool bHasToFlow = sal_False );
-
// misc ...
void ParseMoreMetaOptions();
@@ -906,7 +898,6 @@ public:
virtual SvParserState CallParser();
-
sal_uInt16 ToTwips( sal_uInt16 nPixel ) const;
// for reading asynchronously from SvStream
@@ -917,7 +908,6 @@ public:
SvKeyValueIterator* );
};
-
struct SwPendingStackData
{
virtual ~SwPendingStackData() {}
@@ -1001,8 +991,6 @@ inline void SwHTMLParser::PushContext( _HTMLAttrContext *pCntxt )
aContexts.push_back( pCntxt );
}
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index e21718ad10f8..eb39cfc75ac4 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -124,7 +124,6 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
nDirection = FRMDIR_HORI_LEFT_TOP;
}
-
SwHTMLWriter::~SwHTMLWriter()
{
delete pNumRuleInfo;
@@ -320,7 +319,6 @@ sal_uLong SwHTMLWriter::WriteStream()
}
}
-
// Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn
// das gesamte Dokument geschrieben wird
pHTMLPosFlyFrms = 0;
@@ -506,7 +504,6 @@ static bool lcl_html_IsMultiColEnd( const SwHTMLWriter& rHTMLWrt, sal_uLong nInd
return bRet;
}
-
static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt,
const SwSection& rSection,
const SwSectionFmt& rFmt,
@@ -779,7 +776,6 @@ void SwHTMLWriter::Out_SwDoc( SwPaM* pPam )
bWriteAll = bSaveWriteAll; // wieder auf alten Wert zurueck
}
-
// schreibe die StyleTabelle, algemeine Angaben,Header/Footer/Footnotes
static void OutBodyColor( const sal_Char *pTag, const SwFmt *pFmt,
SwHTMLWriter& rHWrt )
@@ -1327,7 +1323,6 @@ HTMLSaveData::HTMLSaveData( SwHTMLWriter& rWriter, sal_uLong nStt,
rWrt.nDirection = rWrt.GetHTMLDirection( pFrmFmt->GetAttrSet() );
}
-
HTMLSaveData::~HTMLSaveData()
{
delete rWrt.pCurPam; // Pam wieder loeschen
@@ -1358,11 +1353,9 @@ HTMLSaveData::~HTMLSaveData()
}
}
-
void GetHTMLWriter( const OUString&, const OUString& rBaseURL, WriterRef& xRet )
{
xRet = new SwHTMLWriter( rBaseURL );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index bb954e5bf615..3c294edae53b 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -93,7 +93,6 @@ const sal_uInt32 HTML_FRMOPT_S_PIXSIZE = 1<<18;
const sal_uInt32 HTML_FRMOPT_ID = 1<<19;
const sal_uInt32 HTML_FRMOPT_DIR = 1<<20;
-
const sal_uInt32 HTML_FRMOPTS_GENIMG_ALL =
HTML_FRMOPT_ALT |
HTML_FRMOPT_SIZE |
@@ -210,7 +209,6 @@ public:
~HTMLControls() { DeleteAndDestroyAll(); }
};
-
typedef std::vector<SwFmtINetFmt*> INetFmts;
struct SwHTMLFmtInfo
@@ -237,7 +235,6 @@ struct SwHTMLFmtInfo
pFmt( pF ), pRefFmt(0), pItemSet( 0 ), nFirstLineIndent(0), bScriptDependent(false)
{}
-
// Konstruktor zum Erstellen der Format-Info
SwHTMLFmtInfo( const SwFmt *pFmt, SwDoc *pDoc, SwDoc *pTemlate,
sal_Bool bOutStyles, LanguageType eDfltLang=LANGUAGE_DONTKNOW,
@@ -604,7 +601,6 @@ struct HTMLSaveData
~HTMLSaveData();
};
-
// einige Funktions-Deklarationen
Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFmt,
sal_Bool bInCntnr );
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index 5242b12c237a..1b9d1cac031b 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -62,7 +62,6 @@ public:
void GetWW8Writer( const OUString&, const OUString&, WriterRef& );
-
// Umsetzen der LRSpaces im aktuell importierten Doc. Die Fremd-Filter
// liefern immer absolute Werte fuer die Ebenen einer NumRule. Wir
// verarbeiten jetzt aber relative Werte bezogen auf das LR-Space-Item.
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 163233239dc4..8222c9f7572d 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -228,7 +228,6 @@ public:
virtual void Modify (const SfxPoolItem *pOld, const SfxPoolItem *pNew);
};
-
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
{
public:
@@ -303,7 +302,7 @@ class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
SwTOXBase* pTOXBase;
sal_uInt16 nCols;
sal_Bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX
- sal_Bool bHadPageDescItem; // ...
+ sal_Bool bHadPageDescItem;
public:
SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0);
SwFltTOX(const SwFltTOX&);
@@ -343,8 +342,6 @@ public:
}
};
-///////////////////////////////////////////////////////////////////////////////////////////
-//
// hier beginnen die fuer ww1-filter neu erstellten klassen. diese
// sollen eine simple oberflaeche fuer die komplexen strukturen des
// writers speziell fuer filter sein. soll etwas in den writer gegeben
@@ -352,10 +349,9 @@ public:
// worden. ausserdem soll moeglich sein das objekt nach vielen
// zustaenden der momentanen formatierung zu fragen, sodasz diese der
// filter nicht selbst verwalten musz.
-//
+
// den anfang macht eine vorlagen-oberklasse, die einfachen umgang mit
// formatvorlagen ermoeglicht:
-//
class SwFltOutBase
{
@@ -490,7 +486,6 @@ public:
virtual void EndFly();
};
-//
// dies nun ist die zauberhafteklasse: intention: alle eins nach dem
// andern hinein'pipe'n. wird eine besondere struktur eingelesen, wird
// eine klammer geoeffnet (BeginXxx) und nach beendigung geschlossen
@@ -500,7 +495,7 @@ public:
// beginnt ein neuer absatz oder aehnliches, wird NextXxx genutzt.
// hier ist moeglich, Tab, Zeilenumbruch, Absatzende, Seitenumbruch
// und Sektionsende einzufuegen.
-//
+
class SwFltShell
{
SwFltOutDoc* pOutDoc;
@@ -526,11 +521,11 @@ class SwFltShell
// Fly items:
sal_uInt16 nAktStyle; // zur Indizierung pStyleFlyTable
-//
+
SwFltControlStack aStack;
SwFltEndStack aEndStack;
SwPaM* pPaM;
-//
+
OUString sBaseURL;
sal_uInt16 nPageDescOffset; // fuers update der pagedescs
rtl_TextEncoding eSrcCharSet; // charset der quelle
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index 301b8ff2bf5f..e6a2e089706e 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -45,5 +45,4 @@ public:
#endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 71b590de6e0b..6e06756f4c76 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -35,7 +35,6 @@ SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
sal_Bool bDeep, sal_Bool bTstForDefault = sal_True );
-
/* Funktionspointer auf die Node-Write-Funktionen */
enum RES_NODE
@@ -52,9 +51,6 @@ typedef FnNodeOut SwNodeFnTab[ RES_NODE_END - RES_NODE_BEGIN ];
SW_DLLPUBLIC Writer& Out( const SwNodeFnTab, SwNode&, Writer & rWrt );
-
-
-
#endif // INCLUDED_SW_SOURCE_FILTER_INC_WRT_FN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index de63e3e691f7..1e4e6463779d 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -34,18 +34,13 @@ class SvxBrushItem;
namespace editeng { class SvxBorderLine; }
-//---------------------------------------------------------------------------
// Code aus dem HTML-Filter fuers schreiben von Tabellen
-//---------------------------------------------------------------------------
#define COLFUZZY 20
#define ROWFUZZY 20
#define COL_DFLT_WIDTH ((2*COLFUZZY)+1)
#define ROW_DFLT_HEIGHT (2*ROWFUZZY)+1
-
-//-----------------------------------------------------------------------
-
class SW_DLLPUBLIC SwWriteTableCell
{
const SwTableBox *pBox; // SwTableBox der Zelle
@@ -61,7 +56,6 @@ class SW_DLLPUBLIC SwWriteTableCell
sal_uInt16 nRowSpan; // ueberspannte Zeilen
sal_uInt16 nColSpan; // ueberspannte Spalten
-
bool bPrcWidthOpt;
public:
@@ -97,9 +91,6 @@ public:
typedef boost::ptr_vector<SwWriteTableCell> SwWriteTableCells;
-
-//-----------------------------------------------------------------------
-
class SW_DLLPUBLIC SwWriteTableRow
{
SwWriteTableCells aCells; // Alle Zellen der Rows
@@ -168,9 +159,6 @@ public:
~SwWriteTableRows() { DeleteAndDestroyAll(); }
};
-
-//-----------------------------------------------------------------------
-
class SW_DLLPUBLIC SwWriteTableCol
{
sal_uInt32 nPos; // End Position der Spalte
@@ -230,8 +218,6 @@ public:
~SwWriteTableCols() { DeleteAndDestroyAll(); }
};
-//-----------------------------------------------------------------------
-
class SW_DLLPUBLIC SwWriteTable
{
protected:
@@ -312,7 +298,6 @@ protected:
sal_uInt16 GetLeftSpace( sal_uInt16 nCol ) const;
sal_uInt16 GetRightSpace(size_t nCol, sal_uInt16 nColSpan) const;
-
public:
SwWriteTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth,
bool bRel, sal_uInt16 nMaxDepth = USHRT_MAX,
@@ -324,9 +309,6 @@ public:
const SwWriteTableRows& GetRows() const { return aRows; }
};
-
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index bcee1e0a0ae1..aafa1615497e 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -191,7 +191,6 @@ sal_Int32 Writer::FindPos_Bkmk(const SwPosition& rPos) const
return -1;
}
-
SwPaM *
Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndIdx)
{
@@ -241,7 +240,6 @@ SvStream& Writer::OutULong( SvStream& rStrm, sal_uLong nVal )
return lcl_OutLongExt(rStrm, nVal, false);
}
-
sal_uLong Writer::Write( SwPaM& rPaM, SvStream& rStrm, const OUString* pFName )
{
if ( IsStgWriter() )
@@ -385,7 +383,6 @@ void Writer::CreateBookmarkTbl()
}
}
-
// search alle Bookmarks in the range and return it in the Array
sal_uInt16 Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index d0917733d19f..b83fab140467 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -20,14 +20,11 @@
#include <svl/itemiter.hxx>
#include <svl/whiter.hxx>
-
#include "shellio.hxx"
#include "wrt_fn.hxx"
#include "node.hxx"
#include "format.hxx"
-
-
Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
{
sal_uInt16 nId = rHt.Which();
@@ -86,8 +83,6 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
return rWrt;
}
-
-
Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
{
// It must be a CntntNode!
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 1aa9e9397029..43d38546d596 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -190,7 +190,6 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox,
return 0;
}
-
void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine,
bool bTable )
{
@@ -222,7 +221,6 @@ void SwWriteTable::MergeBorders( const SvxBorderLine* pBorderLine,
nCellSpacing = nDist;
}
-
sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox,
size_t const nRow, size_t const nCol,
sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
@@ -282,7 +280,6 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox,
return nBorderMask;
}
-
sal_uInt32 SwWriteTable::GetRawWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const
{
sal_uInt32 nWidth = aCols[nCol+nColSpan-1]->GetPos();
@@ -524,7 +521,6 @@ void SwWriteTable::CollectTableRowsCols( long nStartRPos,
}
}
-
void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
sal_uInt32 nStartCPos, sal_uInt16 nStartCol,
long nParentLineHeight,
@@ -581,7 +577,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
--nOldRow;
}
-
SwWriteTableRow *pRow = aRows[nOldRow];
SwWriteTableRow *pEndRow = aRows[nRow];
if( nLine+1==nNumOfHeaderRows && nParentLineHeight==0 )
@@ -597,7 +592,6 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ))
nHeight = ((SwFmtFrmSize*)pItem)->GetHeight();
-
const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush;
if( SFX_ITEM_SET == rItemSet.GetItemState( RES_BACKGROUND, false,
&pItem ) )
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 672cfbfb2c95..2d23c90d2c27 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <ctype.h>
#include <hintids.hxx>
#include <hints.hxx>
@@ -61,7 +60,6 @@
#include <viewsh.hxx>
#include <shellres.hxx>
-
using namespace com::sun::star;
static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
@@ -107,7 +105,6 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
m_aPtPos.SetPos(rEndPos);
}
-
bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
const SwFltPosition &rMkPos, const SwFltPosition &rPtPos, bool bIsParaEnd,
sal_uInt16 nWhich)
@@ -115,7 +112,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
// does this range actually contain something?
// empty range is allowed if at start of empty paragraph
// fields are special: never have range, so leave them
- //
+
// The only position of 0x0D will not be able to make region in the old logic
// because it is beyond the length of para...need special consideration here.
SwCntntNode *const pCntntNode(
@@ -161,7 +158,6 @@ SwFltControlStack::SwFltControlStack(SwDoc* pDo, sal_uLong nFieldFl)
{
}
-
SwFltControlStack::~SwFltControlStack()
{
OSL_ENSURE(maEntries.empty(), "There are still Attributes on the stack");
@@ -236,7 +232,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr
{
//Here we optimize by seeing if there is an attribute uncommited
//to the document which
- //
+
//a) has the same value as this attribute
//b) is already open, or ends at the same place as where we're starting
//from. If so we merge it with this one and elide adding another
@@ -440,7 +436,7 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
// IterateNumrulePiece() looks for the first range valid for Numrules
// between rTmpStart and rEnd.
-//
+
// rNds denotes the doc nodes
// rEnd denotes the range end,
// rTmpStart is an in/out parameter: in: start of range to be searched,
@@ -1016,7 +1012,7 @@ SfxPoolItem* SwFltSection::Clone(SfxItemPool*) const
// here starts code generated by mdt. this is a shell, if possible, soon for
// all filters. the whole trouble of inserting texts and formatting attributes,
// manage positions, styles & headers/footers etc.
-//
+
// SwFltShell
SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFl) :
pCurrentPageDesc(0),
@@ -1843,7 +1839,6 @@ bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
OSL_ENSURE(pFlySavedPos == NULL, "BeginFly in Fly"); // recursive doesn't work yet
pFlySavedPos = new SwPosition(*pPaM->GetPoint());
-
SwFmtAnchor aAnchor( eAnchor, 1 );
// If the style contained Fly attributes, use them as defaults now
@@ -1979,7 +1974,6 @@ void SwFltShell::SetFlyYPos( short nYPos, sal_Int16 eVRel,
SetFlyFrmAttr( SwFmtVertOrient( nYPos, eVAlign, eVRel ) );
}
-
void SwFltShell::EndFly()
{
if (!pOut->IsInFly()){
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index db40b6a4dd3e..05ecff20ea3a 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <string.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
#include <tools/stream.hxx>
#include <w1class.hxx>
-
#ifdef DUMP
static const sal_Char* pUnknown = "?";
#define DUMPNAME(s) s
@@ -35,8 +33,6 @@ static const sal_Char* pUnknown = "?";
Ww1SingleSprm* Ww1Sprm::aTab[ 256 ];
Ww1SingleSprm* Ww1Sprm::pSingleSprm = 0;
-
-
// Fib
Ww1Fib::Ww1Fib( SvStream& _rStream )
: rStream(_rStream)
@@ -651,7 +647,7 @@ void Ww1Sprm::InitTab()
aTab[ 69] = new Ww1SingleSprmByte(DUMPNAME("sprmCKul")); // 69 chp.kul kul byte
aTab[ 70] = new Ww1SingleSprm(3, DUMPNAME("sprmCSizePos")); // 70 chp.hps, chp.hpsPos (see below) 3 bytes
aTab[ 71] = new Ww1SingleSprmWord(DUMPNAME("sprmCDxaSpace")); // 71 chp.dxaSpace dxa word
- aTab[ 72] = new Ww1SingleSprmWord(DUMPNAME("//")); // 72 //
+ aTab[ 72] = new Ww1SingleSprmWord(DUMPNAME("//")); // 72
aTab[ 73] = new Ww1SingleSprmByte(DUMPNAME("sprmCIco")); // 73 chp.ico ico byte
aTab[ 74] = new Ww1SingleSprmByte(DUMPNAME("sprmCHps")); // 74 chp.hps hps !byte!
aTab[ 75] = new Ww1SingleSprmByte(DUMPNAME("sprmCHpsInc")); // 75 chp.hps (see below) byte
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 633b13d89434..1508f5a590e3 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -513,7 +513,6 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
return eDT;
}
-
extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
sal_uInt16& rSubType, sal_uLong &rFmt,
sal_uInt16 nVersion );
@@ -659,7 +658,6 @@ oncemore:
aSubType = rOut.ConvertUStr(aSubType);
-
// huge pile of shit: the type 'info' can represent one of
// types 15 to 31. it contains as formula the actual field
// of the doc info.
@@ -990,7 +988,7 @@ oncemore:
case 42: // nextif command
case 43: // skipif command
case 44: // number of record
- //
+
case 45: // dde ref
case 46: // dde auto ref
case 47: // glossary entry
diff --git a/sw/source/filter/ww1/w1par.hxx b/sw/source/filter/ww1/w1par.hxx
index df5581670e3f..326655777486 100644
--- a/sw/source/filter/ww1/w1par.hxx
+++ b/sw/source/filter/ww1/w1par.hxx
@@ -30,7 +30,6 @@ public:
Ww1Shell(SwDoc&, SwPaM&, const OUString& rBaseURL, sal_Bool bNew, sal_uLong nFieldFlags);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index db4e093da221..6ce329ad5961 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <tools/solar.h>
#include <editeng/paperinf.hxx>
@@ -526,7 +525,6 @@ void Ww1SingleSprmTDefTable10::Start(
}
}
-
void Ww1SingleSprmTDyaRowHeight::Start(
Ww1Shell& rOut, sal_uInt8 /*nId*/, sal_uInt8* pSprm, sal_uInt16 /*nSize*/, Ww1Manager& /*rMan*/)
{
diff --git a/sw/source/filter/ww1/w1struct.hxx b/sw/source/filter/ww1/w1struct.hxx
index a1fa8f9ed000..9e28e0c18696 100644
--- a/sw/source/filter/ww1/w1struct.hxx
+++ b/sw/source/filter/ww1/w1struct.hxx
@@ -313,7 +313,6 @@ struct W1_FIB
sal_uInt16 cbDopGet() {
return SVBT16ToShort(cbDop); }
-
SVBT32 fcSttbfAssoc;// 0x10c offset to STTBF of associated strings. See STTBFASSOC.
sal_uLong fcSttbfAssocGet() {
return SVBT32ToUInt32(fcSttbfAssoc); }
@@ -422,7 +421,7 @@ struct W1_DOP //Document Properties
// SVBT16 fExactCWords : 1;
sal_Bool fExactCWordsGet() {
return 0 != ((fSveFlagsGet() >> 1) & 1); }
- // SVBT16 fPagHidden : 1;//
+ // SVBT16 fPagHidden : 1;
sal_Bool fPagHiddenGet() {
return 0 != ((fSveFlagsGet() >> 2) & 1); }
// SVBT16 fPagResults : 1;
@@ -462,7 +461,7 @@ struct W1_DOP //Document Properties
SVBT16 dxaTab;// 720 twips default tab width
sal_uInt16 dxaTabGet() {
return SVBT16ToShort(dxaTab); }
- SVBT16 wSpare;//
+ SVBT16 wSpare;
sal_uInt16 wSpareGet() {
return SVBT16ToShort(wSpare); }
SVBT16 dxaHotZ;// width of hyphenation hot zone measured in twips
diff --git a/sw/source/filter/ww8/WW8FFData.cxx b/sw/source/filter/ww8/WW8FFData.cxx
index 2aaf2b3317ce..59d011396c1b 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "WW8FFData.hxx"
#include <tools/stream.hxx>
#include <doc.hxx>
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index aa39f3d6b33c..b22df4433daf 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <iostream>
#include <set>
#include <stdio.h>
@@ -199,7 +198,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase,
// or all the rows together
if (calculateColumnsFromAllRows)
{
- // Calculate the width of all the columns based on ALL the rows.
+ // Calculate the width of all the columns based on ALL the rows.
// The difference is that this kind of draws vertical lines,
// so that if the rows look like this:
//
@@ -210,13 +209,13 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase,
// ------------------------
// | | |
// ------------------------
- //
+
// then the actual column widths will be broken down like this:
//
// ------------------------
// | | | | |
// ------------------------
- //
+
// See the example at
// http://officeopenxml.com/WPtableGrid.php
// Under "Word 2007 Example"
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4e48125b5b8d..57d4f7ff7863 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1935,7 +1935,6 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
{
FastAttributeList* pAttr = pSerializer->createAttrList();
-
// Compute val attribute value
// Can be one of:
// single, double,
@@ -6421,7 +6420,6 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox )
return;
}
-
OutputBorderOptions aOutputBorderOptions = lcl_getBoxBorderOptions();
// Check if there is a shadow item
const SfxPoolItem* pItem = GetExport().HasItem( RES_SHADOW );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 9335b55fe7b4..77bf6afb76c5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -822,7 +822,6 @@ private:
OString fontKey;
};
-
boost::scoped_ptr<TableReference> m_tableReference;
boost::scoped_ptr<TableReference> m_oldTableReference;
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 79077f5c554a..d76890610873 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -451,7 +451,6 @@ void DocxExport::OutputPageSectionBreaks( const SwTxtNode& )
OSL_TRACE( "TODO DocxExport::OutputPageSectionBreaks( const SwTxtNode& )" );
}
-
void DocxExport::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum )
{
AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() );
@@ -760,7 +759,6 @@ void DocxExport::WriteFonts()
pFS->endElementNS( XML_w, XML_fonts );
}
-
void DocxExport::WriteProperties( )
{
// Write the core properties
@@ -962,7 +960,6 @@ void DocxExport::WriteGlossary()
serializer->serialize( uno::Reference< xml::sax::XDocumentHandler >( writer, uno::UNO_QUERY_THROW ),
uno::Sequence< beans::StringPair >() );
-
sal_Int32 length = glossaryDomList.getLength();
for ( int i =0; i < length; i++)
{
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 8373fc0070f2..6696ae0da372 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -86,7 +86,6 @@ bool DocxExportFilter::exportDocument()
return true;
}
-
// UNO stuff so that the filter is registered
#define IMPL_NAME "com.sun.star.comp.Writer.DocxExport"
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 94b598e25efd..d8480db3c9e4 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -731,7 +731,6 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrmFmt& rFr
sax_fastparser::XFastAttributeListRef xDocPrAttrListRef(pDocPrAttrList);
pFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef);
-
sal_Int32 diagramCount;
diagramCount = nAnchorId;
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 94777aaa71e3..baaa4b0100a2 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "fields.hxx"
#include <osl/diagnose.h>
#include <sal/macros.h>
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index b77e74ae630d..a07dd66da62b 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -29,7 +29,6 @@ namespace ww
{
/** simple template that manages a hash
-
@author
<a href="mailto:mikeleib@openoffice.org">Michael Leibowitz</a>
*/
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b03f20bc8011..837f890dfb7f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1904,7 +1904,6 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_aRun->append('}');
}
-
xPropSet->getPropertyValue("StringItemList") >>= aStrSeq;
sal_uInt32 nListItems = aStrSeq.getLength();
for (sal_uInt32 i = 0; i < nListItems; i++)
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index f5c6b660f56c..10b99b0f0621 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -470,7 +470,6 @@ void RtfExport::WriteInfo()
OutUnicode(OOO_STRING_SVTOOLS_RTF_AUTHOR,xDocProps->getModifiedBy());
OutDateTime(OOO_STRING_SVTOOLS_RTF_REVTIM, xDocProps->getModificationDate());
-
OutDateTime(OOO_STRING_SVTOOLS_RTF_PRINTIM, xDocProps->getPrintDate());
}
@@ -713,7 +712,6 @@ void RtfExport::ExportDocument_Impl()
}
Strm().WriteCharPtr( pOut );
-
const SwEndNoteInfo& rEndNoteInfo = pDoc->GetEndNoteInfo();
Strm().WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AENDDOC ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_AFTNRSTCONT )
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 26083c48b016..01aaefcc4591 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -94,7 +94,6 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a
return sal_True;
}
-
void RtfExportFilter::cancel( ) throw (uno::RuntimeException, std::exception)
{
}
@@ -105,9 +104,7 @@ void RtfExportFilter::setSourceDocument( const uno::Reference< lang::XComponent
m_xSrcDoc = xDoc;
}
-//////////////////////////////////////////////////////////////////////////
// UNO helpers
-//////////////////////////////////////////////////////////////////////////
OUString RtfExport_getImplementationName()
{
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index c2588cb4db67..0f06662ef32f 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "../inc/wwstyles.hxx"
#include <functional>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 328bc73c5e0a..2f2d6f94d94d 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/util/XCloseable.hpp>
#include <doc.hxx>
@@ -54,7 +53,6 @@
using namespace com::sun::star;
using namespace nsSwGetPoolIdFromName;
-
namespace
{
/*
@@ -593,7 +591,6 @@ namespace sw
return 0;
}
-
SwNoTxtNode *GetNoTxtNodeFromSwFrmFmt(const SwFrmFmt &rFmt)
{
const SwNodeIndex *pIndex = rFmt.GetCntnt().GetCntntIdx();
@@ -692,7 +689,6 @@ namespace sw
maStack.push_back(new SwFltStackEntry(rPos,rAttr.Clone()));
}
-
class SameOpenRedlineType :
public std::unary_function<const SwFltStackEntry*, bool>
{
@@ -763,7 +759,6 @@ namespace sw
delete pEntry;
}
-
bool CompareRedlines::operator()(const SwFltStackEntry *pOneE,
const SwFltStackEntry *pTwoE) const
{
@@ -780,7 +775,6 @@ namespace sw
return (pOne->aStamp < pTwo->aStamp) ? true : false;
}
-
RedlineStack::~RedlineStack()
{
std::sort(maStack.begin(), maStack.end(), CompareRedlines());
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 88e6e88bdf89..a29a781bc0ce 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -72,7 +72,6 @@ namespace sw
/// STL const iterator for ParaStyles
typedef PoolItems::const_iterator cPoolItemIter;
-
/** Make exporting a Writer Frame easy
In word all frames are effectively anchored to character or as
@@ -150,7 +149,6 @@ namespace sw
*/
bool IsInline() const;
-
/** Even if the frame isn't an inline frame, force it to behave as one
There are a variety of circumstances where word cannot have
@@ -170,7 +168,6 @@ namespace sw
const Graphic &GetGraphic() const { return maGrf; }
bool HasGraphic() const { return mbForBullet; }
-
/** Does this sw::Frame refer to the same writer content as another
@return
@@ -513,7 +510,6 @@ namespace sw
*/
ParaStyles GetParaStyles(const SwDoc &rDoc);
-
/** Get a Paragraph Style which fits a given name
Its surprisingly tricky to get a style when all you have is a name,
@@ -593,7 +589,6 @@ namespace sw
return item_cast<T>(SearchPoolItems(rItems, eType));
}
-
/** Remove properties from an SfxItemSet which a SwFmtCharFmt overrides
Given an SfxItemSet and a SwFmtCharFmt remove from the rSet all the
@@ -730,7 +725,6 @@ namespace sw
*/
bool HasPageBreak(const SwNode &rNode);
-
/** Make a best fit Polygon from a PolyPolygon
For custom contours in writer we use a PolyPolygon, while word uses
@@ -749,7 +743,6 @@ namespace sw
/** Make setting a drawing object's layer in a Writer document easy
-
Word has the simple concept of a drawing object either in the
foreground and in the background. We have an additional complexity
that form components live in a separate layer, which seems
@@ -856,7 +849,6 @@ namespace sw
sal_uInt16 GetSetWhichFromSwDocWhich(const SfxItemSet &rSet,
const SwDoc &rDoc, sal_uInt16 nWhich);
-
/** Make inserting an OLE object into a Writer document easy
The rest of Office uses SdrOle2Obj for their OLE objects, Writer
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 07f43f937710..5554666fec49 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -397,7 +397,6 @@ bool WW8Export::MiserableFormFieldExportHack(const SwFrmFmt& rFrmFmt)
return bHack;
}
-
void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
{
OUString sSelected;
@@ -420,7 +419,6 @@ void WW8Export::DoComboBox(uno::Reference<beans::XPropertySet> xPropSet)
sName = *pStr;
}
-
OUString sHelp;
{
// property "Help" does not exist and due to the no-existence an exception is thrown.
@@ -998,7 +996,6 @@ const std::vector<sal_uInt32>* WW8_WrPlcTxtBoxes::GetShapeIdArr() const
return &aShapeIds;
}
-
sal_uInt32 WW8Export::GetSdrOrdNum( const SwFrmFmt& rFmt ) const
{
sal_uInt32 nOrdNum;
@@ -1440,7 +1437,6 @@ void WinwordAnchoring::WriteData( EscherEx& rEx ) const
}
}
-
void WW8Export::CreateEscher()
{
SfxItemState eBackSet = pDoc->GetPageDesc(0).GetMaster().
@@ -1483,7 +1479,6 @@ void SwEscherEx::WritePictures()
Flush();
}
-
// Output- Routines for Escher Export
SwEscherExGlobal::SwEscherExGlobal()
@@ -1707,7 +1702,6 @@ void SwBasicEscherEx::WriteGrfAttr(const SwNoTxtNode& rNd,
nBrightness = ((SfxInt16Item*)pItem)->GetValue();
}
-
if (SFX_ITEM_SET == rNd.GetSwAttrSet().GetItemState(RES_GRFATR_DRAWMODE,
true, &pItem))
{
@@ -1806,7 +1800,6 @@ sal_Int32 SwBasicEscherEx::WriteOLEFlyFrame(const SwFrmFmt& rFmt, sal_uInt32 nSh
awt::Rectangle aRect;
bool bRectIsSet = false;
-
// TODO/LATER: should the icon size be stored in case of iconified object?
if ( xObj.is() && nAspect != embed::Aspects::MSOLE_ICON )
{
@@ -3196,7 +3189,6 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
if (!xOleStg.Is())
return false;
-
OUString sUName;
if (!WriteOCXStream( mxModel, xOleStg,xControlModel,aSize,sUName))
return false;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index ba4bcfad3fd9..b986b0cb7199 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vector>
#include <list>
#include <utility>
@@ -298,7 +297,6 @@ sal_Int32 SwWW8AttrIter::SearchNext( sal_Int32 nStartPos )
}
}
-
if (mrSwFmtDrop.GetWholeWord() && nStartPos <= rNd.GetDropLen(0))
nMinPos = rNd.GetDropLen(0);
else if(nStartPos <= mrSwFmtDrop.GetChars())
@@ -735,7 +733,6 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, sal_Int32 /*nPos*/,
}
aStr += "(\\s\\up ";
-
if ( g_pBreakIt->GetBreakIter().is() )
nRubyScript = g_pBreakIt->GetBreakIter()->getScriptType( rNode.GetTxt(),
*( pRubyTxt->GetStart() ) );
@@ -860,7 +857,6 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl, const OUString &rTarget
bool bBookMarkOnly = AnalyzeURL( rUrl, rTarget, &sURL, &sMark );
-
m_rWW8Export.OutputField( 0, ww::eHYPERLINK, sURL, WRITEFIELD_START | WRITEFIELD_CMD_START );
// write the refence to the "picture" structure
@@ -1313,7 +1309,6 @@ const SwRedlineData* SwWW8AttrIter::GetRunLevelRedline( sal_Int32 nPos )
return NULL;
}
-
short MSWordExportBase::GetCurrentPageDirection() const
{
const SwFrmFmt &rFmt = pAktPageDesc
@@ -1454,7 +1449,6 @@ SvxBrushItem WW8Export::TrueFrameBgBrush(const SwFrmFmt &rFlyFmt) const
return aRet;
}
-
/*
Convert characters that need to be converted, the basic replacements and the
ridicously complicated title case attribute mapping to hardcoded upper case
@@ -2526,7 +2520,6 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
}
-
const SfxItemSet* sfxItemSet = NULL;
if(const SwpHints* pTxtAttrs = rNode.GetpSwpHints())
{
@@ -2632,7 +2625,6 @@ bool MSWordExportBase::NoPageBreakSection( const SfxItemSet* pSet )
return bRet;
}
-
void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
{
const SwSection& rSection = rSectionNode.GetSection();
@@ -2682,7 +2674,6 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode )
bStartTOX = true;
}
-
void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum )
{
pSepx->AppendSep(Fc2Cp(Strm().Tell()), pPageDesc, pFmt, nLnNum);
@@ -2940,7 +2931,6 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
}
}
-
void MSWordExportBase::OutputContentNode( const SwCntntNode& rNode )
{
switch ( rNode.GetNodeType() )
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index c4b7d6991030..e9ae01b94f45 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <vcl/font.hxx>
#include <editeng/fontitem.hxx>
@@ -553,7 +552,6 @@ void WW8Export::OutListNamesTab()
pFib->lcbSttbListNames = pTableStrm->Tell() - pFib->fcSttbListNames;
}
-
// old WW95-Code
void WW8Export::OutputOlst( const SwNumRule& rRule )
@@ -588,7 +586,6 @@ void WW8Export::OutputOlst( const SwNumRule& rRule )
pO->insert( pO->end(), (sal_uInt8*)&aOlst, (sal_uInt8*)&aOlst+sizeof( aOlst ) );
}
-
void WW8Export::Out_WwNumLvl( sal_uInt8 nWwLevel )
{
pO->push_back( 13 );
@@ -824,7 +821,6 @@ void WW8Export::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
OutSprmBytes( (sal_uInt8*)&aSprmAnld, sizeof( aSprmAnld ) );
}
-
// Return: is it an outline?
bool WW8Export::Out_SwNum(const SwTxtNode* pNd)
{
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index c84bd023e44f..a50680165916 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <algorithm>
#include <functional>
@@ -114,10 +113,8 @@ public:
void Write( SvStream& rStrm );
};
-
// Styles
-
#define WW8_RESERVED_SLOTS 15
// GetId( SwCharFmt ) for use in text -> zero is not allowed,
@@ -136,8 +133,6 @@ sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl& rColl ) const
return ( nRet != 0xfff ) ? nRet : 0; // Default TxtFmtColl
}
-
-
//typedef pFmtT
MSWordStyles::MSWordStyles( MSWordExportBase& rExport, bool bListStyles )
: m_rExport( rExport ),
@@ -423,7 +418,6 @@ void WW8AttributeOutput::StartStyle( const OUString& rName, StyleType eType, sal
//sal_uInt16 : 14; /* unused bits */
}
-
sal_uInt16 nLen = static_cast< sal_uInt16 >( ( pData - aWW8_STD ) + 1 +
((m_rWW8Export.bWrtWW8 ? 2 : 1 ) * (rName.getLength() + 1)) ); // temporary
@@ -725,7 +719,6 @@ const SwNumRule* MSWordStyles::GetSwNumRule(sal_uInt16 nId) const
return it->second;
}
-
// Fonts
wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
@@ -794,7 +787,7 @@ wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily
ShortToSVBT16( 400, &maWW8_FFN[2] ); // don't know any better
// 400 == FW_NORMAL (windows.h)
- //
+
//#i61927# For unicode fonts like Arial Unicode, Word 97+ sets the chs
//to SHIFTJIS presumably to capture that it's a multi-byte encoding font
//but Word95 doesn't do this, and sets it to 0 (ANSI), so we should do the
@@ -876,7 +869,6 @@ bool operator<(const wwFont &r1, const wwFont &r2)
return nRet < 0;
}
-
sal_uInt16 wwFontHelper::GetId(const wwFont &rFont)
{
sal_uInt16 nRet;
@@ -1013,7 +1005,6 @@ void wwFontHelper::WriteFontTable( const RtfAttributeOutput& rAttrOutput )
::std::bind2nd( ::std::mem_fun( &wwFont::WriteRtf ), &rAttrOutput ) );
}
-
WW8_WrPlc0::WW8_WrPlc0( sal_uLong nOffset )
: nOfs( nOffset )
{
@@ -1035,13 +1026,9 @@ void WW8_WrPlc0::Write( SvStream& rStrm )
}
}
-
-
-
// class MSWordSections : translate PageDescs into Sections
// also deals with header and footer
-
MSWordSections::MSWordSections( MSWordExportBase& rExport )
: mbDocumentIsProtected( false )
{
@@ -1344,7 +1331,6 @@ bool WW8_SepInfo::IsProtected() const
return bRet;
}
-
void MSWordSections::CheckForFacinPg( WW8Export& rWrt ) const
{
// 2 values getting set
@@ -1703,7 +1689,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
else
aSet.Put(rSepInfo.pSectionFmt->GetFmtAttr(RES_COL));
-
aSet.Put( aResultLR );
// und raus damit ins WW-File
@@ -1980,7 +1965,6 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
rWrt.pFib->lcbPlcfsed = rWrt.pTableStrm->Tell() - nFcStart;
}
-
void WW8_WrPlcSepx::WritePlcHdd( WW8Export& rWrt ) const
{
// Don't write out the PlcfHdd if ccpHdd is 0: it's a validation failure case.
@@ -2040,7 +2024,6 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
}
}
-
// class WW8_WrPlcFtnEdn : Collect the Footnotes and Endnotes and output their text
// and Plcs at the end of the document.
// WW8_WrPlcFtnEdn is the class for Footnotes and Endnotes
@@ -2546,7 +2529,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp,
}
// documents layout of WriteShort's below:
- //
+
// SVBT16 ibst; // index into GrpXstAtnOwners
// SVBT16 ak; // not used
// SVBT16 grfbmc; // not used
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 5c5a25e02132..cfc66805bf47 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <iostream>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -155,7 +154,6 @@ public:
sal_uInt8 *CopyLastSprms(sal_uInt8 &rLen, bool bVer8);
};
-
// class WW8_WrPc collects all piece entries for one piece
class WW8_WrPc
{
@@ -683,8 +681,6 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const
return *pItem;
}
-
-
WW8_WrPlc1::WW8_WrPlc1( sal_uInt16 nStructSz )
: nStructSiz( nStructSz )
{
@@ -730,7 +726,6 @@ void WW8_WrPlc1::Finish( sal_uLong nLastCp, sal_uLong nSttCp )
}
}
-
void WW8_WrPlc1::Write( SvStream& rStrm )
{
sal_uInt32 i;
@@ -740,7 +735,6 @@ void WW8_WrPlc1::Write( SvStream& rStrm )
rStrm.Write( pData, (i-1) * nStructSiz );
}
-
// Class WW8_WrPlcFld for fields
bool WW8_WrPlcFld::Write( WW8Export& rWrt )
@@ -827,8 +821,6 @@ void WW8_WrMagicTable::Append( WW8_CP nCp, sal_uLong nData)
}
}
-
-
void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong nCount )
{
static const sal_uInt32 aNulls[16] =
@@ -859,9 +851,6 @@ sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
return rStrm.Tell();
}
-
-
-
WW8_WrPlcPn::WW8_WrPlcPn( WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc )
: rWrt(rWr), nFkpStartPage(0), ePlc(ePl), nMark(0)
{
@@ -981,8 +970,6 @@ void WW8_WrPlcPn::WritePlc()
}
}
-
-
WW8_WrFkp::WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc, bool bWrtWW8)
: ePlc(ePl), nStartGrp(511), nOldStartGrp(511),
nItemSize( ( CHP == ePl ) ? 1 : ( bWrtWW8 ? 13 : 7 )),
@@ -1258,7 +1245,6 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode)
if( bIsUni )
nStartCp >>= 1; // for Unicode: number of characters / 2
-
if ( !bIsUnicode )
{
nStartFc <<= 1; // Address * 2
@@ -1274,7 +1260,6 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc, bool bIsUnicode)
bIsUni = bIsUnicode;
}
-
void WW8_WrPct::WritePc( WW8Export& rWrt )
{
sal_uLong nPctStart;
@@ -1290,7 +1275,6 @@ void WW8_WrPct::WritePc( WW8Export& rWrt )
SwWW8Writer::WriteLong( *rWrt.pTableStrm,
aIter->GetStartCp() );
-
// calculate the last Pos
sal_uLong nStartCp = rWrt.pFib->fcMac - nOldFc;
if( bIsUni )
@@ -1550,9 +1534,6 @@ void MSWordExportBase::AppendWordBookmark( const OUString& rName )
AppendBookmark( BookmarkToWord( rName ) );
}
-
-
-
void WW8_WrtRedlineAuthor::Write( Writer& rWrt )
{
WW8Export & rWW8Wrt = *(((SwWW8Writer&)rWrt).m_pExport);
@@ -1570,8 +1551,6 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
}
-
-
void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen)
{
@@ -1692,7 +1671,6 @@ void SwWW8Writer::WriteString_xstz(SvStream& rStrm, const OUString& rStr, bool b
rStrm.Write(&aBytes[0], aBytes.size());
}
-
void SwWW8Writer::WriteString8(SvStream& rStrm, const OUString& rStr,
bool bAddZero, rtl_TextEncoding eCodeSet)
{
@@ -3172,7 +3150,6 @@ void WW8Export::ExportDocument_Impl()
pPiece = new WW8_WrPct( pFib->fcMin, bWrtWW8 );
pDop = new WW8Dop;
-
pDop->fRevMarking = 0 != ( nsRedlineMode_t::REDLINE_ON & mnRedlineMode );
pDop->fRMView = 0 != ( nsRedlineMode_t::REDLINE_SHOW_DELETE & mnRedlineMode );
pDop->fRMPrint = pDop->fRMView;
@@ -3268,7 +3245,6 @@ void WW8Export::ExportDocument_Impl()
delete pFib;
GetWriter().SetStream( 0 );
-
xWwStrm->SetBufferSize( 0 );
if( bWrtWW8 )
{
@@ -3283,7 +3259,6 @@ void WW8Export::ExportDocument_Impl()
}
}
-
void WW8Export::PrepareStorage()
{
sal_uLong nLen;
@@ -3495,7 +3470,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportDOC( const OUString& rFltNam
xRet = new SwWW8Writer( rFltName, rBaseURL );
}
-
extern "C" SAL_DLLPUBLIC_EXPORT sal_uLong SAL_CALL GetSaveWarningOfMSVBAStorage_ww8( SfxObjectShell &rDocS )
{
return SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( rDocS );
@@ -3536,7 +3510,6 @@ void WW8_WrPlcFtnEdn::WritePlc( WW8Export& rWrt ) const
}
}
-
bool WW8_WrPlcAnnotations::WriteTxt( WW8Export& rWrt )
{
bool bRet = WriteGenericTxt( rWrt, TXT_ATN, rWrt.pFib->ccpAtn );
@@ -3620,7 +3593,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
const ::sw::mark::IFieldmark* pFieldmark = &rFieldmark;
const ::sw::mark::ICheckboxFieldmark* pAsCheckbox = dynamic_cast< const ::sw::mark::ICheckboxFieldmark* >( pFieldmark );
-
OSL_ENSURE(rFieldmark.GetFieldname() == ODF_FORMTEXT ||
rFieldmark.GetFieldname() == ODF_FORMDROPDOWN ||
rFieldmark.GetFieldname() == ODF_FORMCHECKBOX, "Unknown field type!!!");
@@ -3666,7 +3638,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {}
};
-
FFDataHeader aFldHeader;
aFldHeader.bits |= (type & 0x03);
@@ -3704,7 +3675,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
const OUString ffentrymcr;
const OUString ffexitmcr;
-
const sal_uInt8 aFldData[] =
{
0x44,0, // the start of "next" data
@@ -3752,7 +3722,6 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
if ( type )
pDataStrm->WriteUInt16( sal_uInt16(0) );
-
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffformat ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffhelptext ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, OUString( ffstattext ), true );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 071808652113..0dfcfb351683 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -258,7 +258,6 @@ public:
const SwFmt& rFmt, sal_uLong& rCpPos, sal_uInt8 nHFFlags, sal_uInt8 nFlag, sal_uInt8 nBreakCode);
};
-
// class WW8_WrPct to construct the piece table
class WW8_WrPct
{
@@ -817,7 +816,6 @@ protected:
virtual void OutputLinkedOLE( const OUString& ) = 0;
-
/// Output SwSectionNode
virtual void OutputSectionNode( const SwSectionNode& );
@@ -984,7 +982,6 @@ private:
static void BuildAnlvBase( WW8_ANLV& rAnlv, sal_uInt8*& rpCh, sal_uInt16& rCharLen,
const SwNumRule& rRul, const SwNumFmt& rFmt, sal_uInt8 nSwLevel );
-
/// Output the numbering table.
virtual void WriteNumbering();
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index bb366dc042d2..7e59a05d9bcd 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cad1e42a62b0..5fdd2d064f23 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -218,10 +218,8 @@ bool WW8Export::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
return bRet;
}
-
// Hilfsroutinen fuer Styles
-
void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, sal_uInt16 nScript )
{
sw::cPoolItemIter aEnd = rItems.end();
@@ -915,7 +913,6 @@ OUString MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pNa
return BookmarkToWord( sRet ); // #i43956# - encode bookmark accordingly
}
-
/* File CHRATR.HXX: */
void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
{
@@ -967,7 +964,6 @@ void WW8AttributeOutput::StartRunProperties()
m_nFieldResults = pCurrentFields ? pCurrentFields->ResultCount() : 0;
}
-
void WW8AttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bSingleEmptyRun*/ )
{
if (pRedlineData)
@@ -2207,7 +2203,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
// contents from paragraphs formatted with built-in heading
// styles". And afterward fill in any outline styles left
// uncovered by that range to the \t flag
- //
+
// i.e. for
// Heading 1
// Heading 2
@@ -4586,7 +4582,6 @@ void WW8AttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering
m_rWW8Export.pO->push_back( rNumbering.IsCount() ? 0 : 1 );
}
-
/* File PARATR.HXX */
void WW8AttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
@@ -4841,7 +4836,6 @@ void WW8AttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
m_rWW8Export.pO->push_back( rWidows.GetValue() ? 1 : 0 );
}
-
class SwWW8WrTabu
{
sal_uInt8* pDel; // DelArray
@@ -5134,8 +5128,6 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
}
}
-
-
void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
{
// FIXME maybe use 'item_cast', like 'item_cast<SvxCharHiddenItem>( rHt )'?
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index d365f3cab25b..64a4e3cd2870 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <tools/urlobj.hxx>
#include <svl/urihelper.hxx>
#include <rtl/tencinfo.h>
@@ -33,7 +32,6 @@
#include "ww8glsy.hxx"
#include "ww8par.hxx"
-
WW8Glossary::WW8Glossary(SvStorageStreamRef &refStrm, sal_uInt8 nVersion,
SvStorage *pStg)
: pGlossary(0), rStrm(refStrm), xStg(pStg), nStrings(0)
@@ -188,7 +186,6 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
return bRet;
}
-
bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
{
bool bRet=false;
@@ -238,7 +235,6 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
return bRet;
}
-
bool WW8GlossaryFib::IsGlossaryFib()
{
// fGlsy will indicate whether this has AutoText or not
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index ecd41d12b80f..ae10e905b9c1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1167,7 +1167,6 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
return pFlyFmt;
}
-
bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartCp,
long& rEndCp)
{
@@ -1177,7 +1176,6 @@ bool SwWW8ImplReader::TxbxChainContainsRealText(sal_uInt16 nTxBxS, long& rStartC
return bContainsText;
}
-
// TextBoxes only for Ver67 !!
SdrObject* SwWW8ImplReader::ReadTxtBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet)
@@ -1276,7 +1274,6 @@ SdrObject* SwWW8ImplReader::ReadCaptionBox( WW8_DPHEAD* pHd, const WW8_DO* pDo,
return pObj;
}
-
SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo,
SfxAllItemSet &rSet)
{
@@ -1600,7 +1597,6 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
rFlySet.Put( *pPoolItem );
}
-
// jetzt die Umrandung berechnen und die Box bauen: Das Mass wird fuer die
// Rahmen-GROESSE benoetigt!
SvxBoxItem aBox(sw::util::ItemGet<SvxBoxItem>(rFlySet, RES_BOX));
@@ -1853,7 +1849,6 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins(
}
}
-
void SwWW8ImplReader::AdjustULWrapForWordMargins(
const SvxMSDffImportRec &rRecord, SvxULSpaceItem &rUL)
{
@@ -2188,7 +2183,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
text::HoriOrientation::RIGHT // outside
};
-
// generic vertical Adjustment
static const sal_Int16 aVertOriTab[ nCntYAlign ] =
{
@@ -2280,7 +2274,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
eHoriRel = text::RelOrientation::PAGE_PRINT_AREA;
}
-
// Writer honours this wrap distance when aligned as "left" or "right",
// Word doesn't. Writer doesn't honour it when its "from left".
if (eHoriOri == text::HoriOrientation::LEFT)
@@ -2428,7 +2421,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
if (!pMSDffManager->GetModel())
pMSDffManager->SetModel(pDrawModel, 1440);
-
Rectangle aRect(pF->nXaLeft, pF->nYaTop, pF->nXaRight, pF->nYaBottom);
SvxMSDffImportData aData( aRect );
@@ -2562,7 +2554,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
aFlySet.Put( aFollowTextFlow );
}
-
// #i21847#
// Some shapes are set to *hidden*, don't import those ones.
if (pRecord->bHidden)
@@ -2829,7 +2820,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
{
// The Text is not read into SdrTextObj! Rather insert a frame and
// insert the text from nStartCp to nEndCp.
- //
+
// More attributes can be used in a frame compared to the
// Edit-Engine, and it can contain field, OLEs or graphics...
Rectangle aInnerDist(pRecord->nDxTextLeft, pRecord->nDyTextTop,
@@ -2842,7 +2833,6 @@ SwFlyFrmFmt* SwWW8ImplReader::ConvertDrawTextToFly(SdrObject* &rpObject,
MatchSdrItemsIntoFlySet( rpObject, rFlySet, pRecord->eLineStyle,
pRecord->eLineDashing, pRecord->eShapeType, aInnerDist );
-
SdrTextObj *pSdrTextObj = PTR_CAST(SdrTextObj, rpObject);
if (pSdrTextObj && pSdrTextObj->IsVerticalWriting())
rFlySet.Put(SvxFrameDirectionItem(FRMDIR_VERT_TOP_RIGHT, RES_FRAMEDIR));
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index dbdfd7916c6e..b56df4c10638 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <iterator>
#include <hintids.hxx>
#include <svl/urihelper.hxx>
@@ -379,7 +378,6 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
return pFlyFmt;
}
-
// MakeGrafInCntnt fuegt zeichengebundene Grafiken ein
SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
const WW8PicDesc& rPD, const Graphic* pGraph, const OUString& rFileName,
@@ -491,7 +489,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
{
// Soeben haben wir einen Grafik-Link ins Doc inserted.
// Wir muessen ihn jetzt noch Positioniern und Skalieren.
- //
+
WW8PicDesc aPD( aPic );
WW8FlySet aFlySet( *this, pPaM, aPic, aPD.nWidth, aPD.nHeight );
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8e715c5a0699..dc20084dd647 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -271,7 +271,6 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
sal_uInt8 aGuid[16];
sal_uInt32 nFlags(0);
-
rStrm.Read(aGuid, 16);
rStrm.SeekRel( 4 );
rStrm.ReadUInt32( nFlags );
@@ -642,7 +641,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
maShapeRecords.Current()->nRecLen,
pImpRec->pClientDataBuffer, pImpRec->nClientDataLen );
-
// process user (== Winword) defined parameters in 0xF122 record
// #i84783# - set special value to determine, if property is provided or not.
pImpRec->nLayoutInTableCell = 0xFFFFFFFF;
@@ -1835,9 +1833,7 @@ void SwWW8ImplReader::ImportDop()
xDocuProps->setPrintDate(uDT);
}
- //
// COMPATIBILITY FLAGS START
- //
// #i78951# - remember the unknown compatability options
// so as to export them out
@@ -1919,9 +1915,7 @@ void SwWW8ImplReader::ImportDop()
rDoc.set(IDocumentSettingAccess::TAB_OVER_MARGIN, true);
rDoc.set(IDocumentSettingAccess::SURROUND_TEXT_WRAP_SMALL, true);
- //
// COMPATIBILITY FLAGS END
- //
// Import magic doptypography information, if its there
if (pWwFib->nFib > 105)
@@ -2037,7 +2031,6 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr ,WW8_CP nStartCp) :
pRdr->pTableDesc = 0;
pRdr->nAktColl = 0;
-
pRdr->pCtrlStck = new SwWW8FltControlStack(&pRdr->rDoc, pRdr->nFieldFlags,
*pRdr);
@@ -2611,18 +2604,18 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
// All other sprms then refer to that APO and not to the normal text
// surrounding it.
// The same holds true for a Table (sprm 24 (0x2416)) and Anls (sprm 13).
-//
+
// WW: Table in APO is possible (Both Start-Ends occur at the same time)
// WW: APO in Table not possible
-//
+
// This mean that of a Table is the content of a APO, the APO start needs
// to be edited first, so that the Table remains in the APO and not the
// other way around.
// At the End, however, we need to edit the Table End first as the APO
// must end after that Table (or else we never find the APO End).
-//
+
// The same holds true for Fly / Anl, Tab / Anl, Fly / Tab / Anl.
-//
+
// If the Table is within an APO the TabRowEnd Area misses the
// APO settings.
// To not end the APO there, we do not call ProcessApo
@@ -3186,24 +3179,24 @@ namespace
// Microsoft Word basically categorizes text into East Asian, Complex, ASCII,
// NonEastAsian/HighAnsi, with some shared characters and some properties to
// hint as to which way to bias those shared characters.
-//
+
// That's four categories, we however have three categories. Given that problem
// here we would ideally find out "what would word do" to see what font/language
// word would assign to characters based on the unicode range they fall into and
// hack the word one onto the range we use. However it's unclear what word's
// categorization is. So we don't do that here yet.
-//
+
// Additional to the categorization, when word encounters weak text for ambigious
// chars it uses idcthint to indicate which way to bias. We don't have a idcthint
// feature in writer.
-//
+
// So what we currently do here then is to split our text into non-weak/weak
// sections and uses word's idcthint to determine what font it would use and
// force that on for the segment. Following what we *do* know about word's
// categorization, we know that the range 0x0020 and 0x007F is sprmCRgFtc0 in
// word, something we map to LATIN, so we consider all weaks chars in that range
// to auto-bias to LATIN.
-//
+
// See https://bugs.libreoffice.org/show_bug.cgi?id=34319 for an example
//
// TO-DO: revisit this after the fix of #i119612# which retains the
@@ -3827,8 +3820,8 @@ bool SwWW8ImplReader::IsParaEndInCPs(sal_Int32 nStart, sal_Int32 nEnd,bool bSdOD
for (cp_vector::const_reverse_iterator aItr = maEndParaPos.rbegin(); aItr!= maEndParaPos.rend(); ++aItr)
{
//Revised 2012.8.16,to the 0x0D,the attribute will have two situations
- //*********within***********exact******//
- //*********but also sample with only left and the position of 0x0d is the edge of the right side***********//
+ //*********within***********exact******
+ //*********but also sample with only left and the position of 0x0d is the edge of the right side***********
if ( bSdOD && ( (nStart < *aItr && nEnd > *aItr) || ( nStart == nEnd && *aItr == nStart)) )
return true;
else if ( !bSdOD && (nStart < *aItr && nEnd >= *aItr) )
@@ -4220,7 +4213,6 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
if(mrReader.pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
mrReader.GrafikCtor();
-
if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager)
{
Rectangle aRect(0, 0, 100, 100); // A dummy, we don't care about the size
@@ -5643,7 +5635,6 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& rPaM ,WW8Glossary *pGlos
aDecryptMain.Write(pIn, nUnencryptedHdr);
delete [] pIn;
-
pTempTable = MakeTemp(aDecryptTable);
DecryptRC4(aCtx, *pTableStream, aDecryptTable);
pTableStream = &aDecryptTable;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index ba6ec2325c7a..cbb85631e152 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -134,9 +134,7 @@ using namespace msfilter::util;
// Zusatz-Filter-Flags, gueltig ab Winword 8
#define WW8FL_NO_FLY_FOR_TXBX 1
-//-----------------------------------------
// Listen-Manager (ab Ver8)
-//-----------------------------------------
struct WW8LFOInfo;
@@ -320,9 +318,8 @@ public:
rtl_TextEncoding GetCJKCharSet() const;
};
-//-----------------------------------------
// Stack
-//-----------------------------------------
+
class SwWW8FltControlStack : public SwFltControlStack
{
private:
@@ -470,7 +467,6 @@ template< typename ReturnType, typename Type >
inline ReturnType ulimit_cast( Type nValue, ReturnType nMax )
{ return static_cast< ReturnType >( ::std::min< Type >( nValue, nMax ) ); }
-
template< typename ReturnType, typename Type >
inline ReturnType ulimit_cast( Type nValue )
{ return ulimit_cast( nValue, ::std::numeric_limits< ReturnType >::max() ); }
@@ -552,10 +548,8 @@ class WW8FieldEntry
::sw::mark::IFieldmark::parameter_map_t& getParameters();
};
-
-//-----------------------------------------
// Mini-Merker fuer einige Flags
-//-----------------------------------------
+
class WW8ReaderSave
{
private:
@@ -606,10 +600,8 @@ private:
void SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex);
};
-
-//-----------------------------------------
// Formulas
-//-----------------------------------------
+
enum SwWw8ControlType
{
WW8_CT_EDIT,
@@ -761,7 +753,6 @@ protected:
virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rObjData, void* pData, Rectangle& rTextRect, SdrObject* pObj );
};
-
class wwSection
{
public:
@@ -881,12 +872,12 @@ public:
//Various writer elements like frames start off containing a blank paragraph,
//sometimes this paragraph turns out to be extraneous, e.g. the frame should
//only contain a table with no trailing paragraph.
-//
+
//We want to remove these extra paragraphs, but removing them during the parse
//is problematic, because we don't want to remove any paragraphs that are still
//addressed by property entries in a SwFltControlStack which have not yet been
//committed to the document.
-//
+
//Safest thing is to not delete SwTxtNodes from a document during import, and
//remove these extraneous paragraphs at the end after all SwFltControlStack are
//destroyed.
@@ -1037,9 +1028,8 @@ struct WW8TabBandDesc
enum wwDIR {wwTOP = 0, wwLEFT = 1, wwBOTTOM = 2, wwRIGHT = 3};
};
-//-----------------------------------------
// Storage-Reader
-//-----------------------------------------
+
typedef std::set<WW8_CP> cp_set;
typedef std::vector<WW8_CP> cp_vector;
@@ -1272,11 +1262,9 @@ private:
sal_Unicode cSymbol; // aktuell einzulesendes Symbolzeichen
-
sal_uInt8 nWantedVersion; // urspruenglich vom Writer
// angeforderte WW-Doc-Version
-
sal_uInt8 nSwNumLevel; // LevelNummer fuer Outline / Nummerierung
sal_uInt8 nWwNumType; // Gliederung / Nummerg / Aufzaehlg
sal_uInt8 nListLevel;
@@ -1357,7 +1345,6 @@ private:
cp_vector maEndParaPos;
WW8_CP maCurrAttrCP;
bool mbOnLoadingMain:1;
-//---------------------------------------------
const SprmReadInfo& GetSprmReadInfo(sal_uInt16 nId) const;
@@ -1535,7 +1522,7 @@ private:
// Nummerierungen / Aufzaehlungen ( Autonumbered List Data Descriptor )
// Liste: ANLD ( Autonumbered List Data Descriptor )
// eine Ebene: ANLV ( Autonumber Level Descriptor )
-//
+
// Chg7-8:
// Listen sind in WW8 eigene Strukturen, die ueber folgende drei Tabellen
// verwaltet werden: rglst, hpllfo und hsttbListNames
@@ -1769,7 +1756,6 @@ public: // eigentlich private, geht aber leider nur public
// change properties of content (e.g. char formatting)
void Read_CPropRMark(sal_uInt16 , const sal_uInt8* pData, short nLen); // complex!
-
void Read_TabRowEnd( sal_uInt16, const sal_uInt8* pData, short nLen );
void Read_TabCellEnd( sal_uInt16, const sal_uInt8* pData, short nLen );
bool ParseTabPos(WW8_TablePos *aTabPos, WW8PLCFx_Cp_FKP* pPap);
@@ -1860,7 +1846,6 @@ public: // eigentlich private, geht aber leider nur public
eF_ResT Read_F_Shape(WW8FieldDesc* pF, OUString& rStr);
eF_ResT Read_F_HTMLControl( WW8FieldDesc* pF, OUString& rStr);
-
void DeleteFormImpl();
short ImportSprm( const sal_uInt8* pPos, sal_uInt16 nId = 0 );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ef260cbefbfc..c5ac5b875b9a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -476,7 +476,6 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
This sort of mindbending inconsistency is surely why frames are deprecated
in word 97 onwards and hidden away from the user
-
#i1532# & #i5379#
If we are already a table in a frame then we must grab the para properties
to see if we are still in that frame.
@@ -555,10 +554,8 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
return aRet;
}
-
// helper methods for outline, numbering and bullets
-
static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, sal_uInt8 nSwLevel )
{
static const SvxExtNumType eNumA[8] = { SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
@@ -701,7 +698,6 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD* pAD, sal_uInt8 nSwLeve
pNumR->Set(nSwLevel, aNF);
}
-
// chapter numbering and bullets
// Chapter numbering happens in the style definition.
@@ -808,10 +804,8 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
}
}
-
// Numbering / Bullets
-
// SetNumOlst() carries the Numrules for this cell to SwNumFmt.
// For this the info is fetched from OLST and not from ANLD ( see later )
// ( only for outline inside text; Bullets / numbering use ANLDs )
@@ -2516,9 +2510,9 @@ void WW8TabDesc::MergeCells()
for( short i = 0; i < pActBand->nWwCols; i++ )
{
WW8SelBoxInfo* pActMGroup = 0;
- //
+
// start a new merge group if appropriate
- //
+
OSL_ENSURE(nRow < (sal_uInt16)pTabLines->size(),
"Too few lines, table ended early");
if (nRow >= (sal_uInt16)pTabLines->size())
@@ -2569,7 +2563,6 @@ void WW8TabDesc::MergeCells()
}
}
-
if (bMerge)
{
short nX1 = pActBand->nCenter[ i ];
@@ -2709,14 +2702,13 @@ void WW8TabDesc::FinishSwTable()
}
}
-
// browse aMergeGroups, detect the index of the first fitting group or -1 otherwise
-//
+
// Parameter: nXcenter = center position of asking box
// nWidth = width of asking box
// bExact = flag, if box has to fit into group
// or only has to touch
-//
+
WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
{
if( !aMergeGroups.empty() )
@@ -2740,16 +2732,16 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
nGrX1 = rActGroup.nGroupXStart - nToleranz;
nGrX2 = rActGroup.nGroupXStart
+rActGroup.nGroupWidth + nToleranz;
- //
+
// If box fits report success
- //
+
if( ( nX1 > nGrX1 ) && ( nX2 < nGrX2 ) )
{
return &rActGroup;
}
- //
+
// does the box share areas with the group?
- //
+
if( !bExact )
{
// successful if nX1 *or* nX2 are inside the group
@@ -2932,7 +2924,6 @@ void WW8TabDesc::SetTabBorders(SwTableBox* pBox, short nWwIdx)
if( nWwIdx < 0 || nWwIdx >= pActBand->nWwCols )
return; // faked cells -> no border
-
SvxBoxItem aFmtBox( RES_BOX );
if (pActBand->pTCs) // neither Cell Border nor Default Border defined ?
{
@@ -3547,10 +3538,8 @@ const SwFmt* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
return pRet;
}
-
// class WW8RStyle
-
const sal_uInt8* WW8RStyle::HasParaSprm( sal_uInt16 nId ) const
{
if( !pParaSprms || !nSprmsLen )
@@ -3834,7 +3823,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
return;
rSI.bImported = true; // set flag now to avoid endless loops
- //
+
// valid and not NUL and not yet imported
if( rSI.nBase < cstd && !pIo->vColl[rSI.nBase].bImported )
@@ -4427,7 +4416,7 @@ void WW8RStyle::Import()
// via WW-UI so this does not matter.
// This could be done by:
// if( bNew ) rDoc.SetDefault( pDefCharFmt->GetAttrSet() );
- //
+
// for e.g. tables an always valid Std-Style is necessary
if( pIo->StyleExists(0) && !pIo->vColl.empty() &&
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index e44b01344c92..713eccfeea24 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -44,7 +44,6 @@ private:
SfxItemSet aChrSet,aParSet;
};
-
struct WW8SwFlyPara
{
SwFlyFrmFmt* pFlyFmt;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index ec596336fcb9..69af98e27301 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svl/itemiter.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
@@ -88,10 +87,8 @@ using namespace sw::util;
using namespace sw::types;
using namespace sw::mark;
-
// UNO-Controls
-
//cmc, OCX i.e. word 97 form controls
eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& )
{
@@ -317,14 +314,11 @@ void SwWW8ImplReader::DeleteFormImpl()
delete pFormImpl, pFormImpl = 0;
}
-
// WW8ListManager oeffentliche Methoden stehen ganz am Ende
//------------------------- ============ --------------- ============ --------
+// Hilfs-Deklarationen
-
-// Hilfs-Deklarationen ///////////////////////////////////////////////////////
-//
// Style Id's for each level
typedef sal_uInt16 WW8aIdSty[WW8ListManager::nMaxLevel];
// Zeichenattribute aus GrpprlChpx
@@ -393,8 +387,8 @@ struct WW8LFOLVL
nStartAt(1), nLevel(0), bStartAt(1), bFormat(0) {}
};
-// in den ListenInfos zu speichernde Daten ///////////////////////////////////
-//
+// in den ListenInfos zu speichernde Daten
+
struct WW8LSTInfo // sortiert nach nIdLst (in WW8 verwendete Listen-Id)
{
std::vector<ww::bytes> maParaSprms;
@@ -419,8 +413,8 @@ struct WW8LSTInfo // sortiert nach nIdLst (in WW8 verwendete Listen-Id)
};
-// in den ListenFormatOverrideInfos zu speichernde Daten /////////////////////
-//
+// in den ListenFormatOverrideInfos zu speichernde Daten
+
struct WW8LFOInfo // unsortiert, d.h. Reihenfolge genau wie im WW8 Stream
{
std::vector<ww::bytes> maParaSprms;
@@ -458,10 +452,7 @@ WW8LFOInfo::WW8LFOInfo(const WW8LFO& rLFO)
{
}
-
-
-// Hilfs-Methoden ////////////////////////////////////////////////////////////
-//
+// Hilfs-Methoden
// finden der Sprm-Parameter-Daten, falls Sprm im Grpprl enthalten
sal_uInt8* WW8ListManager::GrpprlHasSprm(sal_uInt16 nId, sal_uInt8& rSprms,
@@ -518,9 +509,9 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
OUString sPrefix;
OUString sPostfix;
WW8LVL aLVL;
- //
+
// 1. LVLF einlesen
- //
+
memset(&aLVL, 0, sizeof( aLVL ));
rSt.ReadInt32( aLVL.nStartAt );
rSt.ReadUChar( aLVL.nNFC );
@@ -554,9 +545,8 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
rSt.SeekRel( 2 );
if( 0 != rSt.GetError()) return false;
- //
// 2. ggfs. PAPx einlesen und nach Einzug-Werten suchen
- //
+
short nTabPos = 0; // #i86652# - read tab setting
if( aLVL.nLenGrpprlPapx )
{
@@ -651,9 +641,9 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
}
}
}
- //
+
// 3. ggfs. CHPx einlesen und
- //
+
sal_uInt16 nWitchPicIsBullet = USHRT_MAX;
bool bIsPicBullet = false;
@@ -710,14 +700,13 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
rReader.SetToggleAttrFlags(nOldFlags1);
rReader.SetToggleBiDiAttrFlags(nOldFlags2);
}
- //
+
// 4. den Nummerierungsstring einlesen: ergibt Prefix und Postfix
- //
+
OUString sNumString(read_uInt16_PascalString(rSt));
- //
// 5. gelesene Werte in Writer Syntax umwandeln
- //
+
if( 0 <= aLVL.nStartAt )
nStartNo = (sal_uInt16)aLVL.nStartAt;
@@ -1031,9 +1020,8 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
// merken
rCharFmt[ nLevel ] = pFmt;
- //
// Style an das NumFormat haengen
- //
+
aNumFmt.SetCharFmt( pFmt );
}
//Ensure the default char fmt is initialized for any level of num ruler if no customized attr
@@ -1051,9 +1039,9 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
aNumFmt.SetCharFmt( pFmt );
}
}
- //
+
// ggfs. Bullet Font an das NumFormat haengen
- //
+
if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
{
SwCharFmt* pFmt = aNumFmt.GetCharFmt();
@@ -1073,9 +1061,9 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
}
aNumFmt.SetBulletFont( &aFont );
}
- //
+
// und wieder rein in die NumRule
- //
+
rNumRule.Set(nLevel, aNumFmt);
}
@@ -1101,8 +1089,8 @@ SwNumRule* WW8ListManager::GetNumRule(size_t i)
return 0;
}
-// oeffentliche Methoden /////////////////////////////////////////////////////
-//
+// oeffentliche Methoden
+
WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
: maSprmParser(rReader_.GetFib().GetFIBVersion()), rReader(rReader_),
rDoc(rReader.GetDoc()), rFib(rReader.GetFib()), rSt(rSt_),
@@ -1119,9 +1107,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
nLastLFOPosition = USHRT_MAX;
long nOriginalPos = rSt.Tell();
- //
+
// 1. PLCF LST auslesen und die Listen Vorlagen im Writer anlegen
- //
+
bool bOk = checkSeek(rSt, rFib.fcPlcfLst);
if (!bOk)
@@ -1137,9 +1125,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
if (!bOk)
return;
- //
// 1.1 alle LST einlesen
- //
+
for (sal_uInt16 nList=0; nList < nListCount; ++nList)
{
if (nRemainingPlcfLst < cbLSTF)
@@ -1148,9 +1135,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
WW8LST aLST;
memset(&aLST, 0, sizeof( aLST ));
- //
// 1.1.1 Daten einlesen
- //
+
rSt.ReadUInt32( aLST.nIdLst );
rSt.ReadUInt32( aLST.nTplC );
for (sal_uInt16 nLevel = 0; nLevel < nMaxLevel; ++nLevel)
@@ -1191,18 +1177,17 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
nRemainingPlcfLst -= cbLSTF;
}
- //
// 1.2 alle LVL aller aLST einlesen
- //
+
sal_uInt16 nLSTInfos = static_cast< sal_uInt16 >(maLSTInfos.size());
for (sal_uInt16 nList = 0; nList < nLSTInfos; ++nList)
{
WW8LSTInfo* pListInfo = maLSTInfos[nList];
if( !pListInfo || !pListInfo->pNumRule ) break;
SwNumRule& rMyNumRule = *pListInfo->pNumRule;
- //
+
// 1.2.1 betreffende(n) LVL(s) fuer diese aLST einlesen
- //
+
sal_uInt16 nLvlCount = static_cast< sal_uInt16 >(pListInfo->bSimpleList ? nMinLevel : nMaxLevel);
std::deque<bool> aNotReallyThere;
aNotReallyThere.resize(nMaxLevel);
@@ -1221,26 +1206,25 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
}
if( !bLVLOk )
break;
- //
+
// 1.2.2 die ItemPools mit den CHPx Einstellungen der verschiedenen
// Level miteinander vergleichen und ggfs. Style(s) erzeugen
- //
+
for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
{
bool bDummy;
AdjustLVL( nLevel, rMyNumRule, pListInfo->aItemSet,
pListInfo->aCharFmt, bDummy );
}
- //
+
// 1.2.3 ItemPools leeren und loeschen
- //
+
for (sal_uInt8 nLevel = 0; nLevel < nLvlCount; ++nLevel)
delete pListInfo->aItemSet[ nLevel ];
}
- //
// 2. PLF LFO auslesen und speichern
- //
+
bOk = checkSeek(rSt, rFib.fcPlfLfo);
if (!bOk)
@@ -1253,9 +1237,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
if (!bOk)
return;
- //
// 2.1 alle LFO einlesen
- //
+
for (sal_uInt16 nLfo = 0; nLfo < nLfoCount; ++nLfo)
{
bOk = false;
@@ -1301,9 +1284,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
if( bOk )
{
- //
+
// 2.2 fuer alle LFO die zugehoerigen LFOLVL einlesen
- //
+
size_t nLFOInfos = pLFOInfos.size();
for (size_t nLfo = 0; nLfo < nLFOInfos; ++nLfo)
{
@@ -1315,9 +1298,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
WW8LSTInfo* pParentListInfo = GetLSTByListId(rLFOInfo.nIdLst);
if (!pParentListInfo)
break;
- //
+
// 2.2.1 eine neue NumRule fuer diese Liste anlegen
- //
+
SwNumRule* pParentNumRule = rLFOInfo.pNumRule;
OSL_ENSURE(pParentNumRule, "ww: Impossible lists, please report");
if( !pParentNumRule )
@@ -1327,7 +1310,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
const OUString sPrefix("WW8NumSt" + OUString::number( nLfo + 1 ));
// jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!!
// (bis dahin war hier die Parent NumRule vermerkt )
- //
+
// Dazu erst mal nachsehen, ob ein Style diesen LFO
// referenziert:
if( USHRT_MAX > rReader.StyleUsingLFO( nLfo ) )
@@ -1344,10 +1327,10 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
rLFOInfo.pNumRule = rDoc.GetNumRuleTbl()[ nRul ];
rLFOInfo.pNumRule->SetAutoRule(true); // = default
}
- //
+
// 2.2.2 alle LFOLVL (und ggfs. LVL) fuer die neue NumRule
// einlesen
- //
+
WW8aISet aItemSet; // Zeichenattribute aus GrpprlChpx
WW8aCFmt aCharFmt; // Zeichen Style Pointer
memset(&aItemSet, 0, sizeof( aItemSet ));
@@ -1375,9 +1358,8 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
WW8LFOLVL aLFOLVL;
bLVLOk = false;
- //
// 2.2.2.1 den LFOLVL einlesen
- //
+
rSt.ReadInt32( aLFOLVL.nStartAt );
sal_uInt8 aBits1(0);
rSt.ReadUChar( aBits1 );
@@ -1400,9 +1382,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
aLFOLVL.bStartAt = true;
else
aLFOLVL.bStartAt = false;
- //
+
// 2.2.2.2 eventuell auch den zugehoerigen LVL einlesen
- //
+
SwNumFmt aNumFmt(
rLFOInfo.pNumRule->Get(aLFOLVL.nLevel));
if (aBits1 & 0x20)
@@ -1424,9 +1406,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
aNumFmt.SetStart(
writer_cast<sal_uInt16>(aLFOLVL.nStartAt));
}
- //
+
// 2.2.2.3 das NumFmt in die NumRule aufnehmen
- //
+
rLFOInfo.pNumRule->Set(aLFOLVL.nLevel, aNumFmt);
}
bLVLOk = true;
@@ -1436,9 +1418,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
}
if( !bLVLOk )
break;
- //
+
// 2.2.3 die LVL der neuen NumRule anpassen
- //
+
sal_uInt16 aFlagsNewCharFmt = 0;
bool bNewCharFmtCreated = false;
for (sal_uInt8 nLevel = 0; nLevel < rLFOInfo.nLfoLvl; ++nLevel)
@@ -1448,9 +1430,9 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
if( bNewCharFmtCreated )
aFlagsNewCharFmt += (1 << nLevel);
}
- //
+
// 2.2.4 ItemPools leeren und loeschen
- //
+
for (sal_uInt8 nLevel = 0; nLevel < rLFOInfo.nLfoLvl; ++nLevel)
delete aItemSet[ nLevel ];
bOk = true;
@@ -1639,7 +1621,6 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
return pRet;
}
-
// SwWW8ImplReader: anhaengen einer Liste an einen Style oder Absatz
bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
@@ -2087,10 +2068,8 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
}
}
-
// ------------------------- Reading Controls ------------------------
-
bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
WW8_CP nStart, SwWw8ControlType nWhich )
{
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index a71732c9a7b8..04e72c34c073 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -165,7 +165,6 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
rWMF.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-
// MetaFile auf neue Groesse skalieren und
// neue Groesse am MetaFile setzen
Size aOldSiz( rWMF.GetPrefSize() );
@@ -353,7 +352,6 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
-
if (pGrf)
{
rGraph = *pGrf;
@@ -380,7 +378,6 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
}
} // StorageStreams wieder zu
-
Rectangle aRect(0, 0, nX, nY);
if (pFlySet)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 4c92ef1f324e..f085353f0b27 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -91,10 +91,8 @@ using namespace sw::mark;
using namespace std; // #i24377#
using namespace nsSwDocInfoSubType;
-
// Bookmarks
-
namespace
{
// #120879# - helper method to identify a bookmark name to match the internal TOC bookmark naming convention
@@ -218,10 +216,8 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
return 0;
}
-
// general help methods to separate parameters
-
/// translate FieldParameter names into the system character set and
/// at the same time, douple backslashes are converted into single ones
OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg)
@@ -317,7 +313,6 @@ OUString FindPara( const OUString& rStr, sal_Unicode cToken, sal_Unicode cToken2
return rStr.copy( n, n2-n );
}
-
static SvxExtNumType GetNumTypeFromName(const OUString& rStr,
bool bAllowPageDesc = false)
{
@@ -452,7 +447,6 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
return nNumFmtType;
}
-
// Felder
// Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
@@ -683,7 +677,6 @@ void WW8FieldEntry::SetBookmarkCode(OUString bookmarkCode)
msMarkCode = bookmarkCode;
}
-
::sw::mark::IFieldmark::parameter_map_t& WW8FieldEntry::getParameters()
{
return maParams;
@@ -755,10 +748,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
&SwWW8ImplReader::Read_F_ANumber, // 54
0,
-
0, // 56
-
&SwWW8ImplReader::Read_F_Symbol, // 57
&SwWW8ImplReader::Read_F_Embedd, // 58
&SwWW8ImplReader::Read_F_DBField, // 59
@@ -956,10 +947,8 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
}
}
-
// Felder Taggen
-
// MakeTagString() gibt als Returnwert die Position des ersten
// CR / Zeilenende / Seitenumbruch in pText und wandelt auch nur bis dort
// Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert.
@@ -1069,7 +1058,6 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
nL = pSBase->WW8ReadString( *pStrm, sFTxt,
pPlcxMan->GetCpOfs() + nStart, nL, eStructCharSet);
-
OUString aTagText;
MakeTagString( aTagText, sFTxt );
InsertTagField( pF->nId, aTagText );
@@ -1078,10 +1066,8 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
return pF->nLen;
}
-
// normal fields
-
eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
{
OUString aDef;
@@ -2650,10 +2636,8 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
}
}
-
// "table of ..." fields
-
static void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/,
SwDoc& rDoc,
SwTOXBase& rBase,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 15f5094b8aec..7815f3681b8c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -21,7 +21,6 @@
#include <svl/itemiter.hxx>
#include <rtl/tencinfo.h>
-
#include <hintids.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/wrlmitem.hxx>
@@ -105,18 +104,14 @@ using namespace sw::types;
using namespace ::com::sun::star;
using namespace nsHdFtFlags;
-
// diverses
-
#define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm
#define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm
-
static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPap,
const WW8RStyle* pSty = 0, const WW8PLCFx_SEPX* pSep = 0);
-
ColorData SwWW8ImplReader::GetCol(sal_uInt8 nIco)
{
static const ColorData eSwWW8ColA[] =
@@ -1194,10 +1189,8 @@ void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc,
}
}
-
// Hilfsroutinen fuer Grafiken und Apos und Tabellen
-
static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const sal_uInt8* pS)
{
if( pS )
@@ -1387,7 +1380,6 @@ bool SwWW8ImplReader::SetBorder(SvxBoxItem& rBox, const WW8_BRC* pbrc,
return bChange;
}
-
bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray,
const WW8_BRC& aRightBrc) const
{
@@ -1431,7 +1423,6 @@ void SwWW8ImplReader::GetBorderDistance(const WW8_BRC* pbrc,
}
}
-
bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet& rFlySet,
const WW8_BRC *pbrc, short *pSizeArray) const
{
@@ -1454,7 +1445,6 @@ bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet& rFlySet,
return bShadowed;
}
-
// APOs
// fuer Berechnung der minimalen FrameSize
@@ -1657,7 +1647,6 @@ void WW8FlyPara::ReadFull(sal_uInt8 nOrigSp29, SwWW8ImplReader* pIo)
}while( false ); // Block zum rausspringen
}
-
// Read fuer Apo-Defs in Styledefs
void WW8FlyPara::Read(sal_uInt8 nOrigSp29, WW8RStyle* pStyle)
{
@@ -2203,7 +2192,7 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
if (aIdx == aEnd && pNd && pNd->GetTxt().isEmpty())
{
//An extra pre-created by writer unused paragraph
- //
+
//delete after import is complete rather than now
//to avoid the complication of managing uncommitted
//ctrlstack properties that refer to it.
@@ -3197,7 +3186,6 @@ void SwWW8ImplReader::Read_Underline( sal_uInt16, const sal_uInt8* pData, short
// 6 = thick, 7 = dash, 8 = dot(not used)
// 9 = dotdash 10 = dotdotdash 11 = wave
-
// pruefe auf Sonderfall "fett+unterstrichen"
bool bAlsoBold = /*( 6 == b )*/ false;
// erst mal ggfs. *bold* einschalten!
@@ -3672,8 +3660,6 @@ void SwWW8ImplReader::Read_FontSize( sal_uInt16 nId, const sal_uInt8* pData, sho
}
}
-
-
void SwWW8ImplReader::Read_CharSet(sal_uInt16 , const sal_uInt8* pData, short nLen)
{
if( nLen < 0 )
@@ -3749,7 +3735,6 @@ void SwWW8ImplReader::Read_CColl( sal_uInt16, const sal_uInt8* pData, short nLen
nCharFmt = (short) nId;
}
-
/*
enger oder weiter als normal:
*/
@@ -3842,7 +3827,6 @@ void SwWW8ImplReader::Read_CharHighlight(sal_uInt16, const sal_uInt8* pData, sho
}
}
-
/***************************************************************************
# Absatz - Attribute
#**************************************************************************/
@@ -4056,7 +4040,7 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short
// 0.2*Zeilenabstand "nach".
// Bei "Mindestens" sind es 1*Zeilenabstand "vor" und 0*Zeilenabstand "nach".
// Bei Mehrfach sind es 0 "vor" und min( 0cm, FontSize*(nFach-1) ) "nach".
-//
+
// SW hat auch einen impliziten Zeilenabstand. er betraegt bei "mindestens"
// 1*Zeilenabstand "vor" und 0 "nach"
// bei proportional betraegt er min( 0cm, FontSize*(nFach-1) ) sowohl "vor"
@@ -4572,7 +4556,6 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex)
975 // 61 [available in DOC, not available in DOCX]
};// 62
-
//NO auto for shading so Foreground: Auto = Black
if (nFore == COL_AUTO)
nFore = COL_BLACK;
@@ -4582,7 +4565,6 @@ void SwWW8Shade::SetShade(ColorData nFore, ColorData nBack, sal_uInt16 nIndex)
if (nUseBack == COL_AUTO)
nUseBack = COL_WHITE;
-
if( nIndex >= sizeof( eMSGrayScale ) / sizeof ( eMSGrayScale[ 0 ] ) )
nIndex = 0;
@@ -4789,7 +4771,6 @@ void SwWW8ImplReader::Read_CharBorder(sal_uInt16 /*nId*/, const sal_uInt8* pData
}
}
-
}
void SwWW8ImplReader::Read_Hyphenation( sal_uInt16, const sal_uInt8* pData, short nLen )
@@ -4961,7 +4942,6 @@ bool SwWW8ImplReader::ParseTabPos(WW8_TablePos *pTabPos, WW8PLCFx_Cp_FKP* pPap)
# ( ausser OLST )
#**************************************************************************/
-
long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes)
{
/*************************************************************************
@@ -6143,10 +6123,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
return &aSprmSrch;
}
-
// Hilfsroutinen : SPRM finden
-
const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const
{
ww::WordVersion eVersion = pWwFib->GetFIBVersion();
@@ -6171,7 +6149,6 @@ const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const
return *pFound;
}
-
// Hilfsroutinen : SPRMs
void SwWW8ImplReader::EndSprm( sal_uInt16 nId )
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 743eec85b73d..617f21d2306d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -260,7 +260,6 @@ const wwSprmSearcher *wwSprmParser::GetWW2SprmSearcher()
return &aSprmSrch;
};
-
const wwSprmSearcher *wwSprmParser::GetWW6SprmSearcher()
{
//double lock me
@@ -1034,10 +1033,10 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
if( nSprmListIdx )
{
// process Sprm Id Matching as explained in MS Documentation
- //
+
// ''Property Modifier(variant 1) (PRM)''
// see file: s62f39.htm
- //
+
// Since isprm is 7 bits, rgsprmPrm can hold 0x80 entries.
static const sal_uInt16 aSprmId[0x80] =
{
@@ -1219,7 +1218,6 @@ WW8_FC WW8PLCFx_PCD::AktPieceStartCp2Fc( WW8_CP nCp )
return nFC + (nCp - nCpStart) * (bIsUnicode ? 2 : 1);
}
-
void WW8PLCFx_PCD::AktPieceFc2Cp( WW8_CP& rStartPos, WW8_CP& rEndPos,
const WW8ScannerBase *pSBase )
{
@@ -1786,7 +1784,6 @@ static bool WW8SkipField(WW8PLCFspecial& rPLCF)
if( !rPLCF.Get( nP, pData ) )
return false;
-
while((((sal_uInt8*)pData)[0] & 0x1f ) == 0x13 )
{
// still new (nested) beginnings ?
@@ -2373,7 +2370,6 @@ sal_Int32 WW8PLCFpcd_Iter::Where() const
return rPLCF.pPLCF_PosArray[nIdx];
}
-
bool WW8PLCFx_Fc_FKP::WW8Fkp::Entry::operator<
(const WW8PLCFx_Fc_FKP::WW8Fkp::Entry& rSecond) const
{
@@ -2756,7 +2752,6 @@ bool WW8PLCFx_Fc_FKP::WW8Fkp::HasSprm(sal_uInt16 nId,
return !rResult.empty();
}
-
void WW8PLCFx::GetSprms( WW8PLCFxDesc* p )
{
OSL_ENSURE( !this, "Called wrong GetSprms" );
@@ -2796,7 +2791,6 @@ public:
{return mnPo == pFkp->GetFilePos();}
};
-
bool WW8PLCFx_Fc_FKP::NewFkp()
{
WW8_CP nPLCFStart, nPLCFEnd;
@@ -3534,7 +3528,6 @@ const sal_uInt8* WW8PLCFx_SEPX::HasSprm( sal_uInt16 nId, sal_uInt8 n2nd ) const
return 0; // Sprm not found
}
-
WW8PLCFx_SubDoc::WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion,
WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt,
long nStruct)
@@ -5020,8 +5013,6 @@ void WW8PLCFxDesc::Restore( const WW8PLCFxSave1& rSave )
}
}
-
-
namespace
{
sal_uInt32 Readcb(SvStream& rSt, ww::WordVersion eVer)
@@ -5193,7 +5184,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
rSt.ReadUChar( envr );
rSt.ReadUChar( aVer8Bits1 ); // unter Ver67 nur leeres Reservefeld
// Inhalt von aVer8Bits1
- //
+
// sal_uInt8 fMac :1;
// sal_uInt8 fEmptySpecial :1;
// sal_uInt8 fLoadOverridePage :1;
@@ -5512,7 +5503,6 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion, sal_uInt32 nOffset)
}
}
-
WW8Fib::WW8Fib(sal_uInt8 nVer, bool bDot)
{
memset(this, 0, sizeof(*this));
@@ -6121,10 +6111,6 @@ WW8_STD* WW8Style::Read1Style( short& rSkip, OUString* pString, short* pcbStd )
return pStd;
}
-
-
-
-
struct WW8_FFN_Ver6 : public WW8_FFN_BASE
{
// ab Ver6
@@ -6421,13 +6407,8 @@ const WW8_FFN* WW8Fonts::GetFont( sal_uInt16 nNum ) const
return &pFontA[ nNum ];
}
-
-
-
-
-
// Suche zu einem Header / Footer den Index in der WW-Liste von Headern / Footern
-//
+
// Pferdefuesse bei WinWord6 und -7:
// 1) Am Anfang des Einlesens muss WWPLCF_HdFt mit Fib und Dop konstruiert werden
// 2) Der Haupttext muss sequentiell ueber alle Sections gelesen werden
@@ -6510,10 +6491,8 @@ void WW8PLCF_HdFt::UpdateIndex( sal_uInt8 grpfIhdt )
nIdxOffset++;
}
-
// WW8Dop
-
WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize) : bUseThaiLineBreakingRules(false)
{
memset( &nDataStart, 0, (&nDataEnd - &nDataStart) );
@@ -6582,7 +6561,6 @@ WW8Dop::WW8Dop(SvStream& rSt, sal_Int16 nFib, sal_Int32 nPos, sal_uInt32 nSize)
fLockRev = 0 != ( a8Bit & 0x40 );
fEmbedFonts = 0 != ( a8Bit & 0x80 );
-
a8Bit = Get_Byte( pData ); // 8 0x08
copts_fNoTabForInd = 0 != ( a8Bit & 0x01 );
copts_fNoSpaceRaiseLower = 0 != ( a8Bit & 0x02 );
@@ -7013,7 +6991,6 @@ bool WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
if( fEmbedFonts ) a8Bit |= 0x80;
Set_UInt8( pData, a8Bit );
-
a8Bit = 0; // 8 0x08
if( copts_fNoTabForInd ) a8Bit |= 0x01;
if( copts_fNoSpaceRaiseLower ) a8Bit |= 0x02;
@@ -7238,7 +7215,6 @@ sal_uInt16 WW8DopTypography::GetConvertedLang() const
return nLang;
}
-
// Sprms
sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index d83790bd727e..aecadb718195 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1251,7 +1251,6 @@ public:
sal_uInt32 lcbDop; // 0x154 count of bytes of document properties.
// cbDOP is 84 when nFib < 103
-
WW8_FC fcSttbfAssoc; // 0x158 offset to STTBF of associated strings. See STTBFASSOC.
sal_Int32 lcbSttbfAssoc; // 0x15C
@@ -1320,7 +1319,6 @@ public:
WW8_FC fcPlcfpgdEdn; // 0x1EA offset to PLCF of page boundaries in the endnote subdoc.
sal_Int32 lcbPlcfpgdEdn; // 0x1EE
-
WW8_FC fcDggInfo; // offset in table stream of the office art object table data.
// The format of office art object table data is found in a separate document.
// war in Ver67 nur leere Reserve
@@ -1488,7 +1486,7 @@ public:
*/
// Initialisier-Dummy:
sal_uInt8 nDataStart;
- //-------------------------
+
bool fFacingPages : 1; // 1 when facing pages should be printed
bool fWidowControl : 1; //a: orig 97 docs say
@@ -1500,9 +1498,9 @@ public:
sal_uInt16 grfSuppression : 2; // 0 Default line suppression storage; 0= form letter line suppression; 1= no line suppression; default=0
sal_uInt16 fpc : 2; // 1 footnote position code: 0 as endnotes, 1 at bottom of page, 2 immediately beneath text
sal_uInt16 : 1; // 0 unused
- //-------------------------
+
sal_uInt16 grpfIhdt : 8; // 0 specification of document headers and footers. See explanation under Headers and Footers topic.
- //-------------------------
+
sal_uInt16 rncFtn : 2; // 0 restart index for footnotes, 0 don't restart note numbering, 1 section, 2 page
sal_uInt16 nFtn : 14; // 1 initial footnote number for document
bool fOutlineDirtySave : 1; // when 1, indicates that information in the hPLCFpad should be refreshed since outline has been dirtied
@@ -1517,7 +1515,7 @@ public:
bool fRevMarking : 1; // when 1, Word will mark revisions as the document is edited
bool fBackup : 1; // always make backup when document saved when 1.
bool fExactCWords : 1;
- bool fPagHidden : 1; //
+ bool fPagHidden : 1;
bool fPagResults : 1;
bool fLockAtn : 1; // when 1, annotations are locked for editing
bool fMirrorMargins : 1; // swap margins on left/right pages when 1.
@@ -1547,7 +1545,7 @@ public:
bool copts_fExpShRtn : 1; // when 1, expand character spaces on the line ending SHIFT+RETURN // #i56856#
sal_Int16 dxaTab; // 720 twips - default tab width
- sal_uInt16 wSpare; //
+ sal_uInt16 wSpare;
sal_uInt16 dxaHotZ; // width of hyphenation hot zone measured in twips
sal_uInt16 cConsecHypLim; // number of lines allowed to have consecutive hyphens
sal_uInt16 wSpare2; // reserved
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index 603eaa23e2b4..52d68fc51a98 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -143,7 +143,6 @@ struct Word2CHPX
}
};
-
typedef sal_Int16 WW8_PN;
typedef sal_Int32 WW8_FC;
typedef sal_Int32 WW8_CP;
@@ -227,8 +226,6 @@ struct WW8_FFN : public WW8_FFN_BASE
// font does not exist on this system.
};
-
-
struct WW8_BRCVer6 // alter Border Code
{
SVBT16 aBits1;
@@ -331,16 +328,12 @@ struct WW8_DOGRID
short dxaGrid; // width of each grid square
short dyaGrid; // height of each grid square
-
-
/* a c h t u n g : es duerfen keine solchen Bitfelder ueber einen eingelesenes Byte-Array
gelegt werden!!
stattdessen ist ein aBits1 darueber zu legen, das mit & auszulesen ist
GRUND: Compiler auf Intel und Sparc sortieren die Bits unterschiedlich
*/
-
-
short dyGridDisplay:7; // the number of grid squares (in the y direction)
// between each gridline drawn on the screen. 0 means
// don't display any gridlines in the y direction.
@@ -460,7 +453,6 @@ struct WW8_TCell // hiermit wird weitergearbeitet (entspricht weitestgehend d
};
// cbTC (count of bytes of a TC) is 18(decimal), 12(hex).
-
struct WW8_TCellVer6 // wird aus der Datei gelesen
{
sal_uInt8 aBits1Ver6;
@@ -485,7 +477,6 @@ struct WW8_TCellVer8 // wird aus der Datei gelesen
};
// cbTC (count of bytes of a TC) is 20(decimal), 14(hex).
-
struct WW8_SHD // struct SHD fehlt in der Beschreibung
{
private:
@@ -619,7 +610,6 @@ struct WW8_DPHEAD
SVBT16 dya; // 0xa
};
-
struct WW8_DP_LINETYPE
{
SVBT32 lnpc; // LiNe Property Color -- RGB color value
@@ -661,7 +651,7 @@ struct WW8_DP_LINE
{
// WW8_DPHEAD dphead; // 0 Common header for a drawing primitive
SVBT16 xaStart; // starting point for line
- SVBT16 yaStart; //
+ SVBT16 yaStart;
SVBT16 xaEnd; // ending point for line
SVBT16 yaEnd;
WW8_DP_LINETYPE aLnt;
@@ -768,7 +758,7 @@ struct WW8_ATRD // fuer die 8-Version
struct WW8_ATRDEXTRA
{
- // --- Extended bit since Word 2002 --- //
+ // --- Extended bit since Word 2002 ---
SVBT32 dttm;
SVBT16 bf;
@@ -853,7 +843,6 @@ public:
enum FSPAOrient {RelPgMargin, RelPageBorder, RelText};
};
-
struct WW8_FSPA_SHADOW // alle Member an gleicher Position und Groesse,
{ // wegen: pF = (WW8_FSPA*)pFS;
SVBT32 nSpId;
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index 74e726a5256f..d0482e95e49a 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -149,7 +149,7 @@ class SwCTBWrapper : public Tcg255SubStruct
sal_Int32 cbDTBC;
- std::vector< SwTBC > rtbdc; //
+ std::vector< SwTBC > rtbdc;
std::vector< Customization > rCustomizations; // array of Customizations
std::vector< sal_Int16 > dropDownMenuIndices; // array of indexes of Customization toolbars that are dropped by a menu
SwCTBWrapper(const SwCTBWrapper&);
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 3c230fda29d6..089e7c3c8b1d 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -424,7 +424,6 @@ void XMLRedlineImportHelper::Add(
pInfo->aDateTime = rDateTime;
pInfo->bMergeLastParagraph = bMergeLastPara;
-
// ad 3)
if (aRedlineMap.end() == aRedlineMap.find(rId))
{
@@ -578,7 +577,6 @@ void XMLRedlineImportHelper::AdjustStartNodeCursor(
// else: can't find redline -> ignore
}
-
inline bool XMLRedlineImportHelper::IsReady(RedlineInfo* pRedline)
{
// we can insert a redline if we have start & end, and we don't
@@ -622,7 +620,6 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
aPaM.DeleteMark();
}
-
// cover three cases:
// 1) empty redlines (no range, no content)
// 2) check for:
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 25e8d73fe9db..cd88b8f95af6 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -481,7 +481,6 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs( SwDoc& _rDoc )
}
}
-
sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, const OUString & rName )
{
// Get service factory
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 587ff082a345..64876fa4e820 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
@@ -369,7 +368,6 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
sErrFile = "styles.xml";
}
-
if( !bOrganizerMode && !bErr )
{
if( !WriteThroughComponent(
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 130f036c886c..bfba14f14ae3 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
} } }
-
class SwXMLWriter : public StgWriter
{
sal_uInt32 _Write( const com::sun::star::uno::Reference < com::sun::star::task::XStatusIndicator>&, const OUString& );
@@ -91,7 +90,6 @@ private:
::com::sun::star::beans::PropertyValue> & rMediaDesc );
};
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_WRTXML_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index a077b7200bfa..84c4fcb1d420 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -197,7 +197,6 @@ SwXMLBrushItemExport::~SwXMLBrushItemExport()
{
}
-
void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem )
{
GetExport().CheckAttrList();
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 73e03fdfd006..a07a142671a5 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -308,7 +307,6 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
pDoc->SetRedlineMode( (RedlineMode_t)(nRedlineMode ));
}
-
if( pGraphicResolver )
SvXMLGraphicHelper::Destroy( pGraphicResolver );
if( pEmbeddedResolver )
@@ -343,7 +341,6 @@ SwXMLExport::~SwXMLExport()
_FinitItemExport();
}
-
void SwXMLExport::_ExportFontDecls()
{
GetFontAutoStylePool(); // make sure the pool is created
@@ -451,7 +448,6 @@ void SwXMLExport::SetBodyAttributes()
}
}
-
void SwXMLExport::_ExportContent()
{
// export forms
@@ -507,12 +503,8 @@ void SwXMLExport::_ExportContent()
GetTextParagraphExport()->exportText( xText, bShowProgress );
}
-
-
-//
// uno component registration
// helper functions for export service(s)
-//
// OOo
OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw()
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 3a4d07b79d8c..0414747767a9 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -75,7 +75,6 @@ class SwXMLExport : public SvXMLExport
SwXMLTableInfo_Impl& rTblInfo,
sal_Bool bTop=sal_False );
-
void ExportFmt( const SwFmt& rFmt, enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID );
void ExportTableFmt( const SwFrmFmt& rFmt, sal_uInt32 nAbsWidth );
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 53013664cc18..47d0deea5cbe 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -568,7 +568,6 @@ bool SvXMLExportItemMapper::QueryXMLValue(
sal_uInt16 nLeftDist = pBox->GetDistance( BOX_LINE_LEFT );
sal_uInt16 nRightDist = pBox->GetDistance( BOX_LINE_RIGHT );
-
// check if we need to export it
switch( nMemberId )
{
diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx
index 16ff8283db34..a017fffb19ef 100644
--- a/sw/source/filter/xml/xmlexpit.hxx
+++ b/sw/source/filter/xml/xmlexpit.hxx
@@ -38,7 +38,6 @@ class SvXMLAttributeList;
class SvXMLNamespaceMap;
class SvXMLExport;
-
class SvXMLExportItemMapper
{
protected:
@@ -62,7 +61,6 @@ protected:
sal_uInt16 nFlags,
const SfxItemSet *pSet ) const;
-
void exportElementItems( SvXMLExport& rExport,
const SvXMLUnitConverter& rUnitConverter,
const SfxItemSet &rSet,
@@ -92,7 +90,6 @@ public:
const SvXMLNamespaceMap& rNamespaceMap,
const SfxItemSet *pSet = NULL ) const;
-
/** this method is called for every item that has the
MID_SW_FLAG_NO_ITEM_EXPORT flag set */
virtual void handleNoItem( SvXMLAttributeList& rAttrList,
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 6e025f4b7c93..8d2386ee93ca 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -50,7 +50,6 @@
#include <unotxdoc.hxx>
#include <docsh.hxx>
-
using namespace ::com::sun::star;
using namespace ::xmloff::token;
@@ -827,7 +826,6 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
return pStyle;
}
-
SwXMLStylesContext_Impl::SwXMLStylesContext_Impl(
SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList,
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 3aa03025311f..03e7b9c5a00d 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -38,7 +38,6 @@
#include "xmlexp.hxx"
#include <SwStyleNameMapper.hxx>
-
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -46,7 +45,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::lang;
using namespace ::xmloff::token;
-
void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
{
// <style:style ...>
@@ -64,7 +62,6 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
if( bEncoded )
AddAttribute( XML_NAMESPACE_STYLE, XML_DISPLAY_NAME, rFmt.GetName() );
-
if( eFamily != XML_TOKEN_INVALID )
AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
@@ -162,7 +159,6 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
}
}
-
void SwXMLExport::_ExportStyles( bool bUsed )
{
SvXMLExport::_ExportStyles( bUsed );
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 69d09da91881..738caaffd491 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -239,7 +239,6 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
return pContext;
}
@@ -508,7 +507,6 @@ void SwXMLImport::startDocument()
// this method will modify the document directly -> lock SolarMutex
SolarMutexGuard aGuard;
-
Reference< XPropertySet > xImportInfo( getImportInfo() );
Reference< XPropertySetInfo > xPropertySetInfo;
if( xImportInfo.is() )
@@ -724,7 +722,6 @@ void SwXMLImport::endDocument( void )
if( HasShapeImport() )
ClearShapeImport();
-
SwDoc *pDoc = 0;
if( (getImportFlags() & IMPORT_CONTENT) != 0 && !IsStylesOnlyMode() )
{
@@ -1446,7 +1443,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
}
}
-
void SwXMLImport::SetDocumentSpecificSettings(
const OUString& _rSettingsGroupName,
const Sequence< PropertyValue>& _rSettings )
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index ee77cadc73e0..3f1a920ca728 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -93,7 +93,6 @@ class SwXMLImport: public SvXMLImport
void setBlockMode();
void setOrganizerMode();
-
protected:
// This method is called after the namespace map has been updated, but
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 3bdac75eac22..4bf2c1d1aeff 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -248,8 +248,6 @@ struct BoxHolder : private boost::noncopyable
}
};
-
-
// put an XML-string value into an item
bool SvXMLImportItemMapper::PutXMLValue(
SfxPoolItem& rItem,
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 219ae8dba848..d93026aa1867 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -22,11 +22,9 @@
#include <limits.h>
#include <tools/solar.h>
-
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include "xmlitmap.hxx"
-
class SvXMLUnitConverter;
class SfxPoolItem;
class SfxItemSet;
@@ -75,7 +73,6 @@ public:
virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
inline SvXMLItemMapEntriesRef getMapEntries() const;
-
/** This method is called for every item that should be set based
upon an XML attribute value. */
static bool PutXMLValue(
@@ -91,7 +88,6 @@ SvXMLImportItemMapper::getMapEntries() const
return mrMapEntries;
}
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLIMPIT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index 2d0670c9a160..4e2ccdc55bad 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -25,7 +25,6 @@
#include <limits.h>
#include <xmloff/xmlictxt.hxx>
-
class SfxItemSet;
class SvXMLImportItemMapper;
class SvXMLUnitConverter;
@@ -63,7 +62,6 @@ public:
const SvXMLItemMapEntry& rEntry,
const SvXMLUnitConverter& rUnitConv );
-
};
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index 86d9a3e66888..dec2c5c33a14 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -174,7 +174,6 @@ bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
return bRet;
}
-
bool SwXMLImportTableItemMapper_Impl::handleNoItem(
SvXMLItemMapEntry const& rEntry,
SfxItemSet & rSet,
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index e1a383bbebac..97d21b816030 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -78,7 +78,6 @@ const struct SvXMLEnumMapEntry psXML_NamedBorderWidths[] =
};
// mapping tables to map external xml input to internal box line widths
-
const sal_uInt16 aBorderWidths[] =
{
DEF_LINE_WIDTH_0,
@@ -176,7 +175,6 @@ bool sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
if( !rpLine )
rpLine = new SvxBorderLine;
-
if( ( bHasWidth &&
(USHRT_MAX != nNamedWidth || (nWidth != rpLine->GetWidth() ) ) ) ||
( bHasStyle &&
@@ -314,7 +312,6 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
}
}
-
const struct SvXMLEnumMapEntry psXML_BreakType[] =
{
{ XML_AUTO, 0 },
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 79b121a2773a..8ffb42f0f918 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -33,8 +33,6 @@
#include "xmlimp.hxx"
#include "xmlexp.hxx"
-
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 1cb94ad7a20f..0cdf40156588 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -69,7 +69,6 @@ class SwXMLTableColumn_Impl : public SwWriteTableCol
public:
-
SwXMLTableColumn_Impl( sal_uInt32 nPosition ) :
SwWriteTableCol( nPosition ),
nRelWidth( 0UL )
@@ -268,7 +267,6 @@ bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
continue;
}
-
if( pFrmSize &&
( pFrmSize->GetHeightSizeType() != pTestFrmSize->GetHeightSizeType() ||
pFrmSize->GetHeight() != pTestFrmSize->GetHeight() ) )
@@ -472,7 +470,6 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
return bInsert;
}
-
class SwXMLTableInfo_Impl
{
const SwTable *pTable;
@@ -504,9 +501,6 @@ inline void SwXMLTableInfo_Impl::SetBaseSection(
bBaseSectionValid = true;
}
-
-
-
void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
{
// <style:style ...>
@@ -656,7 +650,6 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
else
nCPos = pLines->GetWidth();
-
// Und ihren Index
sal_uInt16 nOldCol = nCol;
SwXMLTableColumn_Impl aCol( nCPos );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index cae6695e3521..42060375c4e0 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1275,9 +1275,6 @@ public:
}
};
-
-
-
typedef boost::ptr_vector<SwXMLTableRow_Impl> SwXMLTableRows_Impl;
const SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
@@ -2807,7 +2804,6 @@ void SwXMLTableContext::MakeTable()
pFrmFmt->SetFmtAttr( aSize );
pFrmFmt->UnlockModify();
-
for( sal_uInt16 i=0; i<pRows->size(); i++ )
(*pRows)[i].Dispose();
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 2ea2d650f514..109c089dc872 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -76,7 +76,6 @@ public:
OUString& rStreamName ) const;
};
-
#endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLTEXTE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */