diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /starmath/source | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'starmath/source')
-rw-r--r-- | starmath/source/accessibility.cxx | 10 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 5 | ||||
-rw-r--r-- | starmath/source/cfgitem.cxx | 6 | ||||
-rw-r--r-- | starmath/source/detreg.cxx | 1 | ||||
-rw-r--r-- | starmath/source/dialog.cxx | 2 | ||||
-rw-r--r-- | starmath/source/document.cxx | 1 | ||||
-rw-r--r-- | starmath/source/edit.cxx | 3 | ||||
-rw-r--r-- | starmath/source/eqnolefilehdr.cxx | 4 | ||||
-rw-r--r-- | starmath/source/format.cxx | 2 | ||||
-rw-r--r-- | starmath/source/mathmlexport.hxx | 4 | ||||
-rw-r--r-- | starmath/source/mathmlimport.cxx | 48 | ||||
-rw-r--r-- | starmath/source/mathmlimport.hxx | 3 | ||||
-rw-r--r-- | starmath/source/node.cxx | 2 | ||||
-rw-r--r-- | starmath/source/parse.cxx | 4 | ||||
-rw-r--r-- | starmath/source/rect.cxx | 4 | ||||
-rw-r--r-- | starmath/source/register.cxx | 1 | ||||
-rw-r--r-- | starmath/source/smmod.cxx | 2 | ||||
-rw-r--r-- | starmath/source/typemap.cxx | 1 | ||||
-rw-r--r-- | starmath/source/unomodel.cxx | 3 | ||||
-rw-r--r-- | starmath/source/utility.cxx | 7 |
20 files changed, 0 insertions, 113 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 60707373d216..1b61f14c566f 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -66,7 +66,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; - static awt::Rectangle lcl_GetBounds( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::implGetBounds() @@ -109,7 +108,6 @@ static awt::Point lcl_GetLocationOnScreen( vcl::Window *pWin ) } - SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) : aAccName (SM_RESSTR(RID_DOCUMENTSTR)), nClientId (0), @@ -795,9 +793,6 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames() } - - - SmEditSource::SmEditSource( SmEditWindow * /*pWin*/, SmEditAccessible &rAcc ) : aViewFwd (rAcc), aTextFwd (rAcc, *this), @@ -926,8 +921,6 @@ Point SmViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod } - - SmTextForwarder::SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource) : rEditAcc ( rAcc ), rEditSource (rSource) @@ -1459,7 +1452,6 @@ void SmTextForwarder::CopyText(const SvxTextForwarder& rSource) } - SmEditViewForwarder::SmEditViewForwarder( SmEditAccessible& rAcc ) : rEditAcc( rAcc ) { @@ -1598,7 +1590,6 @@ bool SmEditViewForwarder::Paste() } - SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) : aAccName (SM_RESSTR(STR_CMDBOXWINDOW)), pTextHelper (), @@ -1928,5 +1919,4 @@ Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index 953e44790e50..8072a5a677d8 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -48,7 +48,6 @@ struct AccessibleEventObject; }}}} - // classes and helper-classes used for accessibility in the graphic-window @@ -146,7 +145,6 @@ public: }; - // classes and helper-classes used for accessibility in the command-window @@ -298,8 +296,6 @@ public: }; - - typedef cppu::WeakImplHelper < @@ -372,7 +368,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index bce39c38e457..dc70029426d5 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -144,8 +144,6 @@ SmCfgOther::SmCfgOther() } - - SmFontFormat::SmFontFormat() { aName = FONTNAME_MATH; @@ -192,8 +190,6 @@ bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const } - - SmFntFmtListEntry::SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ) : aId (rId), aFntFmt (rFntFmt) @@ -265,7 +261,6 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const OUString &rFntFmtId } - const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const { const SmFontFormat *pRes = nullptr; @@ -331,7 +326,6 @@ const OUString SmFontFormatList::GetNewFontFormatId() const } - SmMathConfig::SmMathConfig() : ConfigItem(OUString(aRootName)) , pFormat() diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx index e008d5d18253..9827c2d13282 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -67,5 +67,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL smd_component_getFactory( const sal_Char* pI } // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 3f8a41337939..3c23d9c29b19 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1437,8 +1437,6 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol) } - - void SmSymbolDialog::FillSymbolSets(bool bDeleteText) // populate the entries of possible SymbolsSets in the dialog with // current values of the SymbolSet manager but selects none of those diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 6d6bd01003c6..28355b5c55aa 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -780,7 +780,6 @@ bool SmDocShell::Load( SfxMedium& rMedium ) } - bool SmDocShell::Save() { //! apply latest changes if necessary diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 027b4027d329..08158cc7c396 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -58,8 +58,6 @@ using namespace com::sun::star::accessibility; using namespace com::sun::star; - - void SmGetLeftSelectionPart(const ESelection &rSel, sal_Int32 &nPara, sal_uInt16 &nPos) // returns paragraph number and position of the selections left part @@ -83,7 +81,6 @@ bool SmEditWindow::IsInlineEditEnabled() } - SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) : Window (&rMyCmdBoxWin), DropTargetHelper ( this ), diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index ed7c0044ce5c..63e9d090dcc9 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -21,9 +21,6 @@ #include <sot/storage.hxx> - - - bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) { sal_uInt8 nVer = 0; @@ -53,5 +50,4 @@ bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index fe3fde2d49e3..0291736cfdfb 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -23,7 +23,6 @@ #include "format.hxx" - // Latin default-fonts static const DefaultFontType aLatinDefFnts[FNT_END] = { @@ -94,7 +93,6 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) } - SmFormat::SmFormat() : aBaseSize(0, SmPtsTo100th_mm(12)) { diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 44e9c5782568..f78b6f23b00a 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -36,8 +36,6 @@ namespace com { namespace sun { namespace star { } } } - - class SmXMLExportWrapper { css::uno::Reference<css::frame::XModel> xModel; @@ -67,7 +65,6 @@ public: }; - class SmXMLExport : public SvXMLExport { const SmNode * pTree; @@ -118,7 +115,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 36884c9d6405..81a10df101ac 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -394,7 +394,6 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( } - SmXMLImport::SmXMLImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags) @@ -432,7 +431,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance( } - OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" ); @@ -452,7 +450,6 @@ throw( uno::Exception ) } - OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisSettingsImporter" ); @@ -527,7 +524,6 @@ void SmXMLImport::endDocument() } - class SmXMLImportContext: public SvXMLImportContext { public: @@ -571,7 +567,6 @@ SvXMLImportContext * SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix } - struct SmXMLContext_Helper { sal_Int8 nIsBold; @@ -745,7 +740,6 @@ void SmXMLContext_Helper::ApplyAttrs() } - class SmXMLDocContext_Impl : public SmXMLImportContext { public: @@ -759,7 +753,6 @@ public: }; - /*avert thy gaze from the proginator*/ class SmXMLRowContext_Impl : public SmXMLDocContext_Impl { @@ -782,7 +775,6 @@ public: }; - class SmXMLEncloseContext_Impl : public SmXMLRowContext_Impl { public: @@ -807,7 +799,6 @@ void SmXMLEncloseContext_Impl::EndElement() } - class SmXMLFracContext_Impl : public SmXMLRowContext_Impl { public: @@ -820,7 +811,6 @@ public: }; - class SmXMLSqrtContext_Impl : public SmXMLRowContext_Impl { public: @@ -832,7 +822,6 @@ public: }; - class SmXMLRootContext_Impl : public SmXMLRowContext_Impl { public: @@ -844,7 +833,6 @@ public: }; - class SmXMLStyleContext_Impl : public SmXMLRowContext_Impl { protected: @@ -881,7 +869,6 @@ void SmXMLStyleContext_Impl::EndElement() } - class SmXMLPaddedContext_Impl : public SmXMLRowContext_Impl { public: @@ -905,7 +892,6 @@ void SmXMLPaddedContext_Impl::EndElement() } - class SmXMLPhantomContext_Impl : public SmXMLRowContext_Impl { public: @@ -939,7 +925,6 @@ void SmXMLPhantomContext_Impl::EndElement() } - class SmXMLFencedContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1034,8 +1019,6 @@ void SmXMLFencedContext_Impl::EndElement() } - - class SmXMLErrorContext_Impl : public SmXMLRowContext_Impl { public: @@ -1063,7 +1046,6 @@ void SmXMLErrorContext_Impl::EndElement() } - class SmXMLNumberContext_Impl : public SmXMLImportContext { protected: @@ -1095,7 +1077,6 @@ void SmXMLNumberContext_Impl::EndElement() } - class SmXMLAnnotationContext_Impl : public SmXMLImportContext { bool bIsStarMath; @@ -1142,7 +1123,6 @@ void SmXMLAnnotationContext_Impl::Characters(const OUString &rChars) } - class SmXMLTextContext_Impl : public SmXMLImportContext { protected: @@ -1174,7 +1154,6 @@ void SmXMLTextContext_Impl::EndElement() } - class SmXMLStringContext_Impl : public SmXMLImportContext { protected: @@ -1216,7 +1195,6 @@ void SmXMLStringContext_Impl::EndElement() } - class SmXMLIdentifierContext_Impl : public SmXMLImportContext { protected: @@ -1280,7 +1258,6 @@ void SmXMLIdentifierContext_Impl::TCharacters(const OUString &rChars) } - class SmXMLOperatorContext_Impl : public SmXMLImportContext { bool bIsStretchy; @@ -1319,7 +1296,6 @@ void SmXMLOperatorContext_Impl::EndElement() } - void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -1347,8 +1323,6 @@ void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< } - - class SmXMLSpaceContext_Impl : public SmXMLImportContext { public: @@ -1374,7 +1348,6 @@ void SmXMLSpaceContext_Impl::StartElement( } - class SmXMLSubContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1419,7 +1392,6 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup eSubSup } - class SmXMLSupContext_Impl : public SmXMLSubContext_Impl { public: @@ -1434,7 +1406,6 @@ public: }; - class SmXMLSubSupContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1480,7 +1451,6 @@ void SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType, } - class SmXMLUnderContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1547,7 +1517,6 @@ void SmXMLUnderContext_Impl::EndElement() } - class SmXMLOverContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1605,7 +1574,6 @@ void SmXMLOverContext_Impl::HandleAccent() } - class SmXMLUnderOverContext_Impl : public SmXMLSubSupContext_Impl { public: @@ -1620,7 +1588,6 @@ public: }; - class SmXMLMultiScriptsContext_Impl : public SmXMLSubSupContext_Impl { bool bHasPrescripts; @@ -1640,7 +1607,6 @@ public: }; - class SmXMLNoneContext_Impl : public SmXMLImportContext { public: @@ -1664,7 +1630,6 @@ void SmXMLNoneContext_Impl::EndElement() } - class SmXMLPrescriptsContext_Impl : public SmXMLImportContext { public: @@ -1674,7 +1639,6 @@ public: }; - class SmXMLTableRowContext_Impl : public SmXMLRowContext_Impl { public: @@ -1689,8 +1653,6 @@ public: }; - - class SmXMLTableContext_Impl : public SmXMLTableRowContext_Impl { public: @@ -1706,8 +1668,6 @@ public: }; - - class SmXMLTableCellContext_Impl : public SmXMLRowContext_Impl { public: @@ -1718,7 +1678,6 @@ public: }; - class SmXMLAlignGroupContext_Impl : public SmXMLRowContext_Impl { public: @@ -1734,7 +1693,6 @@ public: }; - class SmXMLActionContext_Impl : public SmXMLRowContext_Impl { size_t mnSelection; // 1-based @@ -1751,7 +1709,6 @@ public: }; - // NB: virtually inherit so we can multiply inherit properly // in SmXMLFlatDocContext_Impl class SmXMLOfficeContext_Impl : public virtual SvXMLImportContext @@ -1788,7 +1745,6 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref } - // context for flat file xml format class SmXMLFlatDocContext_Impl : public SmXMLOfficeContext_Impl, public SvXMLMetaDocumentContext @@ -1836,7 +1792,6 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( } - static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS }, @@ -2993,7 +2948,4 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx index 961efadd8530..bef17d24ed2a 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star { } } } - class SmXMLImportWrapper { css::uno::Reference<css::frame::XModel> xModel; @@ -67,7 +66,6 @@ public: }; - class SmXMLImport : public SvXMLImport { std::unique_ptr<SvXMLTokenMap> pPresLayoutElemTokenMap; @@ -254,7 +252,6 @@ public: }; - enum SmXMLMathElemTokenMap { XML_TOK_MATH diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 7eb60dcc5aa0..a518df4455d5 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -519,7 +519,6 @@ long SmNode::GetFormulaBaseline() const } - SmStructureNode::SmStructureNode( const SmStructureNode &rNode ) : SmNode( rNode.GetType(), rNode.GetToken() ) { @@ -1022,7 +1021,6 @@ void SmDynIntegralNode::CreateTextFromNode(OUString &rText) } - /**************************************************************************/ diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index b07eaca5c3ec..c2c7e883d1bb 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -61,8 +61,6 @@ SmToken::SmToken(SmTokenType eTokenType, } - - static const SmTokenTableEntry aTokenTable[] = { { "Im" , TIM, MS_IM, TGSTANDALONE, 5 }, @@ -313,8 +311,6 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const OUString &rName ) } - - #if OSL_DEBUG_LEVEL > 1 static const sal_Unicode aDelimiterTable[] = diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index 2dd06841639f..0cd7504e5add 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -31,7 +31,6 @@ #include <cassert> - // '\0' terminated Array with symbol, which should be treat as letters in // StarMath Font, (to get a normal (non-clipped) SmRect in contrast to the // other operators and symbols). @@ -71,12 +70,9 @@ bool SmIsMathAlpha(const OUString &rText) } - - // SmRect members - SmRect::SmRect() // constructs empty rectangle at (0, 0) with width and height 0. { diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index f28171060fd1..237bb4acb16f 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -94,5 +94,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory( const sal_Char* pIm } // extern "C" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 0ba1e2c2d49d..403597daf23e 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -46,14 +46,12 @@ #include <svx/xmlsecctrl.hxx> - SmResId::SmResId( sal_uInt16 nId ) : ResId(nId, *SM_MOD()->GetResMgr()) { } - SmLocalizedSymbolData::SmLocalizedSymbolData() : Resource( SmResId(RID_LOCALIZED_NAMES) ), aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ), diff --git a/starmath/source/typemap.cxx b/starmath/source/typemap.cxx index e9a1bd90e04a..aaa5b01358b7 100644 --- a/starmath/source/typemap.cxx +++ b/starmath/source/typemap.cxx @@ -31,5 +31,4 @@ #include "smslots.hxx" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index a02f4e5a7379..812cde5e3c24 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -152,8 +152,6 @@ SmPrintUIOptions::SmPrintUIOptions() } - - // class SmModel @@ -926,7 +924,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu } - sal_Int32 SAL_CALL SmModel::getRendererCount( const uno::Any& /*rSelection*/, const uno::Sequence< beans::PropertyValue >& /*xOptions*/ ) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 2c306c5932f1..77cc81478660 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -33,8 +33,6 @@ #include "smdll.hxx" - - // return pointer to active SmViewShell, if this is not possible // return 0 instead. //!! Since this method is based on the current focus it is somewhat @@ -46,9 +44,6 @@ SmViewShell * SmGetActiveView() } - - - /**************************************************************************/ void SmFontPickList::Clear() @@ -215,7 +210,6 @@ void SmFontPickListBox::Remove(const vcl::Font &rFont) } - bool IsItalic( const vcl::Font &rFont ) { FontItalic eItalic = rFont.GetItalic(); @@ -286,5 +280,4 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |