diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-09 01:04:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-21 15:31:09 +0000 |
commit | 42deae1e9d3ea0ed4ff5d1423c786d15ebcebfea (patch) | |
tree | 0be8f8da7a3ed20c5fe869ecf1a61ebfaeb251fe /sw/source/filter/xml | |
parent | f6fef3a970eff5b81c2bc7390ddd6ac96931a92a (diff) |
Translate German comments and remove superfluous ones as well as visual noise
Conflicts:
sc/source/ui/view/select.cxx
sc/source/ui/view/viewdata.cxx
sw/source/core/text/redlnitr.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtftn.cxx
sw/source/ui/table/tabledlg.cxx
Change-Id: I23371b913514d656552bc6f7fb4ba554ee6a3694
Diffstat (limited to 'sw/source/filter/xml')
32 files changed, 66 insertions, 212 deletions
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index aef72a3887e2..3c230fda29d6 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -32,8 +32,6 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> - - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::xmloff::token; @@ -49,11 +47,7 @@ using ::com::sun::star::beans::XPropertySetInfo; // collision with tools/DateTime: use UNO DateTime as util::DateTime // using util::DateTime; - -// // a few helper functions -// - static SwDoc* lcl_GetDocViaTunnel( Reference<XTextCursor> & rCursor ) { Reference<XUnoTunnel> xTunnel( rCursor, UNO_QUERY); @@ -71,12 +65,10 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) SwXTextRange *const pXRange = ::sw::UnoTunnelGetImplementation<SwXTextRange>(xTunnel); // #i115174#: this may be a SvxUnoTextRange -// OSL_ENSURE( pXRange, "SwXTextRange missing" ); + // OSL_ENSURE( pXRange, "SwXTextRange missing" ); return (pXRange) ? pXRange->GetDoc() : 0; } - -// // XTextRangeOrNodeIndexPosition: store a position into the text // *either* as an XTextRange or as an SwNodeIndex. The reason is that // we must store either pointers to StartNodes (because redlines may @@ -84,12 +76,11 @@ static SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) // be no existing type that could do both. Things are complicated by // the matter that (e.g in section import) we delete a few characters, // which may cause bookmarks (as used by XTextRange) to be deleted. -// class XTextRangeOrNodeIndexPosition { Reference<XTextRange> xRange; - SwNodeIndex* pIndex; /// pIndex will point to the *previous* node + SwNodeIndex* pIndex; // pIndex will point to the *previous* node public: XTextRangeOrNodeIndexPosition(); @@ -197,25 +188,21 @@ bool XTextRangeOrNodeIndexPosition::IsValid() return ( xRange.is() || (pIndex != NULL) ); } - -// // RedlineInfo: temporary storage for redline data -// - class RedlineInfo { public: RedlineInfo(); ~RedlineInfo(); - /// redline type (insert, delete, ...) + // redline type (insert, delete, ...) RedlineType_t eType; // info fields: - OUString sAuthor; /// change author string - OUString sComment; /// change comment string - util::DateTime aDateTime; /// change DateTime - sal_Bool bMergeLastParagraph; /// the SwRangeRedline::IsDelLastPara flag + OUString sAuthor; // change author string + OUString sComment; // change comment string + util::DateTime aDateTime; // change DateTime + sal_Bool bMergeLastParagraph; // the SwRangeRedline::IsDelLastPara flag // each position can may be either empty, an XTextRange, or an SwNodeIndex @@ -225,13 +212,13 @@ public: // end pos of anchor (may be empty) XTextRangeOrNodeIndexPosition aAnchorEnd; - /// index of content node (maybe NULL) + // index of content node (maybe NULL) SwNodeIndex* pContentIndex; - /// next redline info (for hierarchical redlines) + // next redline info (for hierarchical redlines) RedlineInfo* pNextRedline; - /// store whether we expect an adjustment for this redline + // store whether we expect an adjustment for this redline bool bNeedsAdjustment; }; @@ -255,11 +242,7 @@ RedlineInfo::~RedlineInfo() delete pNextRedline; } - -// // XMLRedlineImportHelper -// - XMLRedlineImportHelper::XMLRedlineImportHelper( bool bNoRedlinesPlease, const Reference<XPropertySet> & rModel, @@ -752,7 +735,6 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( return pData; } - void XMLRedlineImportHelper::SetShowChanges( sal_Bool bShow ) { bShowChanges = bShow; diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index 0b562bcaa9ac..391c78968465 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } - typedef ::std::map< OUString, RedlineInfo* > RedlineMapType; class XMLRedlineImportHelper @@ -51,11 +50,11 @@ class XMLRedlineImportHelper RedlineMapType aRedlineMap; - /// if sal_True, no redlines should be inserted into document - /// (This typically happen when a document is loaded in 'insert'-mode.) + // if sal_True, no redlines should be inserted into document + // (This typically happen when a document is loaded in 'insert'-mode.) bool bIgnoreRedlines; - /// save information for saving and reconstruction of the redline mode + // save information for saving and reconstruction of the redline mode ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xModelPropertySet; ::com::sun::star::uno::Reference< @@ -67,7 +66,7 @@ class XMLRedlineImportHelper public: XMLRedlineImportHelper( - bool bIgnoreRedlines, /// ignore redlines mode + bool bIgnoreRedlines, // ignore redlines mode // property sets of model + import info for saving + restoring the // redline mode @@ -77,34 +76,34 @@ public: ::com::sun::star::beans::XPropertySet> & rImportInfoSet ); virtual ~XMLRedlineImportHelper(); - /// create a redline object - /// (The redline will be inserted into the document after both start - /// and end cursor has been set.) + // create a redline object + // (The redline will be inserted into the document after both start + // and end cursor has been set.) void Add( - const OUString& rType, /// redline type (insert, del,... ) - const OUString& rId, /// use to identify this redline - const OUString& rAuthor, /// name of the author - const OUString& rComment, /// redline comment - const ::com::sun::star::util::DateTime& rDateTime, /// date+time - sal_Bool bMergeLastParagraph); /// merge last paragraph? - - /// create a text section for the redline, and return an - /// XText/XTextCursor that may be used to write into it. + const OUString& rType, // redline type (insert, del,... ) + const OUString& rId, // use to identify this redline + const OUString& rAuthor, // name of the author + const OUString& rComment, // redline comment + const ::com::sun::star::util::DateTime& rDateTime, // date+time + sal_Bool bMergeLastParagraph); // merge last paragraph? + + // create a text section for the redline, and return an + // XText/XTextCursor that may be used to write into it. ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> CreateRedlineTextSection( - ::com::sun::star::uno::Reference< /// needed to get the document + ::com::sun::star::uno::Reference< // needed to get the document ::com::sun::star::text::XTextCursor> xOldCursor, - const OUString& rId); /// ID used to RedlineAdd() call + const OUString& rId); // ID used to RedlineAdd() call - /// Set start or end position for a redline in the text body. - /// Accepts XTextRange objects. + // Set start or end position for a redline in the text body. + // Accepts XTextRange objects. void SetCursor( - const OUString& rId, /// ID used in RedlineAdd() call - sal_Bool bStart, /// start or end Range - ::com::sun::star::uno::Reference< /// the actual XTextRange + const OUString& rId, // ID used in RedlineAdd() call + sal_Bool bStart, // start or end Range + ::com::sun::star::uno::Reference< // the actual XTextRange ::com::sun::star::text::XTextRange> & rRange, - /// text range is (from an XML view) outside of a paragraph - /// (i.e. before a table) + // text range is (from an XML view) outside of a paragraph + // (i.e. before a table) sal_Bool bIsOusideOfParagraph); /** @@ -116,19 +115,19 @@ public: * only be considered valid if it points to the next text node * after the position given in a previous SetCursor */ void AdjustStartNodeCursor( - const OUString& rId, /// ID used in RedlineAdd() call + const OUString& rId, // ID used in RedlineAdd() call sal_Bool bStart, - /// XTextRange _inside_ a table/section + // XTextRange _inside_ a table/section ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange> & rRange); - /// set redline mode: show changes + // set redline mode: show changes void SetShowChanges( sal_Bool bShowChanges ); - /// set redline mode: record changes + // set redline mode: record changes void SetRecordChanges( sal_Bool bRecordChanges ); - /// set redline protection key + // set redline protection key void SetProtectionKey( const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); @@ -139,15 +138,15 @@ private: void InsertIntoDocument(RedlineInfo* pRedline); SwRedlineData* ConvertRedline( - RedlineInfo* pRedline, /// RedlineInfo to be converted - SwDoc* pDoc); /// document needed for Author-ID conversion + RedlineInfo* pRedline, // RedlineInfo to be converted + SwDoc* pDoc); // document needed for Author-ID conversion - /** save the redline mode (if rPropertySet is non-null) */ + // save the redline mode (if rPropertySet is non-null) void SaveRedlineMode( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rPropertySet); - /** don't restore the saved redline mode */ + // don't restore the saved redline mode void DontRestoreRedlineMode(); }; diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index f7ab28263365..25e8d73fe9db 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -269,7 +269,7 @@ sal_Int32 ReadThroughComponent( return 0; } -/// read a component (storage version) +// read a component (storage version) sal_Int32 ReadThroughComponent( uno::Reference<embed::XStorage> xStorage, uno::Reference<XComponent> xModelComponent, @@ -616,8 +616,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aInfoMap ) ) ); - // ---- get BuildId from parent container if available - + // get BuildId from parent container if available uno::Reference< container::XChild > xChild( xModelComp, uno::UNO_QUERY ); if( xChild.is() ) { diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 0c761d587580..587ff082a345 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -63,12 +63,10 @@ SwXMLWriter::SwXMLWriter( const OUString& rBaseURL ) SetBaseURL( rBaseURL ); } - SwXMLWriter::~SwXMLWriter() { } - sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& xStatusIndicator, const OUString& aDocHierarchicalName ) { @@ -587,14 +585,9 @@ bool SwXMLWriter::WriteThroughComponent( return xFilter->filter( rMediaDesc ); } - -// ----------------------------------------------------------------------- - void GetXMLWriter( const OUString& /*rName*/, const OUString& rBaseURL, WriterRef& xRet ) { xRet = new SwXMLWriter( rBaseURL ); } -// ----------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index 8a8f8d0f3906..130f036c886c 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -58,25 +58,25 @@ private: // helper methods to write XML streams - /// write a single XML stream into the package + // write a single XML stream into the package bool WriteThroughComponent( - /// the component we export + // the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name - /// service factory for pServiceName + const sal_Char* pStreamName, // the stream name + // service factory for pServiceName const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> & rFactory, - const sal_Char* pServiceName, /// service name of the component - /// the argument (XInitialization) + const sal_Char* pServiceName, // service name of the component + // the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, - /// output descriptor + // output descriptor const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc ); - /// write a single output stream - /// (to be called either directly or by WriteThroughComponent(...)) + // write a single output stream + // (to be called either directly or by WriteThroughComponent(...)) bool WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream> & xOutputStream, diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx index 9d7976d0cb18..a077b7200bfa 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -239,5 +239,4 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index 4ca96faaa13f..ab960ca8f9cb 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <xmloff/attrlist.hxx> - class SvxBrushItem; class SwXMLExport; @@ -43,7 +42,6 @@ public: void exportXML( const SvxBrushItem& rItem ); }; - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLBRSHE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index f862558fc0c6..943315f6bb72 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -76,7 +76,6 @@ public: const SvxBrushItem& GetItem() const { return *pItem; } }; - #endif // _XMLBRSHI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index df90df5b57ad..103474304f66 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -63,7 +63,6 @@ #include <pausethreadstarting.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 07f6e158b2bc..27e249a200d0 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -153,7 +153,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const return *pTwipUnitConv; } - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx index b1e5182bf6d0..53013664cc18 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -50,13 +50,12 @@ #include "fmtrowsplt.hxx" - using ::editeng::SvxBorderLine; using namespace ::com::sun::star; using namespace ::xmloff::token; using uno::Any; -/** fills the given attribute list with the items in the given set */ +// fills the given attribute list with the items in the given set void SvXMLExportItemMapper::exportXML( const SvXMLExport& rExport, SvXMLAttributeList& rAttrList, const SfxItemSet& rSet, diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 64c1a6eddd65..6e025f4b7c93 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -187,8 +187,6 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) : } } -// --------------------------------------------------------------------- - class SwXMLConditionContext_Impl : public SvXMLImportContext { sal_uInt32 nCondition; @@ -259,8 +257,6 @@ SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl() TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext ); -// --------------------------------------------------------------------- - typedef std::vector<SwXMLConditionContext_Impl*> SwXMLConditions_Impl; class SwXMLTextStyleContext_Impl : public XMLTextStyleContext @@ -423,8 +419,6 @@ void SwXMLTextStyleContext_Impl::Finish( bool bOverwrite ) } } -// --------------------------------------------------------------------- - class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext { OUString sMasterPageName; @@ -717,8 +711,6 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName() } } -// --------------------------------------------------------------------- -// class SwXMLStylesContext_Impl : public SvXMLStylesContext { SwXMLItemSetStyleContext_Impl *GetSwStyle( sal_uInt16 i ) const; @@ -927,8 +919,6 @@ void SwXMLStylesContext_Impl::EndElement() GetSwImport().InsertStyles( IsAutomaticStyle() ); } -// --------------------------------------------------------------------- -// class SwXMLMasterStylesContext_Impl : public XMLTextMasterStylesContext { protected: @@ -983,7 +973,6 @@ void SwXMLMasterStylesContext_Impl::EndElement() FinishStyles( !GetSwImport().IsInsertMode() ); GetSwImport().FinishStyles(); } -// --------------------------------------------------------------------- SvXMLImportContext *SwXMLImport::CreateStylesContext( const OUString& rLocalName, diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 7404235f082b..3aa03025311f 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -251,7 +251,6 @@ void SwXMLExport::_ExportMasterStyles() GetPageExport()->exportMasterStyles( sal_False ); } -// --------------------------------------------------------------------- class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP { SvXMLExport& rExport; @@ -338,7 +337,6 @@ SwXMLAutoStylePoolP::SwXMLAutoStylePoolP(SvXMLExport& rExp ) : { } - SwXMLAutoStylePoolP::~SwXMLAutoStylePoolP() { } diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index 1f1dd574de06..78b614d08384 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <com/sun/star/text/XTextDocument.hpp> #include <xmloff/XMLFontAutoStylePool.hxx> @@ -27,7 +26,6 @@ #include <xmlexp.hxx> #include <xmlimp.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; @@ -35,9 +33,7 @@ using namespace ::com::sun::star::text; class SwXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool { public: - SwXMLFontAutoStylePool_Impl( SwXMLExport& rExport, bool blockFontEmbedding ); - }; SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl( @@ -73,7 +69,6 @@ SwXMLFontAutoStylePool_Impl::SwXMLFontAutoStylePool_Impl( } } - XMLFontAutoStylePool* SwXMLExport::CreateFontAutoStylePool() { bool blockFontEmbedding = false; diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index f1a999f5054d..77278f2ad0bb 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -66,7 +65,6 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/processfactory.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; @@ -79,8 +77,6 @@ using namespace ::com::sun::star::xforms; using namespace ::xmloff::token; using namespace ::std; -//---------------------------------------------------------------------------- - enum SwXMLDocTokens { XML_TOK_DOC_FONTDECLS, @@ -109,8 +105,6 @@ static SvXMLTokenMapEntry aDocTokenMap[] = XML_TOKEN_MAP_END }; -// ---------------------------------------------------------------------------- - class SwXMLBodyContext_Impl : public SvXMLImportContext { const SwXMLImport& GetSwImport() const @@ -152,8 +146,6 @@ SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext( return GetSwImport().CreateBodyContentContext( rLocalName ); } -// ---------------------------------------------------------------------------- - // #i69629# // enhance class <SwXMLDocContext_Impl> in order to be able to create subclasses // NB: virtually inherit so we can multiply inherit properly @@ -357,7 +349,6 @@ void SwXMLDocStylesContext_Impl::EndElement() GetImport().GetTextImport()->SetOutlineStyles( (rSwImport.GetStyleFamilyMask() & SFX_STYLE_FAMILY_PARA ) ? sal_True : sal_False); } -//---------------------------------------------------------------------------- const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap() { @@ -924,7 +915,6 @@ void SwXMLImport::endDocument( void ) ClearTextImport(); } - // Locally derive XMLTextShapeImportHelper, so we can take care of the // form import This is Writer, but not text specific, so it should go // here! @@ -942,7 +932,6 @@ class SvTextShapeImportHelper : public XMLTextShapeImportHelper Reference<drawing::XDrawPage> xPage; public: - SvTextShapeImportHelper(SvXMLImport& rImp); virtual ~SvTextShapeImportHelper(); }; @@ -976,7 +965,6 @@ SvTextShapeImportHelper::~SvTextShapeImportHelper() } } - XMLTextImportHelper* SwXMLImport::CreateTextImport() { return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(), @@ -1518,11 +1506,7 @@ void SwXMLImport::initialize( } } - -// // UNO component registration helper functions -// - OUString SAL_CALL SwXMLImport_getImplementationName() throw() { return OUString( @@ -1648,7 +1632,6 @@ SwDoc* SwImport::GetDocFromXMLImport( SvXMLImport& rImport ) return pDoc; } - void SwXMLImport::initXForms() { // obtain SwDoc diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index 1b73883d6c10..3bdac75eac22 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xmlimpit.hxx" #include <sax/tools/converter.hxx> @@ -31,7 +30,6 @@ #include <editeng/xmlcnitm.hxx> #include <editeng/memberids.hrc> - #include "hintids.hxx" #include "unomid.h" #include <svx/unomid.hxx> @@ -75,7 +73,7 @@ SvXMLImportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) mrMapEntries = rMapEntries; } -/** fills the given itemset with the attributes in the given list */ +// fills the given itemset with the attributes in the given list void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, uno::Reference< xml::sax::XAttributeList > xAttrList, const SvXMLUnitConverter& rUnitConverter, @@ -439,7 +437,7 @@ bool SvXMLImportItemMapper::PutXMLValue( SvxBoxItem* pBox = PTR_CAST(SvxBoxItem, &rItem); OSL_ENSURE( pBox != NULL, "Wrong WHich-ID" ); - /** copy SvxBorderLines */ + // copy SvxBorderLines BoxHolder aBoxes(pBox); sal_Int32 nTemp; @@ -988,5 +986,4 @@ bool SvXMLImportItemMapper::PutXMLValue( return bOk; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index 75445bbfe76f..7e674ac05944 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -71,5 +71,4 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 2573ce8a10f8..2d0670c9a160 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -66,7 +66,6 @@ public: }; - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 645d0285e480..538412e1fa0f 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/MeasureUnit.hpp> #include <hintids.hxx> @@ -51,7 +50,6 @@ extern SvXMLItemMapEntry aXMLTableItemMap[]; extern SvXMLItemMapEntry aXMLTableRowItemMap[]; extern SvXMLItemMapEntry aXMLTableCellItemMap[]; - class SwXMLTableItemMapper_Impl: public SvXMLExportItemMapper { SwXMLBrushItemExport aBrushItemExport; @@ -217,8 +215,6 @@ inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs ) nAbsWidth = nAbs; } -// ---------------------------------------------------------------------------- - void SwXMLExport::_InitItemExport() { pTwipUnitConv = new SvXMLUnitConverter(getComponentContext(), diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 6441658e998b..86d9a3e66888 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/ustring.hxx> #include <com/sun/star/util/MeasureUnit.hpp> @@ -243,8 +242,6 @@ void SwXMLImportTableItemMapper_Impl::finished( } } -// --------------------------------------------------------------------- - class SwXMLItemSetContext_Impl : public SvXMLItemSetContext { SvXMLImportContextRef xBackground; @@ -331,8 +328,6 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( return pContext; } -// --------------------------------------------------------------------- - void SwXMLImport::_InitItemImport() { pTwipUnitConv = new SvXMLUnitConverter( GetComponentContext(), diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 4907c074c0e6..e1a383bbebac 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -40,7 +40,6 @@ using ::editeng::SvxBorderLine; using namespace ::xmloff::token; using namespace ::com::sun::star; - #define API_LINE_NONE 0x7FFF #define API_LINE_SOLID 0 #define API_LINE_DOTTED 1 @@ -55,7 +54,6 @@ using namespace ::com::sun::star; #define SVX_XML_BORDER_WIDTH_MIDDLE 1 #define SVX_XML_BORDER_WIDTH_THICK 2 - const struct SvXMLEnumMapEntry psXML_BorderStyles[] = { { XML_NONE, API_LINE_NONE }, @@ -353,5 +351,4 @@ const struct SvXMLEnumMapEntry aXML_KeepTogetherType[] = { XML_TOKEN_INVALID, 0} }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 7abab391bd2e..5388fa063bc2 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -31,11 +31,8 @@ struct SvXMLEnumMapEntry; class SvXMLUnitConverter; class Color; - - /** Define various helper variables and functions for xmlimpit.cxx and * xmlexpit.cxx. */ - bool sw_frmitems_parseXMLBorder( const OUString& rValue, const SvXMLUnitConverter& rUnitConverter, bool& rHasStyle, sal_uInt16& rStyle, @@ -69,7 +66,6 @@ extern const struct SvXMLEnumMapEntry aXMLTableAlignMap[]; extern const struct SvXMLEnumMapEntry aXMLTableVAlignMap[]; extern const struct SvXMLEnumMapEntry aXML_KeepTogetherType[]; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 2fd6fdc9dc6b..031853f0a7a4 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -24,11 +24,9 @@ #include <tools/ref.hxx> #include <xmloff/xmltoken.hxx> - #define MID_SW_FLAG_MASK 0x0000ffff // this flags are used in the item mapper for import and export - #define MID_SW_FLAG_SPECIAL_ITEM_IMPORT 0x80000000 #define MID_SW_FLAG_NO_ITEM_IMPORT 0x40000000 #define MID_SW_FLAG_SPECIAL_ITEM_EXPORT 0x20000000 @@ -39,8 +37,6 @@ #define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000 #define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both import and export -// --- - struct SvXMLItemMapEntry { sal_uInt16 nNameSpace; // declares the Namespace in which this item @@ -56,8 +52,6 @@ struct SvXMLItemMapEntry // and localName }; -// --- - class SvXMLItemMapEntries_impl; /** this class manages an array of SvXMLItemMapEntry. It is @@ -83,7 +77,6 @@ public: SV_DECL_REF( SvXMLItemMapEntries ) SV_IMPL_REF( SvXMLItemMapEntries ) - #endif // INCLUDED_SW_SOURCE_FILTER_XML_XMLITMAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx index f2796f8bee66..e19630af2c48 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -24,7 +24,6 @@ using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_TOKEN_INVALID; // TODO: optimize this! - class SvXMLItemMapEntries_impl { public: diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 6352f2be4134..79b121a2773a 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -// --------------------------------------------------------------------- - uno::Reference<document::XDocumentProperties> SwXMLImport::GetDocumentProperties() const { @@ -76,8 +74,6 @@ SvXMLImportContext *SwXMLImport::CreateMetaContext( return pContext; } -// --------------------------------------------------------------------- - enum SvXMLTokenMapAttrs { XML_TOK_META_STAT_TABLE = 1, @@ -161,8 +157,6 @@ void SwXMLImport::SetStatistics( pProgress->SetValue( 0 ); } -// --------------------------------------------------------------------- - void SwXMLExport::_ExportMeta() { SvXMLExport::_ExportMeta(); diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index e5f55ad44c15..39b8dda5a884 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -26,8 +26,6 @@ using namespace ::com::sun::star; -// --------------------------------------------------------------------- - SvXMLImportContext *SwXMLImport::CreateScriptContext( const OUString& rLocalName ) { diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index e3c8ab72e1a7..4eb18137900b 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextSection.hpp> @@ -94,8 +93,6 @@ struct SwXMLTableColumnCmpWidth_Impl } }; -// --------------------------------------------------------------------- - class SwXMLTableColumns_Impl : public o3tl::sorted_vector<SwXMLTableColumn_Impl*, o3tl::less_ptr_to<SwXMLTableColumn_Impl> > { public: ~SwXMLTableColumns_Impl() { DeleteAndDestroyAll(); } @@ -180,8 +177,6 @@ SwXMLTableLines_Impl::SwXMLTableLines_Impl( const SwTableLines& rLines ) : } } -// --------------------------------------------------------------------- - typedef vector< SwFrmFmt* > SwXMLFrmFmts_Impl; class SwXMLTableFrmFmtsSort_Impl @@ -746,7 +741,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd ) nAbsWidth = pTblFmt->FindLayoutRect(sal_True).Width(); if( !nAbsWidth ) { - // TODO??? + // TODO? } } ExportTableFmt( *pTblFmt, nAbsWidth ); @@ -762,8 +757,6 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd ) } } -// --------------------------------------------------------------------- - void SwXMLExport::ExportTableBox( const SwTableBox& rBox, sal_uInt16 nColSpan, sal_uInt16 nRowSpan, @@ -803,7 +796,6 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox, if( pBoxSttNd ) { // start node -> normal cell - // get cell range for table Reference<XCell> xCell = SwXCell::CreateXCell( (SwFrmFmt *)rTblInfo.GetTblFmt(), (SwTableBox *)&rBox, diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 11802da12ffc..a554381d476a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -155,8 +155,6 @@ const SvXMLTokenMap& SwXMLImport::GetTableCellAttrTokenMap() return *pTableCellAttrTokenMap; } -// --------------------------------------------------------------------- - class SwXMLTableCell_Impl { OUString aStyleName; @@ -283,8 +281,6 @@ inline void SwXMLTableCell_Impl::Dispose() xSubTable = 0; } -// --------------------------------------------------------------------- - typedef boost::ptr_vector<SwXMLTableCell_Impl> SwXMLTableCells_Impl; class SwXMLTableRow_Impl @@ -398,8 +394,6 @@ void SwXMLTableRow_Impl::Dispose() aCells[i].Dispose(); } -// --------------------------------------------------------------------- - class SwXMLTableCellContext_Impl : public SvXMLImportContext { OUString aStyleName; @@ -650,7 +644,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext( { sXmlId = xAttrList->getValueByIndex( i ); } -//FIXME: RDFa + //FIXME: RDFa } } @@ -747,8 +741,6 @@ void SwXMLTableCellContext_Impl::EndElement() GetImport().GetTextImport()->SetCellParaStyleDefault(sSaveParaDefault); } -// --------------------------------------------------------------------- - class SwXMLTableColContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; @@ -800,7 +792,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( IsXMLToken( aLocalName, XML_ID ) ) { (void) rValue; -//FIXME where to put this??? columns do not actually exist in writer... + //FIXME where to put this??? columns do not actually exist in writer... } } @@ -834,8 +826,6 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl() { } -// --------------------------------------------------------------------- - class SwXMLTableColsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; @@ -892,8 +882,6 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext( return pContext; } -// --------------------------------------------------------------------- - class SwXMLTableRowContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; @@ -1014,8 +1002,6 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( return pContext; } -// --------------------------------------------------------------------- - class SwXMLTableRowsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; @@ -1078,8 +1064,6 @@ SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext( return pContext; } -// --------------------------------------------------------------------- - class SwXMLDDETableContext_Impl : public SvXMLImportContext { OUString sConnectionName; @@ -1260,9 +1244,6 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext, return pType; } - -// --------------------------------------------------------------------- - class TableBoxIndex { public: @@ -1415,7 +1396,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, if( xTable.is() ) { -//FIXME + //FIXME // xml:id for RDF metadata GetImport().SetXmlId(xTable, sXmlId); @@ -1954,7 +1935,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper, sal_uInt32 nBottomRow, sal_uInt32 nRightCol ) { -//FIXME: here would be a great place to handle XmlId for cell + //FIXME: here would be a great place to handle XmlId for cell SwTableBox *pBox = new SwTableBox( pBoxFmt, 0, pUpper ); sal_uInt32 nColSpan = nRightCol - nLeftCol; @@ -2051,7 +2032,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( sal_uInt32 /*nTopRow*/, sal_uInt32 nLeftCol, sal_uInt32 /*nBottomRow*/, sal_uInt32 nRightCol ) { -//FIXME: here would be a great place to handle XmlId for cell + //FIXME: here would be a great place to handle XmlId for cell SwTableBox *pBox; sal_uInt32 nColSpan = nRightCol - nLeftCol; sal_Int32 nColWidth = GetColumnWidth( nLeftCol, nColSpan ); @@ -2225,7 +2206,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, sal_uInt32 nBottomRow, sal_uInt32 nRightCol ) { -//FIXME: here would be a great place to handle XmlId for row + //FIXME: here would be a great place to handle XmlId for row SwTableLine *pLine; if( !pUpper && 0UL==nTopRow ) { @@ -2507,7 +2488,6 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) // In this case, the columns get the correct width even if the // the sum of the relative withs is smaller than the available // width in TWIP. Therfore, we can use the relative width. - // nWidth = nRelWidth > USHRT_MAX ? USHRT_MAX : nRelWidth; } if( nRelWidth != nWidth && nRelWidth && nCols ) @@ -2861,7 +2841,7 @@ void SwXMLTableContext::MakeTable() void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW ) { -//FIXME: here would be a great place to handle XmlId for subtable + //FIXME: here would be a great place to handle XmlId for subtable pLineFmt = GetParentTable()->pLineFmt; pBoxFmt = GetParentTable()->pBoxFmt; nWidth = nW; diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 3423eea0ceb7..cc5c36e4072e 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -46,8 +46,6 @@ namespace com { namespace sun { namespace star { namespace text { class XTextCursor; } } } } - - class SwXMLTableContext : public XMLTextTableContext { OUString aStyleName; diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index 8e1e208334d9..d04345bba744 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -24,9 +24,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; -// --------------------------------------------------------------------- - - class SwXMLBodyContentContext_Impl : public SvXMLImportContext { SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); } diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index 17105e61411c..e3612656635f 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -64,8 +64,6 @@ enum SvEmbeddedObjectTypes SV_EMBEDDED_FRAME }; -// --------------------------------------------------------------------- - SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode( const Reference < XPropertySet >& rPropSet ) const { diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 8acec644cded..c3bc76b7a796 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -62,7 +62,6 @@ #include <svtools/embedhlp.hxx> #include <svl/urihelper.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -71,7 +70,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace xml::sax; - struct XMLServiceMapEntry_Impl { const sal_Char *sFilterService; @@ -955,7 +953,6 @@ void SwXMLTextImportHelper::endAppletOrPlugin( // redlining helper methods // (override to provide the real implementation) - void SwXMLTextImportHelper::RedlineAdd( const OUString& rType, const OUString& rId, @@ -1030,6 +1027,4 @@ void SwXMLTextImportHelper::SetChangesProtectionKey( pRedlineHelper->SetProtectionKey( rKey ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |