diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 23:10:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:05:36 -0600 |
commit | 8440c9ed92561c307bfab131c7de7144ed24100b (patch) | |
tree | 3cdc144e7a5cf09f6a72a4544337a8bae65d78fc | |
parent | Remove visual noise from xmerge (diff) | |
download | core-8440c9ed92561c307bfab131c7de7144ed24100b.tar.gz core-8440c9ed92561c307bfab131c7de7144ed24100b.zip |
Remove visual noise from writerfilter
Change-Id: I2470e26f1b0a7c3b28fbc0ec44170565f250fc40
Reviewed-on: https://gerrit.libreoffice.org/8342
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
19 files changed, 24 insertions, 24 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index ce30d69b5de2..0a9ecbe9697d 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -174,6 +174,6 @@ private: } // namespace dmapper } // namespace writerfilter -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx index 7b52962352ee..efe290998f09 100644 --- a/writerfilter/source/dmapper/BorderHandler.hxx +++ b/writerfilter/source/dmapper/BorderHandler.hxx @@ -78,6 +78,6 @@ public: typedef boost::shared_ptr< BorderHandler > BorderHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx index 1683d509ffbc..fbfef52276da 100644 --- a/writerfilter/source/dmapper/CellColorHandler.hxx +++ b/writerfilter/source/dmapper/CellColorHandler.hxx @@ -64,6 +64,6 @@ public: typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/writerfilter/source/dmapper/CellMarginHandler.hxx index 902ef80fdec1..24be82bab9dc 100644 --- a/writerfilter/source/dmapper/CellMarginHandler.hxx +++ b/writerfilter/source/dmapper/CellMarginHandler.hxx @@ -67,6 +67,6 @@ public: typedef boost::shared_ptr< CellMarginHandler > CellMarginHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 6e4d439a2204..f86fbd58ad9d 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1038,10 +1038,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) } } - else // + else { // (1) doesn't need handling - // + if( !bIsDropCap && pParaContext->IsFrameMode() ) { pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) ); @@ -1258,7 +1258,7 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pO RemoveLastParagraph(); m_aTextAppendStack.pop(); - // + appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() ); } @@ -3717,9 +3717,9 @@ void DomainMapper_Impl::PopFieldContext() OSL_FAIL( "exception in PopFieldContext()" ); } } - // + //TOCs have to include all the imported content - //... + } //remove the field context m_aFieldStack.pop(); diff --git a/writerfilter/source/dmapper/FieldTypes.hxx b/writerfilter/source/dmapper/FieldTypes.hxx index 2a54dfea2da6..9d3d360f8d3b 100644 --- a/writerfilter/source/dmapper/FieldTypes.hxx +++ b/writerfilter/source/dmapper/FieldTypes.hxx @@ -176,7 +176,7 @@ enum FieldId \w paragraph number in full context \* Upper/Lower... */ - ,FIELD_REF // + ,FIELD_REF /* REVNUM \* Numberingswitch \* MERGEFORMAT -> DocInfo-revision number */ diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx index 9ea59aef2218..617cbd4774e6 100644 --- a/writerfilter/source/dmapper/FontTable.hxx +++ b/writerfilter/source/dmapper/FontTable.hxx @@ -114,6 +114,6 @@ private: }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx index a3ffbe49a01e..56c96806f229 100644 --- a/writerfilter/source/dmapper/GraphicImport.hxx +++ b/writerfilter/source/dmapper/GraphicImport.hxx @@ -122,6 +122,6 @@ public: typedef boost::shared_ptr< GraphicImport > GraphicImportPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx index 619532bbf289..be8be8a5ca4e 100644 --- a/writerfilter/source/dmapper/MeasureHandler.hxx +++ b/writerfilter/source/dmapper/MeasureHandler.hxx @@ -61,6 +61,6 @@ typedef boost::shared_ptr < MeasureHandler > MeasureHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx index dd18c132cb1c..8b8b75578214 100644 --- a/writerfilter/source/dmapper/ModelEventListener.hxx +++ b/writerfilter/source/dmapper/ModelEventListener.hxx @@ -42,6 +42,6 @@ public: }; }//namespace writerfilter }//namespace dmapper -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 98d9c44c6f26..c868c11e8614 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -305,7 +305,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( ) //2.2 //2.3 //3.4 - // + if( m_nFWord6 > 0) //Word 6 compatibility { diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index d3e3b1f5a135..1416a708f928 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -88,6 +88,6 @@ public: typedef boost::shared_ptr< OLEHandler > OLEHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx index 317e98dd63a2..347534571dd4 100644 --- a/writerfilter/source/dmapper/SectionColumnHandler.hxx +++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx @@ -63,6 +63,6 @@ public: typedef boost::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 37320b691c09..b19146af609f 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -91,6 +91,6 @@ class SettingsTable : public LoggedProperties, public LoggedTable typedef boost::shared_ptr< SettingsTable > SettingsTablePtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index f483eef87105..bcb5700fb414 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -143,7 +143,7 @@ public: // Gets all the properties // + corresponding to the mask, // + from the parent styles - // + // @param mask mask describing which properties to return // @param pStack already processed StyleSheetEntries PropertyMapPtr GetProperties( sal_Int32 nMask, StyleSheetEntryDequePtr pStack = StyleSheetEntryDequePtr()); @@ -158,6 +158,6 @@ typedef boost::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx index ebfc54563c0c..3a1c7d7f55b8 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.hxx +++ b/writerfilter/source/dmapper/TDefTableHandler.hxx @@ -88,6 +88,6 @@ public: typedef boost::shared_ptr< TDefTableHandler > TDefTableHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index d8bcd0575a6f..37e99b208ee0 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -275,7 +275,7 @@ namespace dmapper { } break; case NS_ooxml::LN_CT_TcPrBase_tcMar: - // + { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if (pProperties.get()) diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx index dedcede6b4e4..e159954e77ac 100644 --- a/writerfilter/source/dmapper/ThemeTable.hxx +++ b/writerfilter/source/dmapper/ThemeTable.hxx @@ -60,6 +60,6 @@ public: typedef boost::shared_ptr< ThemeTable > ThemeTablePtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx index 4f1e34ccf990..db4ba4800f7b 100644 --- a/writerfilter/source/dmapper/TrackChangesHandler.hxx +++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx @@ -43,6 +43,6 @@ typedef boost::shared_ptr < TrackChangesHandler > TrackChangesHandlerPtr; }} -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |