diff options
author | Guillaume Poussel <gpoussel@gmail.com> | 2011-02-13 17:42:48 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-13 17:42:48 +0100 |
commit | 6b78fe8394ffd181d2c11dd6dfe616e062ded8ad (patch) | |
tree | 35668b71c461dffd0fc45645760d7a58794d2536 /writerfilter/source | |
parent | 7369b5e4f70f54c5020448cc896c1824aebfaff0 (diff) |
Remove bogus comments
Diffstat (limited to 'writerfilter/source')
19 files changed, 210 insertions, 420 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index ad88a2c30427..006cf44834df 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -470,16 +470,14 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos) return aNewFormat.makeStringAndClear(); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int32 convertTwipToMM100(sal_Int32 _t) { return TWIP_TO_MM100( _t ); } -/*-- 09.08.2007 09:34:44--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int32 convertEMUToMM100(sal_Int32 _t) { return _t / 360; @@ -498,9 +496,8 @@ sal_Int32 ConvertColor(sal_Int32 nWordColor) sal_Int32 nRet = (t<<24) + (r<<16) + (g<<8) + b; return nRet; } -/*-- 27.06.2007 13:42:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int16 convertTableJustification( sal_Int32 nIntValue ) { sal_Int16 nOrient = text::HoriOrientation::LEFT_AND_WIDTH; @@ -557,9 +554,8 @@ com::sun::star::util::DateTime convertDateTime( const ::rtl::OUString& rDateTime } return aRet; } -/*-- 05.03.2008 09:10:13--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int16 ConvertNumberingType(sal_Int32 nNFC) { sal_Int16 nRet; diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 295eb63870f8..e85bd2731a58 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3129,9 +3129,8 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp dmapper_logger->endElement(); #endif } -/*-- 09.06.2006 09:52:13--------------------------------------------------- ------------------------------------------------------------------------*/ + void DomainMapper::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref) { diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 417179d2fdca..3c43d733e5c8 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -119,9 +119,8 @@ void DomainMapperTableHandler::startTable(unsigned int nRows, #endif } -/*-- 22.02.2008 10:18:37--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntryPtr pStyleSheet, StyleSheetTablePtr pStyleSheetTable) { #ifdef DEBUG_DOMAINMAPPER diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 180012fae04b..2f57c3922b36 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -46,9 +46,8 @@ namespace dmapper { using namespace ::com::sun::star; using namespace ::std; -/*-- 23.04.2007 14:57:49--------------------------------------------------- - -----------------------------------------------------------------------*/ + DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) : m_nRow(0), m_nCell(0), @@ -67,17 +66,15 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) : #endif #endif } -/*-- 23.04.2007 14:57:49--------------------------------------------------- - -----------------------------------------------------------------------*/ + DomainMapperTableManager::~DomainMapperTableManager() { if ( m_pTablePropsHandler ) delete m_pTablePropsHandler, m_pTablePropsHandler = NULL; } -/*-- 23.04.2007 15:25:37--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool DomainMapperTableManager::sprm(Sprm & rSprm) { #ifdef DEBUG_DOMAINMAPPER @@ -358,9 +355,8 @@ void DomainMapperTableManager::endLevel( ) #endif } -/*-- 02.05.2007 14:36:26--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapperTableManager::endOfCellAction() { #ifdef DEBUG_DOMAINMAPPER @@ -371,9 +367,8 @@ void DomainMapperTableManager::endOfCellAction() m_nGridSpan = 1; ++m_nCell; } -/*-- 02.05.2007 14:36:26--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapperTableManager::endOfRowAction() { #ifdef DEBUG_DOMAINMAPPER @@ -493,18 +488,16 @@ void DomainMapperTableManager::endOfRowAction() dmapper_logger->endElement(); #endif } -/*-- 18.06.2007 10:34:37--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapperTableManager::clearData() { m_nRow = m_nCell = m_nCellBorderIndex = m_nHeaderRepeat = m_nTableWidth = 0; m_sTableStyleName = ::rtl::OUString(); m_pTableStyleTextProperies.reset(); } -/*-- 27.06.2007 14:19:50--------------------------------------------------- - -----------------------------------------------------------------------*/ + void lcl_CopyTextProperties(PropertyMapPtr pToFill, const StyleSheetEntry* pStyleSheetEntry, StyleSheetTablePtr pStyleSheetTable) { diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index fa3625f7a2dd..ae959bd358a2 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -103,9 +103,8 @@ struct FieldConversion typedef ::std::map< ::rtl::OUString, FieldConversion> FieldConversionMap_t; -/*-- 18.07.2006 08:56:55--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int32 FIB::GetData( Id nName ) { if( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR) @@ -113,18 +112,16 @@ sal_Int32 FIB::GetData( Id nName ) OSL_ENSURE( false, "invalid index in FIB"); return -1; } -/*-- 18.07.2006 08:56:55--------------------------------------------------- - -----------------------------------------------------------------------*/ + void FIB::SetData( Id nName, sal_Int32 nValue ) { OSL_ENSURE( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR, "invalid index in FIB"); if( nName >= NS_rtf::LN_WIDENT && nName <= NS_rtf::LN_LCBSTTBFUSSR) aFIBData[nName - NS_rtf::LN_WIDENT] = nValue; } -/*-- 01.09.2006 10:22:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + DomainMapper_Impl::DomainMapper_Impl( DomainMapper& rDMapper, uno::Reference < uno::XComponentContext > xContext, @@ -167,18 +164,16 @@ DomainMapper_Impl::DomainMapper_Impl( getTableManager( ).startLevel(); } -/*-- 01.09.2006 10:22:28--------------------------------------------------- - -----------------------------------------------------------------------*/ + DomainMapper_Impl::~DomainMapper_Impl() { RemoveLastParagraph( ); getTableManager( ).endLevel(); popTableManager( ); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles() { if(!m_xPageStyles.is()) @@ -188,9 +183,8 @@ uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles( } return m_xPageStyles; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< text::XText > DomainMapper_Impl::GetBodyText() { if(!m_xBodyText.is() && m_xTextDocument.is()) @@ -199,9 +193,8 @@ uno::Reference< text::XText > DomainMapper_Impl::GetBodyText() } return m_xBodyText; } -/*-- 21.12.2006 12:09:30--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings() { if( !m_xDocumentSettings.is() ) @@ -211,9 +204,8 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings() } return m_xDocumentSettings; } -/*-- 21.12.2006 12:16:23--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::SetDocumentSettingsProperty( const ::rtl::OUString& rPropName, const uno::Any& rValue ) { uno::Reference< beans::XPropertySet > xSettings = GetDocumentSettings(); @@ -250,9 +242,8 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast ) m_bIsLastParaInSection = bIsLast; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushProperties(ContextType eId) { SectionPropertyMap* pSectionContext = 0; @@ -275,9 +266,8 @@ void DomainMapper_Impl::PushProperties(ContextType eId) m_pTopContext = m_aPropertyStacks[eId].top(); } -/*-- 13.06.2007 16:18:18--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushStyleProperties( PropertyMapPtr pStyleProperties ) { m_aPropertyStacks[CONTEXT_STYLESHEET].push( pStyleProperties ); @@ -285,18 +275,16 @@ void DomainMapper_Impl::PushStyleProperties( PropertyMapPtr pStyleProperties ) m_pTopContext = m_aPropertyStacks[CONTEXT_STYLESHEET].top(); } -/*-- 28.01.2008 14:47:46--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushListProperties(PropertyMapPtr pListProperties) { m_aPropertyStacks[CONTEXT_LIST].push( pListProperties ); m_aContextStack.push(CONTEXT_LIST); m_pTopContext = m_aPropertyStacks[CONTEXT_LIST].top(); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PopProperties(ContextType eId) { OSL_ENSURE(!m_aPropertyStacks[eId].empty(), "section stack already empty"); @@ -317,9 +305,8 @@ void DomainMapper_Impl::PopProperties(ContextType eId) m_pTopContext.reset(); } } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId) { PropertyMapPtr pRet; @@ -330,18 +317,16 @@ PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId) return pRet; } -/*-- 24.05.2007 15:54:51--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< text::XTextAppend > DomainMapper_Impl::GetTopTextAppend() { OSL_ENSURE(!m_aTextAppendStack.empty(), "text append stack is empty" ); return m_aTextAppendStack.top().xTextAppend; } -/*-- 17.07.2006 08:47:04--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::InitTabStopFromStyle( const uno::Sequence< style::TabStop >& rInitTabStops ) { OSL_ENSURE(!m_aCurrentTabStops.size(), "tab stops already initialized"); @@ -351,9 +336,8 @@ void DomainMapper_Impl::InitTabStopFromStyle( const uno::Sequence< style::TabSto } } -/*-- 29.06.2006 13:35:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::ModifyCurrentTabStop( Id nId, sal_Int32 nValue) { OSL_ENSURE(nId == NS_rtf::LN_dxaAdd || m_nCurrentTabStopIndex < m_aCurrentTabStops.size(), @@ -435,9 +419,8 @@ void DomainMapper_Impl::IncorporateTabStop( const DeletableTabStop & rTabStop ) if( !bFound ) m_aCurrentTabStops.push_back( rTabStop ); } -/*-- 29.06.2006 13:35:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear() { uno::Sequence< style::TabStop > aRet( sal_Int32( m_aCurrentTabStops.size() ) ); @@ -490,9 +473,8 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) } return uno::Any(); } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + ListsManager::Pointer DomainMapper_Impl::GetListTable() { if(!m_pListTable) @@ -566,9 +548,8 @@ bool lcl_removeShape( const uno::Reference< text::XTextDocument >& rDoc, const return bRet; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrameProperties, uno::Reference<text::XTextRange> xStartTextRange, uno::Reference<text::XTextRange> xEndTextRange ) @@ -616,9 +597,8 @@ void lcl_MoveBorderPropertiesToFrame(uno::Sequence<beans::PropertyValue>& rFrame (void)rEx; } } -/*-- 04.01.2008 10:59:19--------------------------------------------------- - -----------------------------------------------------------------------*/ + void lcl_AddRangeAndStyle( ParagraphPropertiesPtr& pToBeSavedProperties, uno::Reference< text::XTextAppend > xTextAppend, @@ -641,9 +621,8 @@ void lcl_AddRangeAndStyle( } } } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + //define some default frame width - 0cm ATM: this allow the frame to be wrapped around the text #define DEFAULT_FRAME_MIN_WIDTH 0 @@ -922,9 +901,8 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) dmapper_logger->endElement(); #endif } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + util::DateTime lcl_DateStringToDateTime( const ::rtl::OUString& rDateTime ) { util::DateTime aDateTime; @@ -972,9 +950,8 @@ void DomainMapper_Impl::appendTextPortion( const ::rtl::OUString& rString, Prope } } } -/*-- 02.11.2006 12:08:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::appendTextContent( const uno::Reference< text::XTextContent > xContent, const uno::Sequence< beans::PropertyValue > xPropertyValues @@ -997,9 +974,8 @@ void DomainMapper_Impl::appendTextContent( } } -/*-- 24.04.2008 08:38:07--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::appendOLE( const ::rtl::OUString& rStreamName, OLEHandlerPtr pOLEHandler ) { static const rtl::OUString sEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject")); @@ -1044,9 +1020,8 @@ void DomainMapper_Impl::appendOLE( const ::rtl::OUString& rStreamName, OLEHandle } } -/*-- 14.12.2006 12:26:00--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( uno::Reference< text::XTextRange >& xBefore ) { @@ -1076,9 +1051,8 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter( return xRet; } -/*-- 02.11.2006 12:08:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType) { //get the section context @@ -1114,9 +1088,8 @@ void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType) } } } -/*-- 24.07.2006 09:41:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType) { //get the section context @@ -1151,9 +1124,8 @@ void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType) } } } -/*-- 24.07.2006 09:41:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PopPageHeaderFooter() { //header and footer always have an empty paragraph at the end @@ -1161,9 +1133,8 @@ void DomainMapper_Impl::PopPageHeaderFooter() RemoveLastParagraph( ); m_aTextAppendStack.pop(); } -/*-- 24.05.2007 14:22:28--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) { try @@ -1283,9 +1254,8 @@ void DomainMapper_Impl::EndParaChange( ) m_bIsParaChange = false; } -/*-- 22.12.2008 13:45:15--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PushAnnotation() { try @@ -1303,16 +1273,14 @@ void DomainMapper_Impl::PushAnnotation() OSL_ENSURE( false, "exception in PushFootOrEndnote" ); } } -/*-- 24.05.2007 14:22:29--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PopFootOrEndnote() { m_aTextAppendStack.pop(); } -/*-- 22.12.2008 13:45:15--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PopAnnotation() { m_aTextAppendStack.pop(); @@ -1356,9 +1324,8 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape } } -/*-- 20.03.2008 09:01:59--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::PopShapeContext() { if ( m_bShapeContextAdded ) @@ -1368,9 +1335,8 @@ void DomainMapper_Impl::PopShapeContext() } m_bIsInShape = false; } -/*-- 12.09.2006 08:07:55--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString lcl_FindQuotedText( const ::rtl::OUString& rCommand, const sal_Char* cStartQuote, const sal_Unicode uEndQuote ) { @@ -1389,9 +1355,8 @@ void DomainMapper_Impl::PopShapeContext() return sRet; } -/*-- 08.09.2006 14:05:17--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int16 lcl_ParseNumberingType( const ::rtl::OUString& rCommand ) { sal_Int16 nRet = style::NumberingType::PAGE_DESCRIPTOR; @@ -1487,9 +1452,8 @@ style::NumberingType:: } return nRet; } -/*-- 08.09.2006 13:52:09--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString lcl_ParseFormat( const ::rtl::OUString& rCommand ) { // The command looks like: " DATE \@ "dd MMMM yyyy" @@ -1529,9 +1493,8 @@ extract a parameter (with or without quotes) between the command and the followi return sRet; } -/*-- 15.09.2006 10:57:57--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString lcl_ExctractAskVariableAndHint( const ::rtl::OUString& rCommand, ::rtl::OUString& rHint ) { // the first word after "ASK " is the variable @@ -1553,9 +1516,8 @@ extract a parameter (with or without quotes) between the command and the followi rHint = sRet; return sRet; } -/*-- 24.01.2007 16:04:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool lcl_FindInCommand( const ::rtl::OUString& rCommand, sal_Unicode cSwitch, @@ -1578,9 +1540,8 @@ bool lcl_FindInCommand( return bRet; } -/*-- 14.09.2006 12:46:52--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::GetCurrentLocale(lang::Locale& rLocale) { PropertyMapPtr pTopContext = GetTopContext(); @@ -1632,9 +1593,8 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand, } } -/*-- 15.09.2006 15:10:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< beans::XPropertySet > DomainMapper_Impl::FindOrCreateFieldMaster( const sal_Char* pFieldMasterService, const ::rtl::OUString& rFieldMasterName ) throw(::com::sun::star::uno::Exception) @@ -1706,23 +1666,20 @@ bool DomainMapper_Impl::IsOpenField() const { return !m_aFieldStack.empty(); } -/*-- 29.01.2007 11:49:13--------------------------------------------------- - -----------------------------------------------------------------------*/ + FieldContext::FieldContext(uno::Reference< text::XTextRange > xStart) : m_bFieldCommandCompleted( false ) ,m_xStartRange( xStart ) { } -/*-- 29.01.2007 11:48:44--------------------------------------------------- - -----------------------------------------------------------------------*/ + FieldContext::~FieldContext() { } -/*-- 29.01.2007 11:48:45--------------------------------------------------- - -----------------------------------------------------------------------*/ + void FieldContext::AppendCommand(const ::rtl::OUString& rPart) { m_sCommand += rPart; @@ -1802,9 +1759,8 @@ void DomainMapper_Impl::AppendFieldCommand(::rtl::OUString& rPartOfCommand) pContext->AppendCommand( rPartOfCommand ); } } -/*-- 13.12.2007 11:45:43--------------------------------------------------- - -----------------------------------------------------------------------*/ + typedef std::multimap < sal_Int32, ::rtl::OUString > TOCStyleMap; const FieldConversionMap_t & lcl_GetFieldConversion() @@ -2704,9 +2660,8 @@ bool DomainMapper_Impl::IsFieldResultAsString() } return bRet; } -/*-- 01.09.2006 11:48:09--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::SetFieldResult( ::rtl::OUString& rResult ) { #ifdef DEBUG_DOMAINMAPPER @@ -2854,9 +2809,8 @@ void DomainMapper_Impl::PopFieldContext() //remove the field context m_aFieldStack.pop(); } -/*-- 11.06.2007 16:19:00--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const ::rtl::OUString& rId ) { uno::Reference< text::XTextAppend > xTextAppend = m_aTextAppendStack.top().xTextAppend; @@ -2899,9 +2853,8 @@ void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const //TODO: What happens to bookmarks where start and end are at different XText objects? } } -/*-- 01.11.2006 14:57:44--------------------------------------------------- - -----------------------------------------------------------------------*/ + GraphicImportPtr DomainMapper_Impl::GetGraphicImport(GraphicImportType eGraphicImportType) { if(!m_pGraphicImport) @@ -2915,9 +2868,8 @@ void DomainMapper_Impl::ResetGraphicImport() { m_pGraphicImport.reset(); } -/*-- 01.11.2006 09:25:40--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::ImportGraphic(writerfilter::Reference< Properties >::Pointer_t ref, GraphicImportType eGraphicImportType) { GetGraphicImport(eGraphicImportType); @@ -2940,9 +2892,8 @@ void DomainMapper_Impl::ImportGraphic(writerfilter::Reference< Properties >::Po m_pGraphicImport.reset(); } -/*-- 28.12.2006 14:00:47--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_Int32 nLnc, sal_Int32 ndxaLnn ) { if( !m_bLineNumberingSet ) @@ -2984,9 +2935,8 @@ void DomainMapper_Impl::SetLineNumbering( sal_Int32 nLnnMod, sal_Int32 nLnc, sal } m_bLineNumberingSet = true; } -/*-- 31.08.2007 13:50:49--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::SetPageMarginTwip( PageMarElement eElement, sal_Int32 nValue ) { nValue = ConversionHelper::convertTwipToMM100(nValue); @@ -3002,9 +2952,8 @@ void DomainMapper_Impl::SetPageMarginTwip( PageMarElement eElement, sal_Int32 nV } } -/*-- 31.08.2007 13:47:50--------------------------------------------------- - -----------------------------------------------------------------------*/ + _PageMar::_PageMar() { header = footer = top = bottom = ConversionHelper::convertTwipToMM100( sal_Int32(1440)); @@ -3012,9 +2961,8 @@ _PageMar::_PageMar() gutter = 0; } -/*-- 07.03.2008 12:07:27--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::RegisterFrameConversion( uno::Reference< text::XTextRange > xFrameStartRange, uno::Reference< text::XTextRange > xFrameEndRange, @@ -3028,9 +2976,8 @@ void DomainMapper_Impl::RegisterFrameConversion( m_xFrameStartRange = xFrameStartRange; m_xFrameEndRange = xFrameEndRange; } -/*-- 07.03.2008 12:07:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool DomainMapper_Impl::ExecuteFrameConversion() { bool bRet = false; @@ -3118,9 +3065,8 @@ void DomainMapper_Impl::SetCurrentRedlineToken( sal_Int32 nToken ) pCurrent->m_nToken = nToken; } -/*-- 19.03.2008 11:35:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + void DomainMapper_Impl::RemoveCurrentRedline( ) { if ( m_aRedlines.size( ) > 0 ) @@ -3138,9 +3084,8 @@ void DomainMapper_Impl::ResetParaRedline( ) } } -/*-- 22.09.2009 10:26:19--------------------------------------------------- ------------------------------------------------------------------------*/ + void DomainMapper_Impl::ApplySettingsTable() { if( m_pSettingsTable ) diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 4c5b1e290c62..29a28d47b262 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -190,9 +190,8 @@ typedef std::stack< TextAppendContext > TextAppendStack; typedef std::stack<FieldContextPtr> FieldStack; typedef std::stack< com::sun::star::uno::Reference< com::sun::star::text::XTextContent > > TextContentStack; -/*-- 18.07.2006 08:49:08--------------------------------------------------- - -----------------------------------------------------------------------*/ + class FIB { sal_Int32 aFIBData[ NS_rtf::LN_LCBSTTBFUSSR - NS_rtf::LN_WIDENT + 1]; @@ -246,9 +245,8 @@ struct RedlineParams }; typedef boost::shared_ptr< RedlineParams > RedlineParamsPtr; -/*-- 03.03.2008 11:01:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + struct LineNumberSettings { bool bIsOn; @@ -265,9 +263,8 @@ struct LineNumberSettings {} }; -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + class DomainMapper; class WRITERFILTER_DLLPRIVATE DomainMapper_Impl { diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index a7b2c06626ee..c9ad3bf4428c 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -94,9 +94,8 @@ public: virtual ::sal_Int32 SAL_CALL available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException); virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException); }; -/*-- 01.11.2006 13:56:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bBmp) : m_pBuffer( buf ), m_nLength( len ), @@ -109,23 +108,20 @@ XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len, bool bB m_nHeaderLength = m_bBmp ? sizeof( aHeader ) / sizeof(sal_uInt8) : 0; } -/*-- 01.11.2006 13:56:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + XInputStreamHelper::~XInputStreamHelper() { } -/*-- 01.11.2006 13:56:21--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::sal_Int32 XInputStreamHelper::readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { return readSomeBytes( aData, nBytesToRead ); } -/*-- 01.11.2006 13:56:21--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::sal_Int32 XInputStreamHelper::readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { @@ -155,31 +151,27 @@ XInputStreamHelper::~XInputStreamHelper() } return nRet; } -/*-- 01.11.2006 13:56:21--------------------------------------------------- - -----------------------------------------------------------------------*/ + void XInputStreamHelper::skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { if( nBytesToSkip < 0 || m_nPosition + nBytesToSkip > (m_nLength + m_nHeaderLength)) throw io::BufferSizeExceededException(); m_nPosition += nBytesToSkip; } -/*-- 01.11.2006 13:56:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::sal_Int32 XInputStreamHelper::available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException) { return ( m_nLength + m_nHeaderLength ) - m_nPosition; } -/*-- 01.11.2006 13:56:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + void XInputStreamHelper::closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException) { } -/*-- 02.11.2006 09:34:29--------------------------------------------------- - -----------------------------------------------------------------------*/ + struct GraphicBorderLine { sal_Int32 nLineWidth; @@ -348,9 +340,8 @@ public: return bYSizeValid; } }; -/*-- 01.11.2006 09:42:42--------------------------------------------------- - -----------------------------------------------------------------------*/ + GraphicImport::GraphicImport(uno::Reference < uno::XComponentContext > xComponentContext, uno::Reference< lang::XMultiServiceFactory > xTextFactory, DomainMapper& rDMapper, @@ -360,16 +351,14 @@ GraphicImport::GraphicImport(uno::Reference < uno::XComponentContext > xCompo ,m_xTextFactory( xTextFactory) { } -/*-- 01.11.2006 09:42:42--------------------------------------------------- - -----------------------------------------------------------------------*/ + GraphicImport::~GraphicImport() { delete m_pImpl; } -/*-- 01.11.2006 09:45:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::attribute(Id nName, Value & val) { #ifdef DEBUG_DOMAINMAPPER @@ -1050,9 +1039,8 @@ uno::Reference<text::XTextContent> GraphicImport::GetGraphicObject() return xResult; } -/*-- 22.11.2006 09:46:48--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::ProcessShapeOptions(Value& val) { sal_Int32 nIntValue = val.getInt(); @@ -1216,9 +1204,8 @@ void GraphicImport::ProcessShapeOptions(Value& val) OSL_ENSURE( false, "shape option unsupported?"); } } -/*-- 01.11.2006 09:45:02--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::sprm(Sprm & rSprm) { #ifdef DEBUG_DOMAINMAPPER @@ -1348,9 +1335,8 @@ void GraphicImport::sprm(Sprm & rSprm) dmapper_logger->endElement(); #endif } -/*-- 01.11.2006 09:45:02--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t /*ref*/) { } @@ -1589,9 +1575,8 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b return xGraphicObject; } -/*-- 01.11.2006 09:45:02--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Reference<Properties>::Pointer_t /*ref*/) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); @@ -1604,75 +1589,63 @@ void GraphicImport::data(const sal_uInt8* buf, size_t len, writerfilter::Referen m_xGraphicObject = createGraphicObject( aMediaProperties ); } -/*-- 01.11.2006 09:45:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::startSectionGroup() { } -/*-- 01.11.2006 09:45:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::endSectionGroup() { } -/*-- 01.11.2006 09:45:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::startParagraphGroup() { } -/*-- 01.11.2006 09:45:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::endParagraphGroup() { } -/*-- 01.11.2006 09:45:03--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::startCharacterGroup() { } -/*-- 01.11.2006 09:45:04--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::endCharacterGroup() { } -/*-- 01.11.2006 09:45:04--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::text(const sal_uInt8 * /*_data*/, size_t /*len*/) { } -/*-- 01.11.2006 09:45:05--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::utext(const sal_uInt8 * /*_data*/, size_t /*len*/) { } -/*-- 01.11.2006 09:45:05--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::props(writerfilter::Reference<Properties>::Pointer_t /*ref*/) { } -/*-- 01.11.2006 09:45:06--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::table(Id /*name*/, writerfilter::Reference<Table>::Pointer_t /*ref*/) { } -/*-- 01.11.2006 09:45:07--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::substream(Id /*name*/, ::writerfilter::Reference<Stream>::Pointer_t /*ref*/) { } -/*-- 01.11.2006 09:45:07--------------------------------------------------- - -----------------------------------------------------------------------*/ + void GraphicImport::info(const string & /*info*/) { } @@ -1685,9 +1658,8 @@ void GraphicImport::endShape( ) { } -/*-- 09.08.2007 10:17:00--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool GraphicImport::IsGraphic() const { return m_pImpl->bIsGraphic; diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx index acd445117c05..d605fd32b8cf 100644 --- a/writerfilter/source/dmapper/MeasureHandler.cxx +++ b/writerfilter/source/dmapper/MeasureHandler.cxx @@ -37,24 +37,21 @@ namespace dmapper { using namespace ::com::sun::star; -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + MeasureHandler::MeasureHandler() : m_nMeasureValue( 0 ), m_nUnit( -1 ), m_nRowHeightSizeType( text::SizeType::MIN ) { } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + MeasureHandler::~MeasureHandler() { } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + void MeasureHandler::attribute(Id rName, Value & rVal) { sal_Int32 nIntValue = rVal.getInt(); @@ -90,16 +87,14 @@ void MeasureHandler::attribute(Id rName, Value & rVal) OSL_ENSURE( false, "unknown attribute"); } } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + void MeasureHandler::sprm(Sprm & rSprm) { (void)rSprm; } -/*-- 24.04.2007 09:09:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int32 MeasureHandler::getMeasureValue() const { sal_Int32 nRet = 0; @@ -114,9 +109,8 @@ sal_Int32 MeasureHandler::getMeasureValue() const } return nRet; } -/*-- 18.06.2007 10:24:26--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool MeasureHandler::isAutoWidth() const { return sal::static_int_cast<Id>(m_nUnit) == NS_ooxml::LN_Value_ST_TblWidth_auto; diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx index 06d044c17b23..229b64f3e54d 100644 --- a/writerfilter/source/dmapper/ModelEventListener.cxx +++ b/writerfilter/source/dmapper/ModelEventListener.cxx @@ -36,21 +36,18 @@ namespace dmapper { using namespace ::com::sun::star; -/*-- 22.11.2007 08:40:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + ModelEventListener::ModelEventListener() { } -/*-- 22.11.2007 08:40:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + ModelEventListener::~ModelEventListener() { } -/*-- 22.11.2007 08:40:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException) { if( rEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnFocus"))) @@ -78,9 +75,8 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) thro } } } -/*-- 22.11.2007 08:40:22--------------------------------------------------- - -----------------------------------------------------------------------*/ + void ModelEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException) { try diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index b69d10938f01..25f6df4fd820 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -49,24 +49,21 @@ namespace writerfilter { namespace dmapper { using namespace ::com::sun::star; -/*-- 23.04.2008 10:46:14--------------------------------------------------- - -----------------------------------------------------------------------*/ + OLEHandler::OLEHandler() : m_nDxaOrig(0), m_nDyaOrig(0), m_nWrapMode(1) { } -/*-- 23.04.2008 10:46:14--------------------------------------------------- - -----------------------------------------------------------------------*/ + OLEHandler::~OLEHandler() { } -/*-- 23.04.2008 10:46:14--------------------------------------------------- - -----------------------------------------------------------------------*/ + void OLEHandler::attribute(Id rName, Value & rVal) { rtl::OUString sStringValue = rVal.getString(); @@ -136,9 +133,8 @@ void OLEHandler::attribute(Id rName, Value & rVal) OSL_ENSURE( false, "unknown attribute"); } } -/*-- 23.04.2008 10:46:14--------------------------------------------------- - -----------------------------------------------------------------------*/ + void OLEHandler::sprm(Sprm & rSprm) { sal_uInt32 nSprmId = rSprm.getId(); @@ -188,9 +184,8 @@ void OLEHandler::sprm(Sprm & rSprm) } } } -/*-- 23.04.2008 11:15:19--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString OLEHandler::copyOLEOStream( uno::Reference< text::XTextDocument > xTextDocument ) { ::rtl::OUString sRet; diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx index baca2ece3556..d52871980b23 100644 --- a/writerfilter/source/dmapper/PropertyIds.cxx +++ b/writerfilter/source/dmapper/PropertyIds.cxx @@ -39,23 +39,20 @@ struct PropertyNameSupplier_Impl PropertyNameMap_t aNameMap; }; -/*-- 14.06.2006 11:01:31--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyNameSupplier::PropertyNameSupplier() : m_pImpl(new PropertyNameSupplier_Impl) { } -/*-- 14.06.2006 11:01:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyNameSupplier::~PropertyNameSupplier() { delete m_pImpl; } -/*-- 14.06.2006 11:01:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + const rtl::OUString& PropertyNameSupplier::GetName( PropertyIds eId ) const { PropertyNameMap_t::iterator aIt = m_pImpl->aNameMap.find(eId); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 4dd378bc0a2e..510c8467bb37 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -51,23 +51,20 @@ using namespace ::com::sun::star; namespace writerfilter { namespace dmapper{ -/*-- 21.06.2006 09:30:56--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyMap::PropertyMap() : m_cFootnoteSymbol( 0 ), m_nFootnoteFontId( -1 ) { } -/*-- 21.06.2006 09:30:56--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyMap::~PropertyMap() { } -/*-- 20.06.2006 10:23:55--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues() { if(!m_aValues.getLength() && size()) @@ -113,9 +110,8 @@ uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues() } return m_aValues; } -/*------------------------------------------------------------------------- - -----------------------------------------------------------------------*/ + void PropertyMap::Insert( PropertyIds eId, bool bIsTextProperty, const uno::Any& rAny, bool bOverwrite ) { // const ::rtl::OUString& rInsert = PropertyNameSupplier:: @@ -185,9 +181,8 @@ void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const } #endif -/*-- 13.12.2006 10:46:42--------------------------------------------------- - -----------------------------------------------------------------------*/ + template<class T> struct removeExistingElements : public ::std::unary_function<T, void> { @@ -201,9 +196,8 @@ template<class T> rMap.erase( aElement ); } }; -/*-- 13.12.2006 10:46:42--------------------------------------------------- - -----------------------------------------------------------------------*/ + void PropertyMap::insert( const PropertyMapPtr pMap, bool bOverwrite ) { if( pMap.get() ) @@ -216,25 +210,22 @@ void PropertyMap::insert( const PropertyMapPtr pMap, bool bOverwrite ) Invalidate(); } } -/*-- 06.06.2007 15:49:09--------------------------------------------------- - -----------------------------------------------------------------------*/ + const uno::Reference< text::XFootnote>& PropertyMap::GetFootnote() const { return m_xFootnote; } -/*-- 18.02.2008 11:23:28--------------------------------------------------- - -----------------------------------------------------------------------*/ + void PropertyMap::insertTableProperties( const PropertyMap* ) { #ifdef DEBUG_DOMAINMAPPER dmapper_logger->element("PropertyMap.insertTableProperties"); #endif } -/*-- 24.07.2006 08:29:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) : m_bIsFirstSection( bIsFirstSection ) ,m_nBorderParams( 0 ) @@ -299,24 +290,21 @@ SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) : m_sFollowPageStyleName = rPropNameSupplier.GetName( PROP_STANDARD ); } } -/*-- 24.07.2006 08:29:02--------------------------------------------------- - -----------------------------------------------------------------------*/ + SectionPropertyMap::~SectionPropertyMap() { for( sal_Int16 ePos = BORDER_LEFT; ePos <= BORDER_BOTTOM; ++ePos) delete m_pBorderLines[ePos]; } -/*-- 24.07.2006 08:31:07--------------------------------------------------- - -----------------------------------------------------------------------*/ + const ::rtl::OUString& SectionPropertyMap::GetPageStyleName( bool bFirst ) { return bFirst ? m_sFirstPageStyleName : m_sFollowPageStyleName; } -/*-- 24.07.2006 08:31:07--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::SetPageStyleName( bool bFirst, const ::rtl::OUString& rName) { if( bFirst ) @@ -324,9 +312,8 @@ void SectionPropertyMap::SetPageStyleName( bool bFirst, const ::rtl::OUString& else m_sFollowPageStyleName = rName; } -/*-- 24.07.2006 09:41:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString lcl_FindUnusedPageStyleName(const uno::Sequence< ::rtl::OUString >& rPageStyleNames) { static const sal_Char cDefaultStyle[] = "Converted"; @@ -352,9 +339,8 @@ void SectionPropertyMap::SetPageStyleName( bool bFirst, const ::rtl::OUString& return sRet; } -/*-- 28.07.2006 13:00:43--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( const uno::Reference< container::XNameContainer >& xPageStyles, const uno::Reference < lang::XMultiServiceFactory >& xTextFactory, @@ -405,18 +391,16 @@ uno::Reference< beans::XPropertySet > SectionPropertyMap::GetPageStyle( return xRet; } -/*-- 28.07.2006 10:56:26--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::SetBorder( BorderPosition ePos, sal_Int32 nLineDistance, const table::BorderLine2& rBorderLine ) { delete m_pBorderLines[ePos]; m_pBorderLines[ePos] = new table::BorderLine2( rBorderLine ); m_nBorderDistances[ePos] = nLineDistance; } -/*-- 28.07.2006 10:56:27--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::ApplyBorderToPageStyles( const uno::Reference< container::XNameContainer >& xPageStyles, const uno::Reference < lang::XMultiServiceFactory >& xTextFactory, @@ -528,9 +512,8 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference< beans::XPropertySet xStyle->setPropertyValue( sBorderDistanceName, uno::makeAny( nDist )); } -/*-- 14.12.2006 12:50:06--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( uno::Reference< beans::XPropertySet > xColumnContainer ) { @@ -592,9 +575,8 @@ uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties( return xColumns; } -/*-- 20.12.2006 09:44:16--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool SectionPropertyMap::HasHeader(bool bFirstPage) const { bool bRet = false; @@ -609,9 +591,8 @@ bool SectionPropertyMap::HasHeader(bool bFirstPage) const } return bRet; } -/*-- 20.12.2006 09:44:16--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool SectionPropertyMap::HasFooter(bool bFirstPage) const { bool bRet = false; @@ -626,9 +607,8 @@ bool SectionPropertyMap::HasFooter(bool bFirstPage) const } return bRet; } -/*-- 20.12.2006 09:41:56--------------------------------------------------- - -----------------------------------------------------------------------*/ + #define MIN_HEAD_FOOT_HEIGHT 100 //minimum header/footer height void SectionPropertyMap::CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl ) @@ -785,9 +765,8 @@ void SectionPropertyMap::PrepareHeaderFooterProperties( bool bFirstPage ) operator[]( PropertyDefinition( PROP_TOP_MARGIN, false )) = uno::makeAny( m_nTopMargin ); operator[]( PropertyDefinition( PROP_BOTTOM_MARGIN, false )) = uno::makeAny( m_nBottomMargin ); } -/*-- 11.12.2006 08:31:46--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); @@ -995,9 +974,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } } } -/*-- 11.12.2006 08:31:46--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::_ApplyProperties( uno::Reference< beans::XPropertySet > xStyle ) { PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); @@ -1025,23 +1003,20 @@ sal_Int32 lcl_AlignPaperBin( sal_Int32 nSet ) //todo: find out appropriate conversion return nSet; } -/*-- 13.12.2006 15:34:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::SetPaperBin( sal_Int32 nSet ) { m_nPaperBin = lcl_AlignPaperBin( nSet ); } -/*-- 13.12.2006 15:34:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + void SectionPropertyMap::SetFirstPaperBin( sal_Int32 nSet ) { m_nFirstPaperBin = lcl_AlignPaperBin( nSet ); } -/*-- 14.06.2007 13:57:42--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetPropertyMap::StyleSheetPropertyMap() : // mnCT_Spacing_after( 0 ), mnCT_Spacing_line( 0 ), @@ -1064,15 +1039,13 @@ StyleSheetPropertyMap::StyleSheetPropertyMap() : mnOutlineLevel( -1 ) { } -/*-- 14.06.2007 13:57:43--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetPropertyMap::~StyleSheetPropertyMap() { } -/*-- 28.12.2007 08:19:00--------------------------------------------------- - -----------------------------------------------------------------------*/ + ParagraphProperties::ParagraphProperties() : m_bFrameMode( false ), m_nDropCap(NS_ooxml::LN_Value_wordprocessingml_ST_DropCap_none), @@ -1095,9 +1068,8 @@ ParagraphProperties::ParagraphProperties() : m_nDropCapLength(0) { } -/*-- 28.12.2007 08:28:24--------------------------------------------------- - -----------------------------------------------------------------------*/ + ParagraphProperties::ParagraphProperties(const ParagraphProperties& rCopy) : m_bFrameMode ( rCopy.m_bFrameMode), m_nDropCap ( rCopy.m_nDropCap), @@ -1123,15 +1095,13 @@ ParagraphProperties::ParagraphProperties(const ParagraphProperties& rCopy) : m_xEndingRange( rCopy.m_xEndingRange) { } -/*-- 28.12.2007 11:29:18--------------------------------------------------- - -----------------------------------------------------------------------*/ + ParagraphProperties::~ParagraphProperties() { } -/*-- 28.12.2007 09:05:45--------------------------------------------------- - -----------------------------------------------------------------------*/ + int ParagraphProperties::operator==(const ParagraphProperties& rCompare) { return @@ -1154,33 +1124,28 @@ int ParagraphProperties::operator==(const ParagraphProperties& rCompare) m_yAlign == rCompare.m_yAlign && m_bAnchorLock== rCompare.m_bAnchorLock; } -/*-- 27.12.2007 13:32:36--------------------------------------------------- - -----------------------------------------------------------------------*/ + ParagraphPropertyMap::ParagraphPropertyMap() { } -/*-- 27.12.2007 13:32:36--------------------------------------------------- - -----------------------------------------------------------------------*/ + ParagraphPropertyMap::~ParagraphPropertyMap() { } -/*-- 15.02.2008 16:10:39--------------------------------------------------- - -----------------------------------------------------------------------*/ + TablePropertyMap::TablePropertyMap() { } -/*-- 15.02.2008 16:10:39--------------------------------------------------- - -----------------------------------------------------------------------*/ + TablePropertyMap::~TablePropertyMap() { } -/*-- 18.02.2008 10:06:30--------------------------------------------------- - -----------------------------------------------------------------------*/ + bool TablePropertyMap::getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill ) { if( eWhich < TablePropertyMapTarget_MAX ) @@ -1195,9 +1160,8 @@ bool TablePropertyMap::getValue( TablePropertyMapTarget eWhich, sal_Int32& nFill return false; } } -/*-- 18.02.2008 10:07:11--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet ) { if( eWhich < TablePropertyMapTarget_MAX ) @@ -1208,9 +1172,8 @@ void TablePropertyMap::setValue( TablePropertyMapTarget eWhich, sal_Int32 nSet ) else OSL_ENSURE( false, "invalid TablePropertyMapTarget"); } -/*-- 18.02.2008 11:23:28--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TablePropertyMap::insertTableProperties( const PropertyMap* pMap ) { #ifdef DEBUG_DOMAINMAPPER diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index f8ca93096101..0059bd495f24 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -74,9 +74,8 @@ enum BorderPosition BORDER_TOP, BORDER_BOTTOM }; -/*-- 15.06.2006 08:22:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + struct PropertyDefinition { PropertyIds eId; @@ -142,9 +141,8 @@ public: }; typedef boost::shared_ptr<PropertyMap> PropertyMapPtr; -/*-- 24.07.2006 08:26:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + class SectionPropertyMap : public PropertyMap { //--> debug @@ -285,9 +283,8 @@ public: }; typedef boost::shared_ptr<SectionPropertyMap> SectionPropertyMapPtr; -/*-- 28.12.2007 08:17:34--------------------------------------------------- - -----------------------------------------------------------------------*/ + class ParagraphProperties { bool m_bFrameMode; @@ -505,9 +502,8 @@ public: mnOutlineLevel = nLevel; } }; -/*-- 27.12.2007 12:38:06--------------------------------------------------- - -----------------------------------------------------------------------*/ + class ParagraphPropertyMap : public PropertyMap, public ParagraphProperties { public: @@ -515,9 +511,8 @@ public: ~ParagraphPropertyMap(); }; -/*-- 15.02.2008 16:06:52--------------------------------------------------- - -----------------------------------------------------------------------*/ + class TablePropertyMap : public PropertyMap { public: diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index db6a38b8d382..8a07e249df8e 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -229,9 +229,8 @@ void SettingsTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Poin } //returns default TabStop in 1/100th mm -/*-- 22.09.2009 10:29:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + int SettingsTable::GetDefaultTabStop() const { return ConversionHelper::convertTwipToMM100( m_pImpl->m_nDefaultTabStop ); diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index ff4c6312d304..53a5760278c4 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -61,9 +61,8 @@ namespace dmapper typedef ::std::map< ::rtl::OUString, ::rtl::OUString> StringPairMap_t; -/*-- 21.06.2006 07:34:44--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetEntry::StyleSheetEntry() : sStyleIdentifierI() ,sStyleIdentifierD() @@ -318,9 +317,8 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask return pProps; } -/*-- 06.02.2008 11:30:46--------------------------------------------------- - -----------------------------------------------------------------------*/ + struct ListCharStylePropertyMap_t { ::rtl::OUString sCharStyleName; @@ -332,9 +330,8 @@ struct ListCharStylePropertyMap_t {} }; typedef std::vector< ListCharStylePropertyMap_t > ListCharStylePropertyVector_t; -/*-- 19.06.2006 12:04:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + struct StyleSheetTable_Impl { DomainMapper& m_rDMapper; @@ -351,9 +348,8 @@ struct StyleSheetTable_Impl ::rtl::OUString HasListCharStyle( const PropertyValueVector_t& rCharProperties ); }; -/*-- 15.11.2007 08:30:02--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> xTextDocument ) : m_rDMapper( rDMapper ), m_xTextDocument( xTextDocument ), @@ -367,9 +363,8 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Referenc m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_ASIAN, true, aVal ); m_pDefaultCharProps->Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal ); } -/*-- 06.02.2008 11:45:21--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString StyleSheetTable_Impl::HasListCharStyle( const PropertyValueVector_t& rPropValues ) { ::rtl::OUString sRet; @@ -413,23 +408,20 @@ StyleSheetTable_Impl::StyleSheetTable_Impl(DomainMapper& rDMapper, uno::Referenc } return sRet; } -/*-- 19.06.2006 12:04:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetTable::StyleSheetTable(DomainMapper& rDMapper, uno::Reference< text::XTextDocument> xTextDocument) : m_pImpl( new StyleSheetTable_Impl(rDMapper, xTextDocument) ) { } -/*-- 19.06.2006 12:04:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + StyleSheetTable::~StyleSheetTable() { delete m_pImpl; } -/*-- 19.06.2006 12:04:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void StyleSheetTable::attribute(Id Name, Value & val) { #ifdef DEBUG_DOMAINMAPPER @@ -535,9 +527,8 @@ void StyleSheetTable::attribute(Id Name, Value & val) dmapper_logger->endElement(); #endif } -/*-- 19.06.2006 12:04:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void StyleSheetTable::sprm(Sprm & rSprm) { #ifdef DEBUG_DOMAINMAPPER @@ -688,9 +679,8 @@ void StyleSheetTable::sprm(Sprm & rSprm) dmapper_logger->endElement(); #endif } -/*-- 19.06.2006 12:04:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void StyleSheetTable::entry(int /*pos*/, writerfilter::Reference<Properties>::Pointer_t ref) { #ifdef DEBUG_DOMAINMAPPER @@ -780,9 +770,8 @@ uno::Sequence< ::rtl::OUString > PropValVector::getNames() } return aRet; } -/*-- 21.06.2006 13:35:48--------------------------------------------------- - -----------------------------------------------------------------------*/ + void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) { #ifdef DEBUG_DOMAINMAPPER @@ -1037,9 +1026,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) dmapper_logger->endElement(); #endif } -/*-- 22.06.2006 15:56:56--------------------------------------------------- - -----------------------------------------------------------------------*/ + const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const ::rtl::OUString& sIndex) { StyleSheetEntryPtr pRet; @@ -1053,9 +1041,8 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const ::rtl::OUSt } return pRet; } -/*-- 28.12.2007 14:45:45--------------------------------------------------- - -----------------------------------------------------------------------*/ + const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const ::rtl::OUString& sIndex) { StyleSheetEntryPtr pRet; @@ -1069,9 +1056,8 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const ::rtl: } return pRet; } -/*-- 28.12.2007 14:45:45--------------------------------------------------- - -----------------------------------------------------------------------*/ + const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const ::rtl::OUString& sIndex) { StyleSheetEntryPtr pRet; @@ -1086,9 +1072,8 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(con return pRet; } -/*-- 17.07.2006 11:47:00--------------------------------------------------- - -----------------------------------------------------------------------*/ + const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(::rtl::OUString sBaseStyle) { if( !sBaseStyle.getLength() ) @@ -1101,9 +1086,8 @@ const StyleSheetEntryPtr StyleSheetTable::FindParentStyleSheet(::rtl::OUString s return FindStyleSheetByISTD( sBaseStyle ); } -/*-- 21.12.2006 15:58:23--------------------------------------------------- - -----------------------------------------------------------------------*/ + static const sal_Char *aStyleNamePairs[] = { "Normal", "Standard", @@ -1304,9 +1288,8 @@ void StyleSheetTable::resolveAttributeProperties(Value & val) if( pProperties.get()) pProperties->resolve(*this); } -/*-- 18.07.2007 15:59:34--------------------------------------------------- - -----------------------------------------------------------------------*/ + void StyleSheetTable::applyDefaults(bool bParaProperties) { try{ @@ -1352,9 +1335,8 @@ void StyleSheetTable::applyDefaults(bool bParaProperties) { } } -/*-- 05.02.2008 10:27:36--------------------------------------------------- - -----------------------------------------------------------------------*/ + ::rtl::OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProperties ) { //find out if any of the styles already has the required properties then return it's name diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 2c17235aaa9d..ba00a9ef9212 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -39,9 +39,8 @@ namespace dmapper { using namespace ::com::sun::star; -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + TDefTableHandler::TDefTableHandler(bool bOOXML) : m_nLineWidth(0), m_nLineType(0), @@ -50,15 +49,13 @@ TDefTableHandler::TDefTableHandler(bool bOOXML) : m_bOOXML( bOOXML ) { } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + TDefTableHandler::~TDefTableHandler() { } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TDefTableHandler::attribute(Id rName, Value & rVal) { sal_Int32 nIntValue = rVal.getInt(); @@ -137,9 +134,8 @@ void TDefTableHandler::attribute(Id rName, Value & rVal) OSL_ENSURE(false, "unknown attribute"); } } -/*-- 08.10.2007 12:55:32--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TDefTableHandler::localResolve(Id rName, writerfilter::Reference<Properties>::Pointer_t pProperties) { if( pProperties.get()) @@ -178,9 +174,8 @@ void TDefTableHandler::localResolve(Id rName, writerfilter::Reference<Properties } } } -/*-- 24.04.2007 09:06:35--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TDefTableHandler::sprm(Sprm & rSprm) { switch( rSprm.getId() ) @@ -201,9 +196,8 @@ void TDefTableHandler::sprm(Sprm & rSprm) default:; } } -/*-- 24.04.2007 09:09:01--------------------------------------------------- - -----------------------------------------------------------------------*/ + PropertyMapPtr TDefTableHandler::getRowProperties() const { PropertyMapPtr pPropertyMap(new PropertyMap); @@ -230,9 +224,8 @@ PropertyMapPtr TDefTableHandler::getRowProperties() const return pPropertyMap; } -/*-- 10.05.2007 16:10:33--------------------------------------------------- - -----------------------------------------------------------------------*/ + void TDefTableHandler::fillCellProperties( size_t nCell, ::boost::shared_ptr< TablePropertyMap > pCellProperties ) const { @@ -260,9 +253,8 @@ void TDefTableHandler::fillCellProperties( if( m_aInsideVBorderLines.size() > nCell ) pCellProperties->Insert( META_PROP_VERTICAL_BORDER, false, uno::makeAny( m_aInsideVBorderLines[nCell] ) ); } -/*-- 09.05.2007 13:14:17--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Int32 TDefTableHandler::getTableWidth() const { sal_Int32 nWidth = 0; @@ -273,9 +265,8 @@ sal_Int32 TDefTableHandler::getTableWidth() const } return nWidth; } -/*-- 10.05.2007 16:09:10--------------------------------------------------- - -----------------------------------------------------------------------*/ + size_t TDefTableHandler::getCellCount() const { return m_aCellVertAlign.size(); diff --git a/writerfilter/source/filter/ImportFilter.cxx b/writerfilter/source/filter/ImportFilter.cxx index e326701888c4..91f3d3d3f8d9 100644 --- a/writerfilter/source/filter/ImportFilter.cxx +++ b/writerfilter/source/filter/ImportFilter.cxx @@ -46,9 +46,8 @@ using namespace ::rtl; using namespace ::com::sun::star; using ::comphelper::MediaDescriptor; -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException) { @@ -145,16 +144,14 @@ sal_Bool WriterFilter::filter( const uno::Sequence< beans::PropertyValue >& aDes } return sal_False; } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + void WriterFilter::cancel( ) throw (uno::RuntimeException) { } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + void WriterFilter::setTargetDocument( const uno::Reference< lang::XComponent >& xDoc ) throw (lang::IllegalArgumentException, uno::RuntimeException) { @@ -167,9 +164,8 @@ void WriterFilter::setSourceDocument( const uno::Reference< lang::XComponent >& m_xSrcDoc = xDoc; } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + void WriterFilter::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException) { uno::Sequence < beans::PropertyValue > aAnySeq; @@ -188,9 +184,8 @@ void WriterFilter::initialize( const uno::Sequence< uno::Any >& aArguments ) thr } } } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString WriterFilter_getImplementationName () throw (uno::RuntimeException) { return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WriterFilter" ) ); @@ -198,17 +193,15 @@ OUString WriterFilter_getImplementationName () throw (uno::RuntimeException) #define SERVICE_NAME1 "com.sun.star.document.ImportFilter" #define SERVICE_NAME2 "com.sun.star.document.ExportFilter" -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Bool WriterFilter_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) || ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) )); } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< OUString > WriterFilter_getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Sequence < OUString > aRet(2); @@ -220,32 +213,28 @@ uno::Sequence< OUString > WriterFilter_getSupportedServiceNames( ) throw (uno:: #undef SERVICE_NAME1 #undef SERVICE_NAME2 -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< uno::XInterface > WriterFilter_createInstance( const uno::Reference< uno::XComponentContext >& xContext) throw( uno::Exception ) { return (cppu::OWeakObject*) new WriterFilter( xContext ); } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString WriterFilter::getImplementationName( ) throw (uno::RuntimeException) { return WriterFilter_getImplementationName(); } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Bool WriterFilter::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { return WriterFilter_supportsService( rServiceName ); } -/*-- 09.06.2006 10:15:20--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< OUString > WriterFilter::getSupportedServiceNames( ) throw (uno::RuntimeException) { return WriterFilter_getSupportedServiceNames(); diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index cdac02828806..fabc34f0ba26 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -37,16 +37,14 @@ using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star; -/*-- 22.02.2007 12:19:23--------------------------------------------------- - -----------------------------------------------------------------------*/ + WriterFilter::WriterFilter( const uno::Reference< uno::XComponentContext >& rxContext) : m_xContext( rxContext ) { } -/*-- 22.02.2007 12:19:23--------------------------------------------------- - -----------------------------------------------------------------------*/ + WriterFilter::~WriterFilter() { } diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index c4fd70b7133d..34d06bebee29 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -37,32 +37,28 @@ using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star; -/*-- 22.02.2007 12:17:53--------------------------------------------------- - -----------------------------------------------------------------------*/ + WriterFilterDetection::WriterFilterDetection( const uno::Reference< uno::XComponentContext >& rxContext) : m_xContext( rxContext ) { } -/*-- 22.02.2007 12:17:53--------------------------------------------------- - -----------------------------------------------------------------------*/ + WriterFilterDetection::~WriterFilterDetection() { } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString WriterFilterDetection_getImplementationName () throw (uno::RuntimeException) { return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WriterFilterDetector" ) ); } #define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection" -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& rDescriptor ) throw( uno::RuntimeException ) { @@ -148,16 +144,14 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r sTypeName = ::rtl::OUString(); return sTypeName; } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Bool WriterFilterDetection_supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ); } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< OUString > WriterFilterDetection_getSupportedServiceNames( ) throw (uno::RuntimeException) { uno::Sequence < OUString > aRet(1); @@ -166,31 +160,27 @@ uno::Sequence< OUString > WriterFilterDetection_getSupportedServiceNames( ) thr return aRet; } #undef SERVICE_NAME1 -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Reference< uno::XInterface > WriterFilterDetection_createInstance( const uno::Reference< uno::XComponentContext >& xContext) throw( uno::Exception ) { return (cppu::OWeakObject*) new WriterFilterDetection( xContext ); } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + OUString WriterFilterDetection::getImplementationName( ) throw (uno::RuntimeException) { return WriterFilterDetection_getImplementationName(); } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + sal_Bool WriterFilterDetection::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { return WriterFilterDetection_supportsService( rServiceName ); } -/*-- 22.02.2007 12:11:38--------------------------------------------------- - -----------------------------------------------------------------------*/ + uno::Sequence< OUString > WriterFilterDetection::getSupportedServiceNames( ) throw (uno::RuntimeException) { return WriterFilterDetection_getSupportedServiceNames(); |