diff options
Diffstat (limited to 'sw/source/filter/xml')
39 files changed, 378 insertions, 378 deletions
diff --git a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx index 374d70593d87..15cb576faebf 100644 --- a/sw/source/filter/xml/ForbiddenCharactersEnum.hxx +++ b/sw/source/filter/xml/ForbiddenCharactersEnum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,6 +39,6 @@ enum ForbiddenCharactersEnum SW_FORBIDDEN_CHARACTER_MAX }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 8862af145f90..01e2ff6e401e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ SwDoc* lcl_GetDocViaTunnel( Reference<XTextRange> & rRange ) 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(); @@ -131,7 +131,7 @@ XTextRangeOrNodeIndexPosition::~XTextRangeOrNodeIndexPosition() void XTextRangeOrNodeIndexPosition::Set( Reference<XTextRange> & rRange ) { - xRange = rRange->getStart(); // set bookmark + xRange = rRange->getStart(); // set bookmark if (NULL != pIndex) { delete pIndex; @@ -145,7 +145,7 @@ void XTextRangeOrNodeIndexPosition::Set( SwNodeIndex& rIndex ) delete pIndex; pIndex = new SwNodeIndex(rIndex); - (*pIndex)-- ; // previous node!!! + (*pIndex)-- ; // previous node!!! xRange = NULL; } @@ -186,7 +186,7 @@ void XTextRangeOrNodeIndexPosition::CopyPositionInto(SwPosition& rPos) else { rPos.nNode = *pIndex; - rPos.nNode++; // pIndex points to previous index !!! + rPos.nNode++; // pIndex points to previous index !!! rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(), 0 ); } } @@ -218,9 +218,9 @@ public: RedlineType_t eType; // info fields: - OUString sAuthor; /// change author string - OUString sComment; /// change comment string - util::DateTime aDateTime; /// change DateTime + OUString sAuthor; /// change author string + OUString sComment; /// change comment string + util::DateTime aDateTime; /// change DateTime sal_Bool bMergeLastParagraph; /// the SwRedline::IsDelLastPara flag // each position can may be either empty, an XTextRange, or an SwNodeIndex @@ -558,7 +558,7 @@ void XMLRedlineImportHelper::SetCursor( } void XMLRedlineImportHelper::AdjustStartNodeCursor( - const OUString& rId, /// ID used in RedlineAdd() call + const OUString& rId, /// ID used in RedlineAdd() call sal_Bool /*bStart*/, Reference<XTextRange> & /*rRange*/) { @@ -709,13 +709,13 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( // 2) util::DateTime -> DateTime DateTime aDT; - aDT.SetYear( pRedlineInfo->aDateTime.Year ); - aDT.SetMonth( pRedlineInfo->aDateTime.Month ); - aDT.SetDay( pRedlineInfo->aDateTime.Day ); - aDT.SetHour( pRedlineInfo->aDateTime.Hours ); - aDT.SetMin( pRedlineInfo->aDateTime.Minutes ); - aDT.SetSec( pRedlineInfo->aDateTime.Seconds ); - aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds ); + aDT.SetYear( pRedlineInfo->aDateTime.Year ); + aDT.SetMonth( pRedlineInfo->aDateTime.Month ); + aDT.SetDay( pRedlineInfo->aDateTime.Day ); + aDT.SetHour( pRedlineInfo->aDateTime.Hours ); + aDT.SetMin( pRedlineInfo->aDateTime.Minutes ); + aDT.SetSec( pRedlineInfo->aDateTime.Seconds ); + aDT.Set100Sec( pRedlineInfo->aDateTime.HundredthSeconds ); // 3) recursively convert next redline // ( check presence and sanity of hierarchical redline info ) @@ -731,8 +731,8 @@ SwRedlineData* XMLRedlineImportHelper::ConvertRedline( SwRedlineData* pData = new SwRedlineData(pRedlineInfo->eType, nAuthorId, aDT, pRedlineInfo->sComment, - pNext, // next data (if available) - NULL); // no extra data + pNext, // next data (if available) + NULL); // no extra data return pData; } diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx index f6da99528225..e8e0f1267d8e 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,56 +76,56 @@ class XMLRedlineImportHelper public: XMLRedlineImportHelper( - sal_Bool bIgnoreRedlines, /// ignore redlines mode + sal_Bool bIgnoreRedlines, /// ignore redlines mode - // property sets of model + import info for saving + restoring the + // property sets of model + import info for saving + restoring the // redline mode const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & rModel, const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet> & rImportInfoSet ); + ::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.) - void Add( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment + void Add( + const ::rtl::OUString& rType, /// redline type (insert, del,... ) + const ::rtl::OUString& rId, /// use to identify this redline + const ::rtl::OUString& rAuthor, /// name of the author + const ::rtl::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::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 ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const ::rtl::OUString& rId); /// ID used to RedlineAdd() call /// Set start or end position for a redline in the text body. /// Accepts XTextRange objects. void SetCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call - sal_Bool bStart, /// start or end Range - ::com::sun::star::uno::Reference< /// the actual XTextRange + const ::rtl::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) - sal_Bool bIsOusideOfParagraph); + sal_Bool bIsOusideOfParagraph); /** * Adjust the start (end) position for a redline that begins in a - * start node. It takes the cursor positions _inside_ the redlined + * start node. It takes the cursor positions _inside_ the redlined * element (e.g. section or table). * * We will do sanity checking of the given text range: It will * only be considered valid if it points to the next text node * after the position given in a previous SetCursor */ void AdjustStartNodeCursor( - const ::rtl::OUString& rId, /// ID used in RedlineAdd() call + const ::rtl::OUString& rId, /// ID used in RedlineAdd() call sal_Bool bStart, /// XTextRange _inside_ a table/section ::com::sun::star::uno::Reference< @@ -138,7 +138,7 @@ public: void SetRecordChanges( sal_Bool bRecordChanges ); /// set redline protection key - void SetProtectionKey( + void SetProtectionKey( const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); private: @@ -148,8 +148,8 @@ 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) */ void SaveRedlineMode( diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 180973470216..ff073100ef27 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -274,7 +274,7 @@ sal_Int32 ReadThroughComponent( aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); DBG_ERROR( aError.GetBuffer() ); #endif - + return ERR_SWG_READ_ERROR; } catch( packages::zip::ZipIOException& r) @@ -445,10 +445,10 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) for ( USHORT n = 1; n < rColls.Count(); ++n ) { SwTxtFmtColl* pColl = rColls[ n ]; - //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei + //if ( pColl->GetOutlineLevel() != NO_NUMBERING ) //#outline level zhaojianwei if ( pColl->IsAssignedToListLevelOfOutlineStyle() ) { - // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true; + // aOutlineLevelAssigned[ pColl->GetOutlineLevel() ] = true; aOutlineLevelAssigned[ pColl->GetAssignedOutlineStyleLevel() ] = true;//<-end,zhaojianwei } @@ -851,7 +851,7 @@ ULONG XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, const S } } - rDoc.acquire(); // prevent deletion + rDoc.acquire(); // prevent deletion sal_uInt32 nRet = 0; // save redline mode into import info property set diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 4a6db2d80be0..9a264742b498 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -204,34 +204,34 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, pStatusBarItem->GetValue() >>= xStatusIndicator; } -// try -// { -// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel()); -// if (xModel.is()) -// { -// uno::Sequence< beans::PropertyValue > xMediaDescr -// uno::Reference<frame::XController> xController( -// xModel->getCurrentController()); -// if( xController.is()) -// { -// uno::Reference<frame::XFrame> xFrame( xController->getFrame()); -// if( xFrame.is()) -// { -// uno::Reference<task::XStatusIndicatorFactory> xFactory( -// xFrame, uno::UNO_QUERY ); -// if( xFactory.is()) -// { -// xStatusIndicator = -// xFactory->createStatusIndicator(); -// } -// } -// } -// } -// } -// catch( const RuntimeException& ) -// { -// xStatusIndicator = 0; -// } +// try +// { +// uno::Reference<frame::XModel> xModel( pDoc->GetDocShell()->GetModel()); +// if (xModel.is()) +// { +// uno::Sequence< beans::PropertyValue > xMediaDescr +// uno::Reference<frame::XController> xController( +// xModel->getCurrentController()); +// if( xController.is()) +// { +// uno::Reference<frame::XFrame> xFrame( xController->getFrame()); +// if( xFrame.is()) +// { +// uno::Reference<task::XStatusIndicatorFactory> xFactory( +// xFrame, uno::UNO_QUERY ); +// if( xFactory.is()) +// { +// xStatusIndicator = +// xFactory->createStatusIndicator(); +// } +// } +// } +// } +// } +// catch( const RuntimeException& ) +// { +// xStatusIndicator = 0; +// } // set progress range and start status indicator sal_Int32 nProgressRange(1000000); @@ -472,8 +472,8 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg, if( pDoc->GetRootFrm() && pDoc->GetDocStat().nPage > 1 && !(bOrganizerMode || bBlock || bErr) ) { -// DBG_ASSERT( !pDoc->GetDocStat().bModified, -// "doc stat is modified!" ); +// DBG_ASSERT( !pDoc->GetDocStat().bModified, +// "doc stat is modified!" ); OUString sStreamName( RTL_CONSTASCII_USTRINGPARAM("layout-cache") ); try { diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx index a622d59a362d..f2e1020b3199 100644 --- a/sw/source/filter/xml/wrtxml.hxx +++ b/sw/source/filter/xml/wrtxml.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,18 +72,18 @@ private: /// the component we export const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> & xComponent, - const sal_Char* pStreamName, /// the stream name + const sal_Char* pStreamName, /// the stream name /// service factory for pServiceName const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rFactory, - const sal_Char* pServiceName, /// service name of the component + 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 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc, - sal_Bool bPlainStream ); /// neither compress nor encrypt + sal_Bool bPlainStream ); /// neither compress nor encrypt /// write a single output stream /// (to be called either directly or by WriteThroughComponent(...)) @@ -102,6 +102,6 @@ private: }; -#endif // _WRTXML_HXX +#endif // _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 807159040be4..06dcfe133b94 100644 --- a/sw/source/filter/xml/xmlbrsh.cxx +++ b/sw/source/filter/xml/xmlbrsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,13 +71,13 @@ enum SvXMLTokenMapAttrs static __FAR_DATA SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] = { - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, - { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, - { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE }, - { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW }, - { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION }, - { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT }, - { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_BGIMG_HREF }, + { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_BGIMG_TYPE }, + { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_BGIMG_ACTUATE }, + { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_BGIMG_SHOW }, + { XML_NAMESPACE_STYLE, XML_POSITION, XML_TOK_BGIMG_POSITION }, + { XML_NAMESPACE_STYLE, XML_REPEAT, XML_TOK_BGIMG_REPEAT }, + { XML_NAMESPACE_STYLE, XML_FILTER_NAME, XML_TOK_BGIMG_FILTER }, XML_TOKEN_MAP_END }; @@ -228,7 +228,7 @@ void SwXMLBrushItemExport::exportXML( const SvxBrushItem& rItem ) { GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sValue ); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); - // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) ); + // AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, ACP2WS(sXML_embed) ); GetExport().AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); } diff --git a/sw/source/filter/xml/xmlbrshe.hxx b/sw/source/filter/xml/xmlbrshe.hxx index b0795a9d0869..e6506e2a4453 100644 --- a/sw/source/filter/xml/xmlbrshe.hxx +++ b/sw/source/filter/xml/xmlbrshe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,21 +38,21 @@ class SwXMLExport; class SwXMLBrushItemExport { - SwXMLExport& rExport; + SwXMLExport& rExport; protected: - + SwXMLExport& GetExport() { return rExport; } public: SwXMLBrushItemExport( SwXMLExport& rExport ); ~SwXMLBrushItemExport(); - + // core API void exportXML( const SvxBrushItem& rItem ); }; -#endif // _XMLBRSHE_HXX +#endif // _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 fb0f54f21bf3..af1ec4b2ddc4 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ class SwXMLBrushItemImportContext : public SvXMLImportContext { private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xBase64Stream; - SvxBrushItem *pItem; - + SvxBrushItem *pItem; + void ProcessAttrs( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, @@ -59,7 +59,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, - const SvxBrushItem& rItem ); + const SvxBrushItem& rItem ); SwXMLBrushItemImportContext( SvXMLImport& rImport, @@ -68,7 +68,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const SvXMLUnitConverter& rUnitConv, - sal_uInt16 nWhich ); + sal_uInt16 nWhich ); virtual ~SwXMLBrushItemImportContext(); @@ -83,6 +83,6 @@ public: }; -#endif // _XMLBRSHI_HXX +#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 31555e592204..c81731fea397 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ void SwXMLExport::SetCurPaM( SwPaM& rPaM, sal_Bool bWhole, sal_Bool bTabOnly ) SwXMLExport::SwXMLExport( const uno::Reference< lang::XMultiServiceFactory > xServiceFactory, sal_uInt16 nExportFlags) -: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ), +: SvXMLExport( xServiceFactory, MAP_INCH, XML_TEXT, nExportFlags ), #ifdef XML_CORE_API pCurPaM( 0 ), pOrigPaM( &rPaM ), @@ -160,7 +160,7 @@ SwXMLExport::SwXMLExport( const Reference< XGraphicObjectResolver > & rEmbeddedGrfObjs, sal_Bool bExpWholeDoc, sal_Bool bExpFirstTableOnly, sal_Bool bShowProg ) -: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs, +: SvXMLExport( xServiceFactory, rFileName, rHandler, rModel, rEmbeddedGrfObjs, SW_MOD()->GetMetric( rPaM.GetDoc()->get(IDocumentSettingAccess::HTML_MODE) ) ), pCurPaM( 0 ), pOrigPaM( &rPaM ), @@ -292,7 +292,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) SfxObjectShell* pObjSh = pDoc->GetDocShell(); if( pObjSh ) - pObjSh->UpdateDocInfoForSave(); // update information + pObjSh->UpdateDocInfoForSave(); // update information } if( bShowProgress ) { @@ -321,7 +321,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) nRef += pDoc->GetCharFmts()->Count() - 1; nRef += pDoc->GetFrmFmts()->Count() - 1; nRef += pDoc->GetTxtFmtColls()->Count() - 1; -// nRef += pDoc->GetPageDescCnt(); +// nRef += pDoc->GetPageDescCnt(); nRef *= 2; // for the above styles, xmloff will increment by 2! // #i93174#: count all paragraphs for the progress bar nRef += aDocStat.nAllPara; // 1: only content, no autostyle @@ -444,7 +444,7 @@ __EXPORT SwXMLExport::~SwXMLExport() void SwXMLExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created SvXMLExport::_ExportFontDecls(); } @@ -814,8 +814,8 @@ Reference< XInterface > SAL_CALL SwXMLExportStyles_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLExport( - // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | - // EXPORT_FONTDECLS ); + // EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | + // EXPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLExport( rSMgr, EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS|EXPORT_OASIS ); @@ -841,8 +841,8 @@ Reference< XInterface > SAL_CALL SwXMLExportContent_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLExport( - // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | - // EXPORT_FONTDECLS ); + // EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | + // EXPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLExport( rSMgr, EXPORT_AUTOSTYLES | EXPORT_CONTENT | EXPORT_SCRIPTS | @@ -978,7 +978,7 @@ void SwXMLExport::ExportCurPaM( sal_Bool bExportWholePaM ) else if( pNd == &pDoc->GetNodes().GetEndOfContent() ) break; - pCurPaM->GetPoint()->nNode++; // next node + pCurPaM->GetPoint()->nNode++; // next node sal_uInt32 nPos = pCurPaM->GetPoint()->nNode.GetIndex(); diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 7b081378236a..e613d6db5aa3 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,24 +57,24 @@ class SwXMLExport : public SvXMLExport friend class SwXMLExpContext; #ifdef XML_CORE_API - SwPaM *pCurPaM; // the current PaM - SwPaM *pOrigPaM; // the original PaM + SwPaM *pCurPaM; // the current PaM + SwPaM *pOrigPaM; // the original PaM #endif - SvXMLUnitConverter *pTwipUnitConv; + SvXMLUnitConverter *pTwipUnitConv; - SvXMLExportItemMapper *pTableItemMapper; - SwXMLTableLinesCache_Impl *pTableLines; + SvXMLExportItemMapper *pTableItemMapper; + SwXMLTableLinesCache_Impl *pTableLines; - SvXMLItemMapEntriesRef xTableItemMap; - SvXMLItemMapEntriesRef xTableRowItemMap; - SvXMLItemMapEntriesRef xTableCellItemMap; + SvXMLItemMapEntriesRef xTableItemMap; + SvXMLItemMapEntriesRef xTableRowItemMap; + SvXMLItemMapEntriesRef xTableCellItemMap; UniReference < XMLPropertySetMapper > xParaPropMapper; - sal_Bool bExportWholeDoc : 1;// export whole document? - sal_Bool bBlock : 1; // export text block? - sal_Bool bExportFirstTableOnly : 1; - sal_Bool bShowProgress : 1; + sal_Bool bExportWholeDoc : 1;// export whole document? + sal_Bool bBlock : 1; // export text block? + sal_Bool bExportFirstTableOnly : 1; + sal_Bool bShowProgress : 1; sal_Bool bSavedShowChanges : 1; void _InitItemExport(); @@ -187,6 +187,6 @@ inline const SvXMLUnitConverter& SwXMLExport::GetTwipUnitConverter() const } -#endif // _XMLEXP_HXX +#endif // _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 048c6996847e..4f295026ae6f 100644 --- a/sw/source/filter/xml/xmlexpit.cxx +++ b/sw/source/filter/xml/xmlexpit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -508,23 +508,23 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue( /** xml -> MemberId - border-padding ALL_BORDER_PADDING - border-padding-before LEFT_BORDER_PADDING - border-padding-after RIGHT_BORDER_PADDING - border-padding-start TOP_BORDER_PADDING - border-padding-end BOTTOM_BORDER_PADDING - - border ALL_BORDER - border-before LEFT_BORDER - border-after RIGHT_BORDER - border-start TOP_BORDER - border-end BOTTOM_BORDER - - border-line-width ALL_BORDER_LINE_WIDTH - border-line-width-before LEFT_BORDER_LINE_WIDTH - border-line-width-after RIGHT_BORDER_LINE_WIDTH - border-line-width-start TOP_BORDER_LINE_WIDTH - border-line-width-end BOTTOM_BORDER_LINE_WIDTH + border-padding ALL_BORDER_PADDING + border-padding-before LEFT_BORDER_PADDING + border-padding-after RIGHT_BORDER_PADDING + border-padding-start TOP_BORDER_PADDING + border-padding-end BOTTOM_BORDER_PADDING + + border ALL_BORDER + border-before LEFT_BORDER + border-after RIGHT_BORDER + border-start TOP_BORDER + border-end BOTTOM_BORDER + + border-line-width ALL_BORDER_LINE_WIDTH + border-line-width-before LEFT_BORDER_LINE_WIDTH + border-line-width-after RIGHT_BORDER_LINE_WIDTH + border-line-width-start TOP_BORDER_LINE_WIDTH + border-line-width-end BOTTOM_BORDER_LINE_WIDTH */ const SvxBorderLine* pLeft = pBox->GetLeft(); diff --git a/sw/source/filter/xml/xmlexpit.hxx b/sw/source/filter/xml/xmlexpit.hxx index 108d8a50f0bf..e622a6c1763b 100644 --- a/sw/source/filter/xml/xmlexpit.hxx +++ b/sw/source/filter/xml/xmlexpit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,12 +33,12 @@ #include <tools/ref.hxx> #include "xmlitmap.hxx" -#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items -#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from +#define XML_EXPORT_FLAG_DEFAULTS 0x0001 // export also default items +#define XML_EXPORT_FLAG_DEEP 0x0002 // export also items from // parent item sets -#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element +#define XML_EXPORT_FLAG_EMPTY 0x0004 // export attribs element // even if its empty -#define XML_EXPORT_FLAG_IGN_WS 0x0008 +#define XML_EXPORT_FLAG_IGN_WS 0x0008 namespace rtl { class OUString; } class SvXMLUnitConverter; @@ -123,7 +123,7 @@ public: inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries ); - static sal_Bool QueryXMLValue( const SfxPoolItem& rItem, + static sal_Bool QueryXMLValue( const SfxPoolItem& rItem, ::rtl::OUString& rValue, sal_uInt16 nMemberId, const SvXMLUnitConverter& rUnitConverter ); }; @@ -134,6 +134,6 @@ SvXMLExportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries ) mrMapEntries = rMapEntries; } -#endif // _XMLITMPR_HXX +#endif // _XMLITMPR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 3e89060e642b..ff83864c8569 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -109,7 +109,7 @@ inline sal_Bool SwXMLConditionParser_Impl::SkipWS() inline sal_Bool SwXMLConditionParser_Impl::MatchChar( sal_Unicode c ) { sal_Bool bRet = sal_False; - if( nPos < nLength && c == sInput[nPos] ) + if( nPos < nLength && c == sInput[nPos] ) { nPos++; bRet = sal_True; @@ -286,7 +286,7 @@ SV_DECL_PTRARR( SwXMLConditions_Impl, SwXMLConditionContextPtr, 5, 2 ) class SwXMLTextStyleContext_Impl : public XMLTextStyleContext { - SwXMLConditions_Impl *pConditions; + SwXMLConditions_Impl *pConditions; protected: @@ -450,16 +450,16 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite ) class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext { - OUString sMasterPageName; - SfxItemSet *pItemSet; + OUString sMasterPageName; + SfxItemSet *pItemSet; SwXMLTextStyleContext_Impl *pTextStyle; SvXMLStylesContext &rStyles; - OUString sDataStyleName; + OUString sDataStyleName; - sal_Bool bHasMasterPageName : 1; - sal_Bool bPageDescConnected : 1; - sal_Bool bDataStyleIsResolved; + sal_Bool bHasMasterPageName : 1; + sal_Bool bPageDescConnected : 1; + sal_Bool bDataStyleIsResolved; SvXMLImportContext *CreateItemSetContext( sal_uInt16 nPrefix, @@ -524,7 +524,7 @@ void SwXMLItemSetStyleContext_Impl::SetAttribute( sal_uInt16 nPrefixKey, if (rValue.getLength() > 0) { sDataStyleName = rValue; - bDataStyleIsResolved = sal_False; // needs to be resolved + bDataStyleIsResolved = sal_False; // needs to be resolved } } else diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index e815ca96e784..a18c43e320bd 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx index ea9ec6b3d404..c86306cfa82e 100644 --- a/sw/source/filter/xml/xmlfonte.cxx +++ b/sw/source/filter/xml/xmlfonte.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 3f34c6ae6d03..a42cfa8092aa 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,14 +116,14 @@ enum SwXMLDocTokens static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, + { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, { XML_NAMESPACE_XFORMS, XML_MODEL, XML_TOK_DOC_XFORMS }, XML_TOKEN_MAP_END }; @@ -240,10 +240,10 @@ SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext( pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList, sal_True ); break; -// case XML_TOK_DOC_USESTYLES: -// pContext = GetSwImport().CreateUseStylesContext( rLocalName, -// xAttrList ); -// break; +// case XML_TOK_DOC_USESTYLES: +// pContext = GetSwImport().CreateUseStylesContext( rLocalName, +// xAttrList ); +// break; case XML_TOK_DOC_MASTERSTYLES: pContext = GetSwImport().CreateMasterStylesContext( rLocalName, xAttrList ); @@ -449,7 +449,7 @@ SvXMLImportContext *SwXMLImport::CreateContext( SwXMLImport::SwXMLImport( const uno::Reference< lang::XMultiServiceFactory > xServiceFactory, sal_uInt16 nImportFlags) -: SvXMLImport( xServiceFactory, nImportFlags ), +: SvXMLImport( xServiceFactory, nImportFlags ), pSttNdIdx( 0 ), pTableItemMapper( 0 ), pDocElemTokenMap( 0 ), @@ -482,7 +482,7 @@ SwXMLImport::SwXMLImport( const uno::Reference< frame::XModel > & rModel, const uno::Reference< document::XGraphicObjectResolver > & rEGO, SvStorage *pPkg ) -: SvXMLImport( xServiceFactory, rModel, rEGO ), +: SvXMLImport( xServiceFactory, rModel, rEGO ), bLoadDoc( bLDoc ), bInsert( bInsertMode ), nStyleFamilyMask( nStyleFamMask ), @@ -568,7 +568,7 @@ OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCursor >& rT if( !xCrsrTunnel.is() ) return 0; OTextCursorHelper *pTxtCrsr = reinterpret_cast< OTextCursorHelper *>( - sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); + sal::static_int_cast< sal_IntPtr >( xCrsrTunnel->getSomething( OTextCursorHelper::getUnoTunnelId() ))); OSL_ENSURE( pTxtCrsr, "SwXTextCursor missing" ); return pTxtCrsr; } @@ -921,10 +921,10 @@ void SwXMLImport::endDocument( void ) if( pNextNd->CanJoinPrev(/* &pPos->nNode*/ ) && *pSttNdIdx != pPos->nNode ) { -// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode(); -// pPos->nContent.Assign( pPrevNd, 0 ); -// pPaM->SetMark(); pPaM->DeleteMark(); -// pPrevNd->JoinNext(); +// SwTxtNode* pPrevNd = pPos->nNode.GetNode().GetTxtNode(); +// pPos->nContent.Assign( pPrevNd, 0 ); +// pPaM->SetMark(); pPaM->DeleteMark(); +// pPrevNd->JoinNext(); pNextNd->JoinPrev(); } } @@ -1604,8 +1604,8 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLImport( - // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | - // IMPORT_FONTDECLS ); + // IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | + // IMPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLImport( rSMgr, IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES | @@ -1632,11 +1632,11 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance( { // #110680# //return (cppu::OWeakObject*)new SwXMLImport( - // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | - // IMPORT_FONTDECLS ); + // IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + // IMPORT_FONTDECLS ); return (cppu::OWeakObject*)new SwXMLImport( rSMgr, - IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | + IMPORT_AUTOSTYLES | IMPORT_CONTENT | IMPORT_SCRIPTS | IMPORT_FONTDECLS ); } diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 013df52e6b07..65ac50e127fb 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -2,7 +2,7 @@ /************************************************************************ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,48 +55,48 @@ namespace SwImport { class SwXMLImport: public SvXMLImport { - SwNodeIndex *pSttNdIdx; - - SvXMLUnitConverter *pTwipUnitConv; - SvXMLImportItemMapper *pTableItemMapper;// paragraph item import - SvXMLTokenMap *pDocElemTokenMap; - SvXMLTokenMap *pTableElemTokenMap; - SvXMLTokenMap *pTableCellAttrTokenMap; - SvXMLGraphicHelper *pGraphicResolver; - SvXMLEmbeddedObjectHelper *pEmbeddedResolver; - - SvXMLItemMapEntriesRef xTableItemMap; - SvXMLItemMapEntriesRef xTableColItemMap; - SvXMLItemMapEntriesRef xTableRowItemMap; - SvXMLItemMapEntriesRef xTableCellItemMap; - SvStorageRef xPackage; + SwNodeIndex *pSttNdIdx; + + SvXMLUnitConverter *pTwipUnitConv; + SvXMLImportItemMapper *pTableItemMapper;// paragraph item import + SvXMLTokenMap *pDocElemTokenMap; + SvXMLTokenMap *pTableElemTokenMap; + SvXMLTokenMap *pTableCellAttrTokenMap; + SvXMLGraphicHelper *pGraphicResolver; + SvXMLEmbeddedObjectHelper *pEmbeddedResolver; + + SvXMLItemMapEntriesRef xTableItemMap; + SvXMLItemMapEntriesRef xTableColItemMap; + SvXMLItemMapEntriesRef xTableRowItemMap; + SvXMLItemMapEntriesRef xTableCellItemMap; + SvStorageRef xPackage; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xLateInitSettings; - sal_uInt16 nStyleFamilyMask;// Mask of styles to load - sal_Bool bLoadDoc : 1; // Load doc or styles only - sal_Bool bInsert : 1; // Insert mode. If styles are + sal_uInt16 nStyleFamilyMask;// Mask of styles to load + sal_Bool bLoadDoc : 1; // Load doc or styles only + sal_Bool bInsert : 1; // Insert mode. If styles are // loaded only sal_False means that // existing styles will be // overwritten. - sal_Bool bBlock : 1; // Load text block - sal_Bool bAutoStylesValid : 1; - sal_Bool bShowProgress : 1; - sal_Bool bOrganizerMode : 1; + sal_Bool bBlock : 1; // Load text block + sal_Bool bAutoStylesValid : 1; + sal_Bool bShowProgress : 1; + sal_Bool bOrganizerMode : 1; sal_Bool bInititedXForms : 1; - sal_Bool bPreserveRedlineMode; + sal_Bool bPreserveRedlineMode; - void _InitItemImport(); - void _FinitItemImport(); - void UpdateTxtCollConditions( SwDoc *pDoc ); + void _InitItemImport(); + void _FinitItemImport(); + void UpdateTxtCollConditions( SwDoc *pDoc ); - void setTextInsertMode( + void setTextInsertMode( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rInsertPos ); - void setStyleInsertMode( sal_uInt16 nFamilies, + void setStyleInsertMode( sal_uInt16 nFamilies, sal_Bool bOverwrite ); - void setBlockMode(); - void setOrganizerMode(); + void setBlockMode(); + void setOrganizerMode(); protected: @@ -121,12 +121,12 @@ public: #ifdef XML_CORE_API // #110680# - SwXMLImport( + SwXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, - SwDoc& rDoc, - const SwPaM& rPaM, + SwDoc& rDoc, + const SwPaM& rPaM, sal_Bool bLoadDoc, - sal_Bool bInsertMode, + sal_Bool bInsertMode, sal_uInt16 nStyleFamMask, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > &, @@ -152,8 +152,8 @@ public: ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - void InsertStyles( sal_Bool bAuto ); - void FinishStyles(); + void InsertStyles( sal_Bool bAuto ); + void FinishStyles(); // namespace office @@ -225,10 +225,10 @@ inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const inline void SwXMLImport::SetProgressValue( sal_Int32 nValue ) { - if ( bShowProgress ) - GetProgressBarHelper()->SetValue(nValue); + if ( bShowProgress ) + GetProgressBarHelper()->SetValue(nValue); } -#endif // _XMLIMP_HXX +#endif // _XMLIMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx index f3eac88edfdf..05ee1e1cdfc6 100644 --- a/sw/source/filter/xml/xmlimpit.cxx +++ b/sw/source/filter/xml/xmlimpit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -124,9 +124,9 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet, if( 0 == (pEntry->nMemberId&MID_SW_FLAG_SPECIAL_ITEM_IMPORT) ) { -// bPut = pNewItem->importXML( rValue, -// pEntry->nMemberId & MID_SW_FLAG_MASK, -// rUnitConverter ); +// bPut = pNewItem->importXML( rValue, +// pEntry->nMemberId & MID_SW_FLAG_MASK, +// rUnitConverter ); bPut = PutXMLValue( *pNewItem, rValue, static_cast<sal_uInt16>( pEntry->nMemberId & MID_SW_FLAG_MASK ), rUnitConverter ); @@ -528,7 +528,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_4 ) ) return sal_False; - + // #i61946: accept line style even it's not part of our "normal" set of line styles sal_uInt16 nWidth = 0; @@ -641,7 +641,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( switch( nMemberId ) { case MID_BACK_COLOR: - if( IsXMLToken( rValue, XML_TRANSPARENT ) ) + if( IsXMLToken( rValue, XML_TRANSPARENT ) ) { pBrush->GetColor().SetTransparency(0xff); bOk = sal_True; @@ -663,7 +663,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( if( GPOS_NONE == eOldGraphicPos && GPOS_NONE != pBrush->GetGraphicPos() ) pBrush->SetGraphicPos( GPOS_TILED ); - bOk = sal_True ; + bOk = sal_True ; } break; @@ -794,7 +794,7 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue( { SfxBoolItem* pSplit = PTR_CAST(SfxBoolItem, &rItem); DBG_ASSERT( pSplit != NULL, "Wrong Which-ID" ); - + if( IsXMLToken( rValue, XML_AUTO ) || IsXMLToken( rValue, XML_TRUE ) ) { diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx index 0734dbbf67bc..1c4a8e45f680 100644 --- a/sw/source/filter/xml/xmlimpit.hxx +++ b/sw/source/filter/xml/xmlimpit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,6 +108,6 @@ SvXMLImportItemMapper::getMapEntries() const } -#endif // _XMLIMPIT_HXX +#endif // _XMLIMPIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index ff5dc27764d1..2d1c8ee5675d 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 1922f2238b39..a384253ddeb3 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ struct SvXMLItemMapEntry; class SvXMLItemSetContext : public SvXMLImportContext { protected: - SfxItemSet &rItemSet; - const SvXMLImportItemMapper &rIMapper; - const SvXMLUnitConverter &rUnitConv; + SfxItemSet &rItemSet; + const SvXMLImportItemMapper &rIMapper; + const SvXMLUnitConverter &rUnitConv; public: @@ -77,6 +77,6 @@ public: }; -#endif // _XMLITEM_HXX +#endif // _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 48efcc45b3d3..c69da83f7ba1 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index ace9205e322c..dab53a3bfc33 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx index 5bc92baa071c..d50c96aa9e6e 100644 --- a/sw/source/filter/xml/xmlitemm.cxx +++ b/sw/source/filter/xml/xmlitemm.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,13 +55,13 @@ SvXMLItemMapEntry aXMLTableItemMap[] = // RES_FILL_ORDER // not required // RES_FRM_SIZE - M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ), - M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ), + M_E_SE( STYLE, WIDTH, RES_FRM_SIZE, MID_FRMSIZE_WIDTH ), + M_E_SE( STYLE, REL_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_WIDTH ), // RES_PAPER_BIN // not required // TODO: RES_LR_SPACE - M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), - M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), + M_E_SE( FO, MARGIN_LEFT, RES_LR_SPACE, MID_L_MARGIN ), + M_E_SE( FO, MARGIN_RIGHT, RES_LR_SPACE, MID_R_MARGIN ), // RES_UL_SPACE MAP_ENTRY( FO, MARGIN_TOP, RES_UL_SPACE, MID_UP_MARGIN ), MAP_ENTRY( FO, MARGIN_BOTTOM, RES_UL_SPACE, MID_LO_MARGIN ), @@ -131,7 +131,7 @@ SvXMLItemMapEntry aXMLTableItemMap[] = SvXMLItemMapEntry aXMLTableColItemMap[] = { - M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ), + M_E_SI( STYLE, COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_COL_WIDTH ), MAP_ENTRY( STYLE, REL_COLUMN_WIDTH, RES_FRM_SIZE, MID_FRMSIZE_REL_COL_WIDTH ), M_END }; diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 11c925cec7bf..cdea43cfb211 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -319,23 +319,23 @@ void lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, const struct SvXMLEnumMapEntry psXML_BrushRepeat[] = { - { XML_BACKGROUND_REPEAT, GPOS_TILED }, - { XML_BACKGROUND_NO_REPEAT, GPOS_MM }, - { XML_BACKGROUND_STRETCH, GPOS_AREA }, + { XML_BACKGROUND_REPEAT, GPOS_TILED }, + { XML_BACKGROUND_NO_REPEAT, GPOS_MM }, + { XML_BACKGROUND_STRETCH, GPOS_AREA }, { XML_TOKEN_INVALID, 0 } }; const struct SvXMLEnumMapEntry psXML_BrushHoriPos[] = { - { XML_LEFT, GPOS_LM }, - { XML_RIGHT, GPOS_RM }, + { XML_LEFT, GPOS_LM }, + { XML_RIGHT, GPOS_RM }, { XML_TOKEN_INVALID, 0 } }; const struct SvXMLEnumMapEntry psXML_BrushVertPos[] = { - { XML_TOP, GPOS_MT }, - { XML_BOTTOM, GPOS_MB }, + { XML_TOP, GPOS_MT }, + { XML_BOTTOM, GPOS_MB }, { XML_TOKEN_INVALID, 0 } }; diff --git a/sw/source/filter/xml/xmlithlp.hxx b/sw/source/filter/xml/xmlithlp.hxx index 76683e0046d4..f897f9915d8b 100644 --- a/sw/source/filter/xml/xmlithlp.hxx +++ b/sw/source/filter/xml/xmlithlp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index 978805643080..c423355aeafa 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,34 +33,34 @@ #include <tools/ref.hxx> #include <xmloff/xmltoken.hxx> -namespace rtl { class OUString; } +namespace rtl { class OUString; } -#define MID_SW_FLAG_MASK 0x0000ffff +#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 -#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000 -#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export -#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export -#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000 -#define MID_SW_FLAG_ELEMENT_ITEM_EXPORT 0x04000000 -#define MID_SW_FLAG_ELEMENT_ITEM 0x0c000000 // both 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 +#define MID_SW_FLAG_NO_ITEM_EXPORT 0x10000000 +#define MID_SW_FLAG_SPECIAL_ITEM 0xa0000000 // both import and export +#define MID_SW_FLAG_NO_ITEM 0x50000000 // both import and export +#define MID_SW_FLAG_ELEMENT_ITEM_IMPORT 0x08000000 +#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 wich this item + sal_uInt16 nNameSpace; // declares the Namespace in wich this item // exists enum ::xmloff::token::XMLTokenEnum eLocalName; - // the local name for the item inside + // the local name for the item inside // the Namespace (as an XMLTokenEnum) - sal_uInt16 nWhichId; // the WichId to identify the item + sal_uInt16 nWhichId; // the WichId to identify the item // in the pool - sal_uInt32 nMemberId; // the memberid specifies wich part + sal_uInt32 nMemberId; // the memberid specifies wich part // of the item should be imported or // exported with this Namespace // and localName @@ -94,6 +94,6 @@ SV_DECL_REF( SvXMLItemMapEntries ) SV_IMPL_REF( SvXMLItemMapEntries ) -#endif // _XMLITMAP_HXX +#endif // _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 c0edce67c1bf..5cedf38dc8f1 100644 --- a/sw/source/filter/xml/xmlitmpr.cxx +++ b/sw/source/filter/xml/xmlitmpr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,12 +62,12 @@ SvXMLItemMapEntries::~SvXMLItemMapEntries() delete mpImpl; } -SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace, +SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace, const OUString& rString, SvXMLItemMapEntry* pStartAt /* = NULL */ ) const { - SvXMLItemMapEntry* pMap = - (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ? + SvXMLItemMapEntry* pMap = + (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ? &(pStartAt[1]) : mpImpl->mpEntries; while( pMap && (pMap->eLocalName != XML_TOKEN_INVALID) ) { @@ -87,7 +87,7 @@ SvXMLItemMapEntry* SvXMLItemMapEntries::getByIndex( UINT16 nIndex ) const UINT16 SvXMLItemMapEntries::getCount() const { - return mpImpl->mnCount; + return mpImpl->mnCount; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 62b5e3bff91e..a0f23c4d46f5 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,13 +100,13 @@ enum SvXMLTokenMapAttrs /* static __FAR_DATA SvXMLTokenMapEntry aMetaStatAttrTokenMap[] = { - { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE }, - { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE }, - { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE }, - { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA }, - { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE }, - { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD }, - { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR }, + { XML_NAMESPACE_META, XML_TABLE_COUNT, XML_TOK_META_STAT_TABLE }, + { XML_NAMESPACE_META, XML_IMAGE_COUNT, XML_TOK_META_STAT_IMAGE }, + { XML_NAMESPACE_META, XML_OBJECT_COUNT, XML_TOK_META_STAT_OLE }, + { XML_NAMESPACE_META, XML_PARAGRAPH_COUNT, XML_TOK_META_STAT_PARA }, + { XML_NAMESPACE_META, XML_PAGE_COUNT, XML_TOK_META_STAT_PAGE }, + { XML_NAMESPACE_META, XML_WORD_COUNT, XML_TOK_META_STAT_WORD }, + { XML_NAMESPACE_META, XML_CHARACTER_COUNT, XML_TOK_META_STAT_CHAR }, XML_TOKEN_MAP_END }; */ diff --git a/sw/source/filter/xml/xmlscript.cxx b/sw/source/filter/xml/xmlscript.cxx index cc9d683a2818..8fe25c7cf726 100644 --- a/sw/source/filter/xml/xmlscript.cxx +++ b/sw/source/filter/xml/xmlscript.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 04b458eabfc5..bd3b8662f20b 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,8 +77,8 @@ using table::XCell; class SwXMLTableColumn_Impl : public SwWriteTableCol { - OUString sStyleName; - sal_uInt32 nRelWidth; + OUString sStyleName; + sal_uInt32 nRelWidth; public: @@ -117,9 +117,9 @@ IMPL_CONTAINER_SORT( SwXMLTableColumnsSortByWidth_Impl, SwXMLTableColumn_Impl, class SwXMLTableLines_Impl { - SwXMLTableColumns_Impl aCols; - const SwTableLines *pLines; - sal_uInt32 nWidth; + SwXMLTableColumns_Impl aCols; + const SwTableLines *pLines; + sal_uInt32 nWidth; public: @@ -385,10 +385,10 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt, // order is: -/-/-/num, // -/-/box/-, --/-/box/num, - // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num, - // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num, - // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-, - // vert/brush/box/num + // -/brush/-/-, -/brush/-/num, -/brush/box/-, -/brush/box/num, + // vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num, + // vert/brush/-/-, vert/brush/-/num, vert/brush/box/-, + // vert/brush/box/num sal_uInt32 nCount2 = Count(); sal_Bool bInsert = sal_True; sal_uInt32 i; @@ -605,7 +605,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, const SwXMLTableColumns_Impl& rCols = pLines->GetColumns(); sal_uInt16 nCPos = 0U; sal_uInt16 nColumns = rCols.Count(); - for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ ) + for( sal_uInt16 nColumn=0U; nColumn<nColumns; nColumn++ ) { SwXMLTableColumn_Impl *pColumn = rCols[nColumn]; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index ec2db6ae38d5..86bbe4ab701e 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,12 +114,12 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = { { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, { XML_NAMESPACE_OFFICE, XML_DDE_SOURCE, XML_TOK_OFFICE_DDE_SOURCE }, @@ -128,7 +128,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTableElemTokenMap[] = // supported in Writer (they are Calc-only features), so we // support column groups by simply using the <table:table-columns> // token for column groups, too. - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS }, XML_TOKEN_MAP_END }; @@ -175,17 +175,17 @@ class SwXMLTableCell_Impl OUString mXmlId; - OUString sFormula; // cell formula; valid if length > 0 - double dValue; // formula value + OUString sFormula; // cell formula; valid if length > 0 + double dValue; // formula value - SvXMLImportContextRef xSubTable; + SvXMLImportContextRef xSubTable; const SwStartNode *pStartNode; sal_uInt32 nRowSpan; sal_uInt32 nColSpan; sal_Bool bProtected : 1; - sal_Bool bHasValue; // determines whether dValue attribute is valid + sal_Bool bHasValue; // determines whether dValue attribute is valid sal_Bool mbCovered; sal_Bool mbTextValue; @@ -403,19 +403,19 @@ class SwXMLTableCellContext_Impl : public SvXMLImportContext OUString sSaveParaDefault; OUString mXmlId; - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; double fValue; sal_Bool bHasValue; sal_Bool bHasTextValue; sal_Bool bProtect; - sal_uInt32 nRowSpan; - sal_uInt32 nColSpan; - sal_uInt32 nColRepeat; + sal_uInt32 nRowSpan; + sal_uInt32 nColSpan; + sal_uInt32 nColRepeat; - sal_Bool bHasTextContent : 1; - sal_Bool bHasTableContent : 1; + sal_Bool bHasTextContent : 1; + sal_Bool bHasTableContent : 1; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -724,7 +724,7 @@ void SwXMLTableCellContext_Impl::EndElement() class SwXMLTableColContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -811,7 +811,7 @@ SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl() class SwXMLTableColsContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; sal_Bool bHeader; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -872,9 +872,9 @@ SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext( class SwXMLTableRowContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; - sal_uInt32 nRowRepeat; + sal_uInt32 nRowRepeat; SwXMLTableContext *GetTable() { return (SwXMLTableContext *)&xMyTable; } @@ -994,7 +994,7 @@ SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( class SwXMLTableRowsContext_Impl : public SvXMLImportContext { - SvXMLImportContextRef xMyTable; + SvXMLImportContextRef xMyTable; sal_Bool bHeader; @@ -1076,11 +1076,11 @@ public: virtual void StartElement( const Reference<xml::sax::XAttributeList> & xAttrList); - OUString& GetConnectionName() { return sConnectionName; } - OUString& GetDDEApplication() { return sDDEApplication; } - OUString& GetDDEItem() { return sDDEItem; } - OUString& GetDDETopic() { return sDDETopic; } - sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; } + OUString& GetConnectionName() { return sConnectionName; } + OUString& GetDDEApplication() { return sDDEApplication; } + OUString& GetDDEItem() { return sDDEItem; } + OUString& GetDDETopic() { return sDDETopic; } + sal_Bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; } }; TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext ); @@ -1155,10 +1155,10 @@ String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) { sPrefixStr = String('_'); } -// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii()) -// { -// sPrefixStr.Insert('_', 0); -// } +// else if (sPrefixStr.Copy(0, 1).IsAlphaAscii()) +// { +// sPrefixStr.Insert('_', 0); +// } // else: name is OK. // increase count until we find a name that is not yet taken @@ -2542,8 +2542,8 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox ) sal_Int32 nExtraAbs = nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L; - sal_Bool bMin = sal_False; // Do all columns get the mininum width? - sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus + sal_Bool bMin = sal_False; // Do all columns get the mininum width? + sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus // some extra space? if( nAbsForRelWidth <= nMinAbs ) diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 7d7296b2ef19..4f991d9bb629 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,14 +63,14 @@ namespace com { namespace sun { namespace star { class SwXMLTableContext : public XMLTextTableContext { - ::rtl::OUString aStyleName; - ::rtl::OUString aDfltCellStyleName; + ::rtl::OUString aStyleName; + ::rtl::OUString aDfltCellStyleName; /// NB: this contains the xml:id only if this table is a subtable! ::rtl::OUString mXmlId; - SvUShorts aColumnWidths; - SvBools aColumnRelWidths; - SvStringsDtor *pColumnDefaultCellStyleNames; + SvUShorts aColumnWidths; + SvBools aColumnRelWidths; + SvStringsDtor *pColumnDefaultCellStyleNames; ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > xOldCursor; @@ -79,12 +79,12 @@ class SwXMLTableContext : public XMLTextTableContext SwXMLTableRows_Impl *pRows; - SwTableNode *pTableNode; - SwTableBox *pBox1; - const SwStartNode *pSttNd1; + SwTableNode *pTableNode; + SwTableBox *pBox1; + const SwStartNode *pSttNd1; - SwTableBoxFmt *pBoxFmt; - SwTableLineFmt *pLineFmt; + SwTableBoxFmt *pBoxFmt; + SwTableLineFmt *pLineFmt; // hash map of shared format, indexed by the (XML) style name, // the column width, and protection flag @@ -92,18 +92,18 @@ class SwXMLTableContext : public XMLTextTableContext TableBoxIndexHasher> map_BoxFmt; map_BoxFmt* pSharedBoxFormats; - SvXMLImportContextRef xParentTable; // if table is a sub table + SvXMLImportContextRef xParentTable; // if table is a sub table - SwXMLDDETableContext_Impl *pDDESource; + SwXMLDDETableContext_Impl *pDDESource; - sal_Bool bFirstSection : 1; - sal_Bool bRelWidth : 1; + sal_Bool bFirstSection : 1; + sal_Bool bRelWidth : 1; sal_Bool bHasSubTables : 1; USHORT nHeaderRows; - sal_uInt32 nCurRow; - sal_uInt32 nCurCol; - sal_Int32 nWidth; + sal_uInt32 nCurRow; + sal_uInt32 nCurCol; + sal_Int32 nWidth; SwTableBox *NewTableBox( const SwStartNode *pStNd, SwTableLine *pUpper ); diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index d95471801959..aa9524b15821 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index b6d2b0698757..9765dfc6255a 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ SwNoTxtNode *SwXMLTextParagraphExport::GetNoTxtNode( SwFrmFmt *pFrmFmt = pFrame->GetFrmFmt(); const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt(); const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx(); - return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode(); + return pNdIdx->GetNodes()[pNdIdx->GetIndex() + 1]->GetNoTxtNode(); } void SwXMLTextParagraphExport::exportStyleContent( diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx index 37045870d389..9b9ecfd2aa9a 100644 --- a/sw/source/filter/xml/xmltexte.hxx +++ b/sw/source/filter/xml/xmltexte.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ class SwNoTxtNode; namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } } -class SwXMLTextParagraphExport : public XMLTextParagraphExport +class SwXMLTextParagraphExport : public XMLTextParagraphExport { const ::rtl::OUString sTextTable; const ::rtl::OUString sEmbeddedObjectProtocol; @@ -50,7 +50,7 @@ class SwXMLTextParagraphExport : public XMLTextParagraphExport const SvGlobalName aIFrameClassId; const SvGlobalName aOutplaceClassId; - SwNoTxtNode *GetNoTxtNode( + SwNoTxtNode *GetNoTxtNode( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet >& rPropSet ) const; @@ -86,6 +86,6 @@ public: }; -#endif // _XMLTEXTE_HXX +#endif // _XMLTEXTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 8d3a0341100a..161e659b813b 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,16 +88,16 @@ using namespace xml::sax; struct XMLServiceMapEntry_Impl { const sal_Char *sFilterService; - sal_Int32 nFilterServiceLen; + sal_Int32 nFilterServiceLen; - sal_uInt32 n1; - sal_uInt16 n2, n3; - sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; + sal_uInt32 n1; + sal_uInt16 n2, n3; + sal_uInt8 n4, n5, n6, n7, n8, n9, n10, n11; }; #define SERVICE_MAP_ENTRY( app, s ) \ { XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1, \ - SO3_##s##_CLASSID } + SO3_##s##_CLASSID } const XMLServiceMapEntry_Impl aServiceMap[] = { diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx index 2107746cffed..b3752c4efc87 100644 --- a/sw/source/filter/xml/xmltexti.hxx +++ b/sw/source/filter/xml/xmltexti.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,20 +104,20 @@ public: // redlining helper methods // (here is the real implementation) virtual void RedlineAdd( - const ::rtl::OUString& rType, /// redline type (insert, del,... ) - const ::rtl::OUString& rId, /// use to identify this redline - const ::rtl::OUString& rAuthor, /// name of the author - const ::rtl::OUString& rComment, /// redline comment - const ::com::sun::star::util::DateTime& rDateTime, /// date+time + const ::rtl::OUString& rType, /// redline type (insert, del,... ) + const ::rtl::OUString& rId, /// use to identify this redline + const ::rtl::OUString& rAuthor, /// name of the author + const ::rtl::OUString& rComment, /// redline comment + const ::com::sun::star::util::DateTime& rDateTime, /// date+time sal_Bool bMergeLastPara); /// merge last paragraph virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor> RedlineCreateText( - ::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> & rOldCursor, - const ::rtl::OUString& rId); /// ID used to RedlineAdd() call + const ::rtl::OUString& rId); /// ID used to RedlineAdd() call virtual void RedlineSetCursor( - const ::rtl::OUString& rId, /// ID used to RedlineAdd() call - sal_Bool bStart, /// start or end Cursor + const ::rtl::OUString& rId, /// ID used to RedlineAdd() call + sal_Bool bStart, /// start or end Cursor sal_Bool bIsOutsideOfParagraph); virtual void RedlineAdjustStartNodeCursor( sal_Bool bStart); @@ -127,6 +127,6 @@ public: const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ); }; -#endif // _XMLTEXTI_HXX +#endif // _XMLTEXTI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |