Kaydet (Commit) 8440c9ed authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara

Remove visual noise from writerfilter

Change-Id: I2470e26f1b0a7c3b28fbc0ec44170565f250fc40
Reviewed-on: https://gerrit.libreoffice.org/8342Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c2a0a2bb
...@@ -174,6 +174,6 @@ private: ...@@ -174,6 +174,6 @@ private:
} // namespace dmapper } // namespace dmapper
} // namespace writerfilter } // namespace writerfilter
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -78,6 +78,6 @@ public: ...@@ -78,6 +78,6 @@ public:
typedef boost::shared_ptr< BorderHandler > BorderHandlerPtr; typedef boost::shared_ptr< BorderHandler > BorderHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -64,6 +64,6 @@ public: ...@@ -64,6 +64,6 @@ public:
typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr; typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -67,6 +67,6 @@ public: ...@@ -67,6 +67,6 @@ public:
typedef boost::shared_ptr< CellMarginHandler > CellMarginHandlerPtr; typedef boost::shared_ptr< CellMarginHandler > CellMarginHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -1038,10 +1038,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap ) ...@@ -1038,10 +1038,10 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
} }
} }
else // else
{ {
// (1) doesn't need handling // (1) doesn't need handling
//
if( !bIsDropCap && pParaContext->IsFrameMode() ) if( !bIsDropCap && pParaContext->IsFrameMode() )
{ {
pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) ); pToBeSavedProperties.reset( new ParagraphProperties(*pParaContext) );
...@@ -1258,7 +1258,7 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pO ...@@ -1258,7 +1258,7 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pO
RemoveLastParagraph(); RemoveLastParagraph();
m_aTextAppendStack.pop(); m_aTextAppendStack.pop();
//
appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() ); appendTextContent( xOLE, uno::Sequence< beans::PropertyValue >() );
} }
...@@ -3717,9 +3717,9 @@ void DomainMapper_Impl::PopFieldContext() ...@@ -3717,9 +3717,9 @@ void DomainMapper_Impl::PopFieldContext()
OSL_FAIL( "exception in PopFieldContext()" ); OSL_FAIL( "exception in PopFieldContext()" );
} }
} }
//
//TOCs have to include all the imported content //TOCs have to include all the imported content
//...
} }
//remove the field context //remove the field context
m_aFieldStack.pop(); m_aFieldStack.pop();
......
...@@ -176,7 +176,7 @@ enum FieldId ...@@ -176,7 +176,7 @@ enum FieldId
\w paragraph number in full context \w paragraph number in full context
\* Upper/Lower... \* Upper/Lower...
*/ */
,FIELD_REF // ,FIELD_REF
/* REVNUM \* Numberingswitch \* MERGEFORMAT -> /* REVNUM \* Numberingswitch \* MERGEFORMAT ->
DocInfo-revision number DocInfo-revision number
*/ */
......
...@@ -114,6 +114,6 @@ private: ...@@ -114,6 +114,6 @@ private:
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -122,6 +122,6 @@ public: ...@@ -122,6 +122,6 @@ public:
typedef boost::shared_ptr< GraphicImport > GraphicImportPtr; typedef boost::shared_ptr< GraphicImport > GraphicImportPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -61,6 +61,6 @@ typedef boost::shared_ptr ...@@ -61,6 +61,6 @@ typedef boost::shared_ptr
< MeasureHandler > MeasureHandlerPtr; < MeasureHandler > MeasureHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -42,6 +42,6 @@ public: ...@@ -42,6 +42,6 @@ public:
}; };
}//namespace writerfilter }//namespace writerfilter
}//namespace dmapper }//namespace dmapper
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -305,7 +305,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( ) ...@@ -305,7 +305,7 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( )
//2.2 //2.2
//2.3 //2.3
//3.4 //3.4
//
if( m_nFWord6 > 0) //Word 6 compatibility if( m_nFWord6 > 0) //Word 6 compatibility
{ {
......
...@@ -88,6 +88,6 @@ public: ...@@ -88,6 +88,6 @@ public:
typedef boost::shared_ptr< OLEHandler > OLEHandlerPtr; typedef boost::shared_ptr< OLEHandler > OLEHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -63,6 +63,6 @@ public: ...@@ -63,6 +63,6 @@ public:
typedef boost::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr; typedef boost::shared_ptr< SectionColumnHandler > SectionColumnHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -91,6 +91,6 @@ class SettingsTable : public LoggedProperties, public LoggedTable ...@@ -91,6 +91,6 @@ class SettingsTable : public LoggedProperties, public LoggedTable
typedef boost::shared_ptr< SettingsTable > SettingsTablePtr; typedef boost::shared_ptr< SettingsTable > SettingsTablePtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -143,7 +143,7 @@ public: ...@@ -143,7 +143,7 @@ public:
// Gets all the properties // Gets all the properties
// + corresponding to the mask, // + corresponding to the mask,
// + from the parent styles // + from the parent styles
//
// @param mask mask describing which properties to return // @param mask mask describing which properties to return
// @param pStack already processed StyleSheetEntries // @param pStack already processed StyleSheetEntries
PropertyMapPtr GetProperties( sal_Int32 nMask, StyleSheetEntryDequePtr pStack = StyleSheetEntryDequePtr()); PropertyMapPtr GetProperties( sal_Int32 nMask, StyleSheetEntryDequePtr pStack = StyleSheetEntryDequePtr());
...@@ -158,6 +158,6 @@ typedef boost::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr; ...@@ -158,6 +158,6 @@ typedef boost::shared_ptr<TableStyleSheetEntry> TableStyleSheetEntryPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -88,6 +88,6 @@ public: ...@@ -88,6 +88,6 @@ public:
typedef boost::shared_ptr< TDefTableHandler > TDefTableHandlerPtr; typedef boost::shared_ptr< TDefTableHandler > TDefTableHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -275,7 +275,7 @@ namespace dmapper { ...@@ -275,7 +275,7 @@ namespace dmapper {
} }
break; break;
case NS_ooxml::LN_CT_TcPrBase_tcMar: case NS_ooxml::LN_CT_TcPrBase_tcMar:
//
{ {
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if (pProperties.get()) if (pProperties.get())
......
...@@ -60,6 +60,6 @@ public: ...@@ -60,6 +60,6 @@ public:
typedef boost::shared_ptr< ThemeTable > ThemeTablePtr; typedef boost::shared_ptr< ThemeTable > ThemeTablePtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -43,6 +43,6 @@ typedef boost::shared_ptr ...@@ -43,6 +43,6 @@ typedef boost::shared_ptr
< TrackChangesHandler > TrackChangesHandlerPtr; < TrackChangesHandler > TrackChangesHandlerPtr;
}} }}
#endif // #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment