summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml')
-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
22 files changed, 0 insertions, 59 deletions
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: */