diff options
Diffstat (limited to 'lotuswordpro/source/filter/xfilter')
17 files changed, 211 insertions, 304 deletions
diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx index c0d96851ec8f..c44720a6bd3a 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.cxx @@ -60,35 +60,27 @@ #include <xfilter/xfcolstyle.hxx> #include <xfilter/ixfattrlist.hxx> -XFColStyle::XFColStyle() -{ - m_fWidth = 0; -} +XFColStyle::XFColStyle() { m_fWidth = 0; } -XFColStyle::~XFColStyle() -{ -} +XFColStyle::~XFColStyle() {} -enumXFStyle XFColStyle::GetStyleFamily() -{ - return enumXFStyleTableCol; -} +enumXFStyle XFColStyle::GetStyleFamily() { return enumXFStyleTableCol; } -void XFColStyle::ToXml(IXFStream *pStrm) +void XFColStyle::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "style:name", GetStyleName() ); - pAttrList->AddAttribute( "style:family", "table-column" ); - pStrm->StartElement( "style:style" ); + pAttrList->AddAttribute("style:name", GetStyleName()); + pAttrList->AddAttribute("style:family", "table-column"); + pStrm->StartElement("style:style"); pAttrList->Clear(); - pAttrList->AddAttribute( "style:column-width", OUString::number(m_fWidth) + "cm" ); - pStrm->StartElement( "style:properties" ); - pStrm->EndElement( "style:properties" ); + pAttrList->AddAttribute("style:column-width", OUString::number(m_fWidth) + "cm"); + pStrm->StartElement("style:properties"); + pStrm->EndElement("style:properties"); - pStrm->EndElement( "style:style" ); + pStrm->EndElement("style:style"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx index 343ec4275464..8d669c90ece5 100644 --- a/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx +++ b/lotuswordpro/source/filter/xfilter/xfconfigmanager.cxx @@ -59,36 +59,32 @@ ************************************************************************/ #include <xfilter/xfconfigmanager.hxx> -XFConfigManager::XFConfigManager() -{ -} +XFConfigManager::XFConfigManager() {} -XFConfigManager::~XFConfigManager() -{ -} +XFConfigManager::~XFConfigManager() {} -void XFConfigManager::SetLineNumberConfig(XFLineNumberConfig *pLNConfig) +void XFConfigManager::SetLineNumberConfig(XFLineNumberConfig* pLNConfig) { - m_pLineNumberConfig.reset( pLNConfig ); + m_pLineNumberConfig.reset(pLNConfig); } -void XFConfigManager::SetFootnoteConfig(XFFootnoteConfig *pFNConfig) +void XFConfigManager::SetFootnoteConfig(XFFootnoteConfig* pFNConfig) { - m_pFootnoteConfig.reset( pFNConfig ); + m_pFootnoteConfig.reset(pFNConfig); } -void XFConfigManager::SetEndnoteConfig(XFEndnoteConfig *pENConfig) +void XFConfigManager::SetEndnoteConfig(XFEndnoteConfig* pENConfig) { - m_pEndnoteConfig.reset( pENConfig ); + m_pEndnoteConfig.reset(pENConfig); } -void XFConfigManager::ToXml(IXFStream *pStrm) +void XFConfigManager::ToXml(IXFStream* pStrm) { - if( m_pLineNumberConfig ) + if (m_pLineNumberConfig) AddStyle(std::move(m_pLineNumberConfig)); - if( m_pFootnoteConfig ) + if (m_pFootnoteConfig) AddStyle(std::move(m_pFootnoteConfig)); - if( m_pEndnoteConfig ) + if (m_pEndnoteConfig) AddStyle(std::move(m_pEndnoteConfig)); XFStyleContainer::ToXml(pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx index dfd065a61bd8..e0405261101f 100644 --- a/lotuswordpro/source/filter/xfilter/xfcrossref.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcrossref.cxx @@ -69,41 +69,32 @@ XFCrossRefStart::XFCrossRefStart() { } -XFCrossRefStart::~XFCrossRefStart() -{ -} +XFCrossRefStart::~XFCrossRefStart() {} -void XFCrossRefStart::ToXml(IXFStream *pStrm) +void XFCrossRefStart::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - if( m_nType == CROSSREF_TEXT) + if (m_nType == CROSSREF_TEXT) { - pAttrList->AddAttribute( "text:reference-format","text" ); + pAttrList->AddAttribute("text:reference-format", "text"); } - else if( m_nType == CROSSREF_PAGE ) + else if (m_nType == CROSSREF_PAGE) { - pAttrList->AddAttribute( "text:reference-format", "page" ); + pAttrList->AddAttribute("text:reference-format", "page"); } - else if( m_nType == CROSSREF_PARANUMBER ) + else if (m_nType == CROSSREF_PARANUMBER) { - pAttrList->AddAttribute( "text:reference-format", "chapter" ); + pAttrList->AddAttribute("text:reference-format", "chapter"); } - pAttrList->AddAttribute( "text:ref-name", m_strMarkName); - pStrm->StartElement( "text:bookmark-ref" ); + pAttrList->AddAttribute("text:ref-name", m_strMarkName); + pStrm->StartElement("text:bookmark-ref"); } -XFCrossRefEnd::XFCrossRefEnd() -{ -} +XFCrossRefEnd::XFCrossRefEnd() {} -XFCrossRefEnd::~XFCrossRefEnd() -{ -} +XFCrossRefEnd::~XFCrossRefEnd() {} -void XFCrossRefEnd::ToXml(IXFStream *pStrm) -{ - pStrm->EndElement( "text:bookmark-ref" ); -} +void XFCrossRefEnd::ToXml(IXFStream* pStrm) { pStrm->EndElement("text:bookmark-ref"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx index 045054399510..4f086032f2c2 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawareastyle.cxx @@ -65,33 +65,31 @@ XFDrawAreaStyle::XFDrawAreaStyle() , m_eLineStyle(enumXFAreaLineSingle) , m_nAngle(0) , m_fSpace(0.18) -{} - -enumXFStyle XFDrawAreaStyle::GetStyleFamily() { - return enumXFStyleArea; } -void XFDrawAreaStyle::ToXml(IXFStream *pStrm) +enumXFStyle XFDrawAreaStyle::GetStyleFamily() { return enumXFStyleArea; } + +void XFDrawAreaStyle::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "draw:name", GetStyleName() ); + pAttrList->AddAttribute("draw:name", GetStyleName()); - if( m_eLineStyle == enumXFAreaLineSingle ) - pAttrList->AddAttribute( "draw:style", "single" ); - else if( m_eLineStyle == enumXFAreaLineCrossed ) - pAttrList->AddAttribute( "draw:style", "double" ); - else if( m_eLineStyle == enumXFAreaLineTriple ) - pAttrList->AddAttribute( "draw:style", "triple" ); + if (m_eLineStyle == enumXFAreaLineSingle) + pAttrList->AddAttribute("draw:style", "single"); + else if (m_eLineStyle == enumXFAreaLineCrossed) + pAttrList->AddAttribute("draw:style", "double"); + else if (m_eLineStyle == enumXFAreaLineTriple) + pAttrList->AddAttribute("draw:style", "triple"); - pAttrList->AddAttribute( "draw:color", m_aLineColor.ToString() ); - pAttrList->AddAttribute( "draw:rotation", OUString::number(m_nAngle*10) ); - pAttrList->AddAttribute( "draw:distance", OUString::number(m_fSpace)+"cm" ); + pAttrList->AddAttribute("draw:color", m_aLineColor.ToString()); + pAttrList->AddAttribute("draw:rotation", OUString::number(m_nAngle * 10)); + pAttrList->AddAttribute("draw:distance", OUString::number(m_fSpace) + "cm"); - pStrm->StartElement( "draw:hatch" ); - pStrm->EndElement( "draw:hatch" ); + pStrm->StartElement("draw:hatch"); + pStrm->EndElement("draw:hatch"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx index 4c9b4e066ba4..575e6184cf43 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.cxx @@ -69,52 +69,49 @@ XFDrawLineStyle::XFDrawLineStyle() , m_fSpace(0) , m_fLength1(0) , m_fLength2(0) -{} - -enumXFStyle XFDrawLineStyle::GetStyleFamily() { - return enumXFStyleStrokeDash; } -void XFDrawLineStyle::ToXml(IXFStream *pStrm) +enumXFStyle XFDrawLineStyle::GetStyleFamily() { return enumXFStyleStrokeDash; } + +void XFDrawLineStyle::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "draw:name", GetStyleName()); + pAttrList->AddAttribute("draw:name", GetStyleName()); //simple place here: - pAttrList->AddAttribute( "draw:style", "rect"); + pAttrList->AddAttribute("draw:style", "rect"); - if( m_eLineStyle == enumXFLineDot ) + if (m_eLineStyle == enumXFLineDot) { - } - else if( m_eLineStyle == enumXFLineDash ) + else if (m_eLineStyle == enumXFLineDash) { - pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1)); - pAttrList->AddAttribute( " draw:dots1-length", OUString::number(m_fLength1) + "cm"); + pAttrList->AddAttribute("draw:dots1", OUString::number(m_nNumber1)); + pAttrList->AddAttribute(" draw:dots1-length", OUString::number(m_fLength1) + "cm"); - pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2)); - pAttrList->AddAttribute( " draw:dots2-length", OUString::number(m_fLength2) + "cm"); + pAttrList->AddAttribute("draw:dots2", OUString::number(m_nNumber2)); + pAttrList->AddAttribute(" draw:dots2-length", OUString::number(m_fLength2) + "cm"); } - else if( m_eLineStyle == enumXFLineDotDash ) + else if (m_eLineStyle == enumXFLineDotDash) { - pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1)); + pAttrList->AddAttribute("draw:dots1", OUString::number(m_nNumber1)); - pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2)); - pAttrList->AddAttribute( " draw:dots2-length", OUString::number(m_fLength2) + "cm"); + pAttrList->AddAttribute("draw:dots2", OUString::number(m_nNumber2)); + pAttrList->AddAttribute(" draw:dots2-length", OUString::number(m_fLength2) + "cm"); } - else if( m_eLineStyle == enumXFLineDashDot ) + else if (m_eLineStyle == enumXFLineDashDot) { - pAttrList->AddAttribute( "draw:dots1", OUString::number(m_nNumber1)); - pAttrList->AddAttribute( " draw:dots1-length", OUString::number(m_fLength1) + "cm"); + pAttrList->AddAttribute("draw:dots1", OUString::number(m_nNumber1)); + pAttrList->AddAttribute(" draw:dots1-length", OUString::number(m_fLength1) + "cm"); - pAttrList->AddAttribute( "draw:dots2", OUString::number(m_nNumber2)); + pAttrList->AddAttribute("draw:dots2", OUString::number(m_nNumber2)); } - pAttrList->AddAttribute( "draw:distance", OUString::number(m_fSpace) + "cm" ); + pAttrList->AddAttribute("draw:distance", OUString::number(m_fSpace) + "cm"); - pStrm->StartElement( "draw:stroke-dash" ); - pStrm->EndElement( "draw:stroke-dash" ); + pStrm->StartElement("draw:stroke-dash"); + pStrm->EndElement("draw:stroke-dash"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx index 53fd9ff52180..6f613b1533fd 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawrect.cxx @@ -60,20 +60,18 @@ #include <xfilter/xfdrawrect.hxx> #include <xfilter/ixfattrlist.hxx> -XFDrawRect::XFDrawRect() -{ -} +XFDrawRect::XFDrawRect() {} -void XFDrawRect::ToXml(IXFStream *pStrm) +void XFDrawRect::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); XFDrawObject::ToXml(pStrm); - pStrm->StartElement( "draw:rect" ); + pStrm->StartElement("draw:rect"); ContentToXml(pStrm); - pStrm->EndElement( "draw:rect" ); + pStrm->EndElement("draw:rect"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfentry.cxx b/lotuswordpro/source/filter/xfilter/xfentry.cxx index fb71ff40f7e6..d252cc2bc7cf 100644 --- a/lotuswordpro/source/filter/xfilter/xfentry.cxx +++ b/lotuswordpro/source/filter/xfilter/xfentry.cxx @@ -67,40 +67,41 @@ XFEntry::XFEntry() : m_eType(enumXFEntryTOC) , m_nOutlineLevel(1) -{} +{ +} -void XFEntry::ToXml(IXFStream *pStrm) +void XFEntry::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "text:string-value", m_strValue ); + pAttrList->AddAttribute("text:string-value", m_strValue); - if( m_eType == enumXFEntryTOC ) + if (m_eType == enumXFEntryTOC) { - pAttrList->AddAttribute( "text:outline-level", OUString::number(m_nOutlineLevel) ); - pStrm->StartElement( "text:toc-mark" ); -// pStrm->Characters(m_strDisplay); - pStrm->EndElement( "text:toc-mark" ); + pAttrList->AddAttribute("text:outline-level", OUString::number(m_nOutlineLevel)); + pStrm->StartElement("text:toc-mark"); + // pStrm->Characters(m_strDisplay); + pStrm->EndElement("text:toc-mark"); } - else if( m_eType == enumXFEntryAlphabetical ) + else if (m_eType == enumXFEntryAlphabetical) { - pAttrList->AddAttribute( "text:key1", m_strKey1 ); - if( !m_strKey2.isEmpty() ) - pAttrList->AddAttribute( "text:key2", m_strKey2 ); + pAttrList->AddAttribute("text:key1", m_strKey1); + if (!m_strKey2.isEmpty()) + pAttrList->AddAttribute("text:key2", m_strKey2); - pStrm->StartElement( "text:alphabetical-index-mark" ); -// pStrm->Characters(m_strDisplay); - pStrm->EndElement( "text:alphabetical-index-mark" ); + pStrm->StartElement("text:alphabetical-index-mark"); + // pStrm->Characters(m_strDisplay); + pStrm->EndElement("text:alphabetical-index-mark"); } - else if( m_eType == enumXFEntryUserIndex ) + else if (m_eType == enumXFEntryUserIndex) { - pAttrList->AddAttribute( "text:outline-level", OUString::number(m_nOutlineLevel) ); - pAttrList->AddAttribute( "text:index-name", m_strName ); + pAttrList->AddAttribute("text:outline-level", OUString::number(m_nOutlineLevel)); + pAttrList->AddAttribute("text:index-name", m_strName); - pStrm->StartElement( "text:user-index-mark" ); -// pStrm->Characters(m_strDisplay); - pStrm->EndElement( "text:user-index-mark" ); + pStrm->StartElement("text:user-index-mark"); + // pStrm->Characters(m_strDisplay); + pStrm->EndElement("text:user-index-mark"); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx index a3eb1d921142..30a682433607 100644 --- a/lotuswordpro/source/filter/xfilter/xffontfactory.cxx +++ b/lotuswordpro/source/filter/xfilter/xffontfactory.cxx @@ -59,24 +59,17 @@ ************************************************************************/ #include <xfilter/xffontfactory.hxx> -XFFontFactory::XFFontFactory() -{ -} +XFFontFactory::XFFontFactory() {} -XFFontFactory::~XFFontFactory() -{ -} +XFFontFactory::~XFFontFactory() {} -void XFFontFactory::AddFont(rtl::Reference<XFFont> const & pFont) -{ - s_aFonts.push_back( pFont ); -} +void XFFontFactory::AddFont(rtl::Reference<XFFont> const& pFont) { s_aFonts.push_back(pFont); } -rtl::Reference<XFFont> XFFontFactory::FindSameFont(rtl::Reference<XFFont> const & pFont) +rtl::Reference<XFFont> XFFontFactory::FindSameFont(rtl::Reference<XFFont> const& pFont) { for (auto const& font : s_aFonts) { - if( *pFont == *font ) + if (*pFont == *font) return font; } diff --git a/lotuswordpro/source/filter/xfilter/xflist.cxx b/lotuswordpro/source/filter/xfilter/xflist.cxx index bb683f13ede3..ae61aef6c961 100644 --- a/lotuswordpro/source/filter/xfilter/xflist.cxx +++ b/lotuswordpro/source/filter/xfilter/xflist.cxx @@ -67,32 +67,30 @@ XFList::XFList() m_bContinueNumber = false; } -XFList::~XFList() -{ -} +XFList::~XFList() {} -void XFList::ToXml(IXFStream *pStrm) +void XFList::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); - assert(nullptr!=pAttrList); + IXFAttrList* pAttrList = pStrm->GetAttrList(); + assert(nullptr != pAttrList); pAttrList->Clear(); - if( !GetStyleName().isEmpty() ) - pAttrList->AddAttribute( "text:style-name", GetStyleName() ); - if( m_bContinueNumber ) - pAttrList->AddAttribute( "text:continue-numbering", "true" ); + if (!GetStyleName().isEmpty()) + pAttrList->AddAttribute("text:style-name", GetStyleName()); + if (m_bContinueNumber) + pAttrList->AddAttribute("text:continue-numbering", "true"); - if( m_bOrdered ) - pStrm->StartElement( "text:ordered-list" ); + if (m_bOrdered) + pStrm->StartElement("text:ordered-list"); else - pStrm->StartElement( "text:unordered-list" ); + pStrm->StartElement("text:unordered-list"); XFContentContainer::ToXml(pStrm); - if( m_bOrdered ) - pStrm->EndElement( "text:ordered-list" ); + if (m_bOrdered) + pStrm->EndElement("text:ordered-list"); else - pStrm->EndElement( "text:unordered-list" ); + pStrm->EndElement("text:unordered-list"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx index 8cc28d305e2e..29eb8a9e7b33 100644 --- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx @@ -61,38 +61,26 @@ #include <xfilter/xffooter.hxx> #include <xfilter/xfheader.hxx> -void XFMasterPage::SetHeader(rtl::Reference<XFHeader> const & rHeader) -{ - m_xHeader = rHeader; -} +void XFMasterPage::SetHeader(rtl::Reference<XFHeader> const& rHeader) { m_xHeader = rHeader; } -void XFMasterPage::SetFooter(rtl::Reference<XFFooter> const & rFooter) -{ - m_xFooter = rFooter; -} +void XFMasterPage::SetFooter(rtl::Reference<XFFooter> const& rFooter) { m_xFooter = rFooter; } -enumXFStyle XFMasterPage::GetStyleFamily() -{ - return enumXFStyleMasterPage; -} +enumXFStyle XFMasterPage::GetStyleFamily() { return enumXFStyleMasterPage; } -void XFMasterPage::SetPageMaster(const OUString& pm) -{ - m_strPageMaster = pm; -} +void XFMasterPage::SetPageMaster(const OUString& pm) { m_strPageMaster = pm; } -void XFMasterPage::ToXml(IXFStream *pStrm) +void XFMasterPage::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); - pAttrList->AddAttribute( "style:name", m_strStyleName ); - pAttrList->AddAttribute( "style:page-master-name", m_strPageMaster ); - pStrm->StartElement( "style:master-page" ); + pAttrList->AddAttribute("style:name", m_strStyleName); + pAttrList->AddAttribute("style:page-master-name", m_strPageMaster); + pStrm->StartElement("style:master-page"); if (m_xHeader) m_xHeader->ToXml(pStrm); if (m_xFooter) m_xFooter->ToXml(pStrm); - pStrm->EndElement( "style:master-page" ); + pStrm->EndElement("style:master-page"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx index 0b600cb669a2..bc070e36a23e 100644 --- a/lotuswordpro/source/filter/xfilter/xfparagraph.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparagraph.cxx @@ -61,19 +61,11 @@ #include <xfilter/ixfstream.hxx> #include <xfilter/ixfattrlist.hxx> -XFParagraph::XFParagraph() -{ +XFParagraph::XFParagraph() {} -} +XFParagraph::~XFParagraph() {} -XFParagraph::~XFParagraph() -{ -} - -enumXFContent XFParagraph::GetContentType() -{ - return enumXFContentPara; -} +enumXFContent XFParagraph::GetContentType() { return enumXFContentPara; } /** * The paragraph object serial function,the output will be like: @@ -83,25 +75,22 @@ enumXFContent XFParagraph::GetContentType() * <text:span text:style-name="T1">text content</text:span> * </text:p> */ -void XFParagraph::ToXml(IXFStream *pStrm) +void XFParagraph::ToXml(IXFStream* pStrm) { - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); assert(pAttrList); pAttrList->Clear(); - if( !GetStyleName().isEmpty() ) - pAttrList->AddAttribute( "text:style-name", GetStyleName() ); - pStrm->StartElement( "text:p" ); + if (!GetStyleName().isEmpty()) + pAttrList->AddAttribute("text:style-name", GetStyleName()); + pStrm->StartElement("text:p"); XFContentContainer::ToXml(pStrm); - pStrm->EndElement( "text:p" ); + pStrm->EndElement("text:p"); } -bool XFParagraph::HasContents() const -{ - return GetCount()>0; -} +bool XFParagraph::HasContents() const { return GetCount() > 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx index 5bd78fb82190..6a12bcfc6925 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.cxx @@ -60,23 +60,19 @@ #include "xfsaxattrlist.hxx" #include <xmloff/attrlist.hxx> -XFSaxAttrList::XFSaxAttrList() : m_xSvAttrList(new SvXMLAttributeList()) +XFSaxAttrList::XFSaxAttrList() + : m_xSvAttrList(new SvXMLAttributeList()) { } -XFSaxAttrList::~XFSaxAttrList() -{ -} +XFSaxAttrList::~XFSaxAttrList() {} void XFSaxAttrList::AddAttribute(const OUString& name, const OUString& value) { - m_xSvAttrList->AddAttribute(name,value); + m_xSvAttrList->AddAttribute(name, value); } -void XFSaxAttrList::Clear() -{ - m_xSvAttrList->Clear(); -} +void XFSaxAttrList::Clear() { m_xSvAttrList->Clear(); } css::uno::Reference<css::xml::sax::XAttributeList> XFSaxAttrList::GetAttributeList() const { diff --git a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx index 74db79e9b669..4a727727d353 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxattrlist.hxx @@ -64,7 +64,7 @@ #include <rtl/ref.hxx> #include <xmloff/attrlist.hxx> -class XFSaxAttrList : public IXFAttrList +class XFSaxAttrList : public IXFAttrList { public: XFSaxAttrList(); @@ -73,16 +73,16 @@ public: public: //Interface ISaxAttributeList: - virtual void AddAttribute(const OUString& name, const OUString& value) override; + virtual void AddAttribute(const OUString& name, const OUString& value) override; - virtual void Clear() override; + virtual void Clear() override; css::uno::Reference<css::xml::sax::XAttributeList> GetAttributeList() const; friend class XFSaxStream; -private: - rtl::Reference<SvXMLAttributeList> m_xSvAttrList; +private: + rtl::Reference<SvXMLAttributeList> m_xSvAttrList; }; #endif //XFSAXATTRLIST_INC diff --git a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx index ecdf4d6e006f..700161df2e2d 100644 --- a/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsaxstream.cxx @@ -75,53 +75,48 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; -XFSaxStream::XFSaxStream(Reference<XDocumentHandler> const & xHandler) +XFSaxStream::XFSaxStream(Reference<XDocumentHandler> const& xHandler) { m_aHandler = xHandler; - m_pAttrList.reset(new XFSaxAttrList ); + m_pAttrList.reset(new XFSaxAttrList); } -XFSaxStream::~XFSaxStream() -{ -} +XFSaxStream::~XFSaxStream() {} -void XFSaxStream::StartDocument() +void XFSaxStream::StartDocument() { if (m_aHandler.is()) m_aHandler->startDocument(); } -void XFSaxStream::EndDocument() +void XFSaxStream::EndDocument() { if (m_aHandler.is()) m_aHandler->endDocument(); } -void XFSaxStream::StartElement(const OUString& oustr) +void XFSaxStream::StartElement(const OUString& oustr) { if (m_aHandler.is()) - m_aHandler->startElement( oustr, m_pAttrList->GetAttributeList() ); + m_aHandler->startElement(oustr, m_pAttrList->GetAttributeList()); m_pAttrList->Clear(); } -void XFSaxStream::EndElement(const OUString& oustr) +void XFSaxStream::EndElement(const OUString& oustr) { if (m_aHandler.is()) m_aHandler->endElement(oustr); - if( m_pAttrList ) + if (m_pAttrList) m_pAttrList->Clear(); } -void XFSaxStream::Characters(const OUString& oustr) +void XFSaxStream::Characters(const OUString& oustr) { if (m_aHandler.is()) m_aHandler->characters(oustr); } -IXFAttrList* XFSaxStream::GetAttrList() -{ - return m_pAttrList.get(); -} +IXFAttrList* XFSaxStream::GetAttrList() { return m_pAttrList.get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfsection.cxx b/lotuswordpro/source/filter/xfilter/xfsection.cxx index dd503bb6896f..994f9227c780 100644 --- a/lotuswordpro/source/filter/xfilter/xfsection.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsection.cxx @@ -61,42 +61,36 @@ #include <xfilter/xfglobal.hxx> #include <xfilter/ixfattrlist.hxx> -XFSection::XFSection() -{ - m_strSectionName = XFGlobal::GenSectionName(); -} +XFSection::XFSection() { m_strSectionName = XFGlobal::GenSectionName(); } -XFSection::~XFSection() -{ -} +XFSection::~XFSection() {} -void XFSection::ToXml(IXFStream *pStrm) +void XFSection::ToXml(IXFStream* pStrm) { - assert(!m_strSectionName.isEmpty() ); + assert(!m_strSectionName.isEmpty()); - IXFAttrList *pAttrList = pStrm->GetAttrList(); + IXFAttrList* pAttrList = pStrm->GetAttrList(); pAttrList->Clear(); OUString style = GetStyleName(); - if( !style.isEmpty() ) - pAttrList->AddAttribute( "text:style-name", style); + if (!style.isEmpty()) + pAttrList->AddAttribute("text:style-name", style); //section name - if( !m_strSectionName.isEmpty() ) - pAttrList->AddAttribute( "text:name", m_strSectionName); + if (!m_strSectionName.isEmpty()) + pAttrList->AddAttribute("text:name", m_strSectionName); - pStrm->StartElement( "text:section" ); - if( !m_strSourceLink.isEmpty() ) + pStrm->StartElement("text:section"); + if (!m_strSourceLink.isEmpty()) { pAttrList->Clear(); - pAttrList->AddAttribute( "xlink:href", m_strSourceLink); - pAttrList->AddAttribute( "text:filter-name", "wordpro"); - pStrm->StartElement( "text:section-source" ); - pStrm->EndElement( "text:section-source" ); + pAttrList->AddAttribute("xlink:href", m_strSourceLink); + pAttrList->AddAttribute("text:filter-name", "wordpro"); + pStrm->StartElement("text:section-source"); + pStrm->EndElement("text:section-source"); } XFContentContainer::ToXml(pStrm); - pStrm->EndElement( "text:section" ); - + pStrm->EndElement("text:section"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx index 6a25ddd3a73d..06304d51ce6c 100644 --- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx @@ -68,42 +68,33 @@ public: XFTabStyle(); public: - void SetTabType(enumXFTab type); + void SetTabType(enumXFTab type); - void SetLength(double len); + void SetLength(double len); - void SetDelimiter(sal_Unicode delimiter); + void SetDelimiter(sal_Unicode delimiter); - void SetLeaderChar(sal_Unicode leader); + void SetLeaderChar(sal_Unicode leader); - virtual void ToXml(IXFStream *pStrm) override; + virtual void ToXml(IXFStream* pStrm) override; private: - enumXFTab m_eType; - double m_fLength; - OUString m_strDelimiter; - OUString m_strLeader; + enumXFTab m_eType; + double m_fLength; + OUString m_strDelimiter; + OUString m_strLeader; }; -inline void XFTabStyle::SetTabType(enumXFTab type) -{ - m_eType = type; -} +inline void XFTabStyle::SetTabType(enumXFTab type) { m_eType = type; } -inline void XFTabStyle::SetLength(double len) -{ - m_fLength = len; -} +inline void XFTabStyle::SetLength(double len) { m_fLength = len; } inline void XFTabStyle::SetDelimiter(sal_Unicode delimiter) { m_strDelimiter = OUString(delimiter); } -inline void XFTabStyle::SetLeaderChar(sal_Unicode leader) -{ - m_strLeader = OUString(leader); -} +inline void XFTabStyle::SetLeaderChar(sal_Unicode leader) { m_strLeader = OUString(leader); } #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx index 50eda9fcf761..e70603ab2e4c 100644 --- a/lotuswordpro/source/filter/xfilter/xftextstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftextstyle.cxx @@ -63,68 +63,58 @@ #include <xfilter/ixfstream.hxx> #include <xfilter/xffont.hxx> -XFTextStyle::XFTextStyle() -{ -} +XFTextStyle::XFTextStyle() {} -XFTextStyle::~XFTextStyle() -{ -} +XFTextStyle::~XFTextStyle() {} -void XFTextStyle::SetFont(rtl::Reference<XFFont> const & font) -{ - m_pFont = font; -} +void XFTextStyle::SetFont(rtl::Reference<XFFont> const& font) { m_pFont = font; } -bool XFTextStyle::Equal(IXFStyle *pStyle) +bool XFTextStyle::Equal(IXFStyle* pStyle) { - if( !pStyle || pStyle->GetStyleFamily() != enumXFStyleText ) + if (!pStyle || pStyle->GetStyleFamily() != enumXFStyleText) { return false; } - XFTextStyle *pOther = dynamic_cast<XFTextStyle*>(pStyle); - if( !pOther ) + XFTextStyle* pOther = dynamic_cast<XFTextStyle*>(pStyle); + if (!pOther) { return false; } - if( m_pFont.is() ) + if (m_pFont.is()) { - if( !pOther->m_pFont.is() ) + if (!pOther->m_pFont.is()) return false; - if( *m_pFont != *pOther->m_pFont ) + if (*m_pFont != *pOther->m_pFont) return false; } - else if( pOther->m_pFont.is() ) + else if (pOther->m_pFont.is()) return false; return true; } -enumXFStyle XFTextStyle::GetStyleFamily() -{ - return enumXFStyleText; -} +enumXFStyle XFTextStyle::GetStyleFamily() { return enumXFStyleText; } -void XFTextStyle::ToXml(IXFStream *strm) +void XFTextStyle::ToXml(IXFStream* strm) { - IXFAttrList *pAttrList = strm->GetAttrList(); + IXFAttrList* pAttrList = strm->GetAttrList(); OUString style = GetStyleName(); pAttrList->Clear(); - if( !style.isEmpty() ) + if (!style.isEmpty()) pAttrList->AddAttribute("style:name", GetStyleName()); - if( !GetParentStyleName().isEmpty() ) + if (!GetParentStyleName().isEmpty()) pAttrList->AddAttribute("style:parent-style-name", GetParentStyleName()); - pAttrList->AddAttribute("style:family", "text" ); + pAttrList->AddAttribute("style:family", "text"); strm->StartElement("style:style"); //Font properties: pAttrList->Clear(); //font name: - if( m_pFont.is() ) + if (m_pFont.is()) m_pFont->ToXml(strm); strm->StartElement("style:properties"); |