diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:25 -0400 |
commit | 8dcf22abfc6a07ececcef6bb830fdea825d416ec (patch) | |
tree | 7e0b3686991aef9689218ed309f462987f36e273 /starmath | |
parent | b91e39cf1b2d0c4201993d768a1b2c686eeff0de (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
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
(cherry picked from commit a238b1f8d304bf1e2ffb357937f3ec888ee8ac89)
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Diffstat (limited to 'starmath')
29 files changed, 0 insertions, 207 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 4e7f374268ae..0008a521a951 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -322,7 +322,6 @@ public: }; - class SmShowSymbol : public Control { Link<SmShowSymbol&,void> aDblClickHdlLink; @@ -345,7 +344,6 @@ public: }; - class SmSymDefineDialog; class SmSymbolDialog : public ModalDialog @@ -390,7 +388,6 @@ public: }; - class SmShowChar : public Control { virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle&) override; @@ -407,7 +404,6 @@ public: }; - class SmSymDefineDialog : public ModalDialog { VclPtr<ComboBox> pOldSymbols; @@ -507,7 +503,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 9a94f0115982..f70a9203bf82 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -67,7 +67,6 @@ class SmDocShell; class EditEngine; - class SmPrinterAccess { VclPtr<Printer> pPrinter; @@ -80,12 +79,9 @@ public: }; - - void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool); - class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener { friend class SmPrinterAccess; @@ -107,7 +103,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener std::set< OUString > aUsedSymbols; // to export used symbols only when saving - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; bool WriteAsMathType3( SfxMedium& ); diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index f07687ac05f5..28becba19c89 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -87,9 +87,6 @@ enum SmNodeType }; - - - class SmNode : public SmRect { SmFace maFace; @@ -229,7 +226,6 @@ private: }; - /** A simple auxiliary iterator class for SmNode * * Example of iteration over children of pMyNode: @@ -288,7 +284,6 @@ private: }; - /** Abstract baseclass for all composite node * * Subclasses of this class can have subnodes. Nodes that doesn't derivate from @@ -363,9 +358,6 @@ public: }; - - - class SmGraphicNode : public SmVisibleNode { protected: @@ -379,8 +371,6 @@ public: }; - - /** Draws a rectangle * * Used for drawing the line in the OVER and OVERSTRIKE commands. @@ -404,8 +394,6 @@ public: }; - - /** Polygon line node * * Used to draw the slash of the WIDESLASH command by SmBinDiagonalNode. @@ -431,8 +419,6 @@ public: }; - - /** Text node * * @remarks This class also serves as baseclass for all nodes that contains text. @@ -496,8 +482,6 @@ public: }; - - /** Special node for user defined characters * * Node used for pre- and user-defined characters from: @@ -522,8 +506,6 @@ public: }; - - /** Glyph node for custom operators * * This node is used with commands: oper, uoper and boper. @@ -545,8 +527,6 @@ public: }; - - /** Math symbol node * * Use for math symbols such as plus, minus and integrale in the INT command. @@ -575,7 +555,6 @@ public: }; - /** Math Identifier * * This behaves essentially the same as SmMathSymbolNode and is only used to @@ -590,7 +569,6 @@ public: }; - /** Root symbol node * * Root symbol node used by SmRootNode to create the root symbol, in front of @@ -639,8 +617,6 @@ public: }; - - /** Place node * * Used to create the <?> command, that denotes place where something can be @@ -662,8 +638,6 @@ public: }; - - /** Error node, for parsing errors * * This node is used for parsing errors and draws an questionmark turned upside @@ -684,8 +658,6 @@ public: }; - - /** Table node * * This is the root node for the formula tree. This node is also used for the @@ -713,8 +685,6 @@ public: }; - - /** A line * * Used as child of SmTableNode when the SmTableNode is the root node of the @@ -747,8 +717,6 @@ public: }; - - /** Expression node * * Used whenever you have an expression such as "A OVER {B + C}", here there is @@ -768,8 +736,6 @@ public: }; - - /** Unary horizontal node * * The same as SmBinHorNode except this is for unary operators. @@ -788,8 +754,6 @@ public: }; - - /** Root node * * Used for create square roots and other roots, example: @@ -856,8 +820,6 @@ public: }; - - /** Binary horizontal node * * This node is used for binary operators. In a formula such as "A + B". @@ -890,8 +852,6 @@ public: }; - - /** Binary horizontal node * * This node is used for creating the OVER command, consider the formula: @@ -922,8 +882,6 @@ public: }; - - /** Binary diagonal node * * Used for implementing the WIDESLASH command, example: "A WIDESLASH B". @@ -952,9 +910,6 @@ public: }; - - - /** Enum used to index sub-/supscripts in the 'aSubNodes' array * in 'SmSubSupNode' * @@ -1035,8 +990,6 @@ public: }; - - /** Node for brace construction * * Used for "lbrace [body] rbrace" and similar constructions. @@ -1072,8 +1025,6 @@ public: }; - - /** Body of an SmBraceNode * * This usually only has one child an SmExpressionNode, however, it can also @@ -1103,8 +1054,6 @@ inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) : } - - /** Node for vertical brace construction * * Used to implement commands "[body] underbrace [script]" and @@ -1141,9 +1090,6 @@ inline SmVerticalBraceNode::SmVerticalBraceNode(const SmToken &rNodeToken) : } - - - /** Operation Node * * Used for commands like SUM, INT and similar. @@ -1176,8 +1122,6 @@ public: }; - - /** Node used for alignment * * This node has exactly one child at index 0. @@ -1194,8 +1138,6 @@ public: }; - - /** Attribute node * * Used to give an attribute to another node. Used for commands such as: @@ -1224,8 +1166,6 @@ public: }; - - /** Font node * * Used to change the font of its children. @@ -1254,8 +1194,6 @@ public: }; - - /** Matrix node * * Used to implement the MATRIX command, example: @@ -1286,8 +1224,6 @@ public: }; - - /** Node for whitespace * * Used to implement the "~" command. This node is just a blank space. @@ -1314,9 +1250,6 @@ public: }; - - - inline SmNode* SmRootNode::Argument() { OSL_ASSERT( GetNumSubNodes() > 0 ); @@ -1346,7 +1279,6 @@ inline const SmNode* SmRootNode::Body() const } - inline SmDynIntegralSymbolNode* SmDynIntegralNode::Symbol() { OSL_ASSERT( GetNumSubNodes() > 0 && GetSubNode( 0 )->GetType() == NDYNINTSYMBOL ); diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index ac7e99d2e5ee..fb6063e91d97 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -43,7 +43,6 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist) } - // SmRect // ... (to be done) // This Implementation assumes that the x-axis points to the right and the diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 4a53375063f3..4397edacacbe 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -54,7 +54,6 @@ class SvtSysLocale; class VirtualDevice; - class SmResId : public ResId { public: diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 475515fe6514..f73d15617ab7 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -37,8 +37,6 @@ #define SYMBOL_NONE 0xFFFF - - inline const OUString GetUiSymbolName( const OUString &rExportSymbolName ) { return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName ); @@ -56,7 +54,6 @@ inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName ) } - class SmSym { private: diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index cd8be00162b4..73b26fefcecd 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -24,11 +24,9 @@ #define FONTNAME_MATH "OpenSymbol" - enum SmPrintSize { PRINT_SIZE_NORMAL, PRINT_SIZE_SCALED, PRINT_SIZE_ZOOMED }; - inline bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar && cChar <= 0xF8FF; } sal_Unicode ConvertMathToMathML( sal_Unicode cChar ); diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index c853806b5302..95c15d9392e7 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -45,9 +45,6 @@ public: }; - - - class SmModel : public SfxBaseModel, public comphelper::PropertySetHelper, public css::lang::XServiceInfo, @@ -101,7 +98,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 4c86f33e12e4..b8ede623b80c 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -65,8 +65,6 @@ class SmViewShell; SmViewShell * SmGetActiveView(); - - // SmFace @@ -107,8 +105,6 @@ public: SmFace & operator *= (SmFace &rFace, const Fraction &rFrac); - - // SmFontPickList @@ -142,7 +138,6 @@ public: }; - // SmFontPickListBox diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 2e81b188d5e7..7eb5eb56085d 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 (nullptr), @@ -1925,5 +1916,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 c4cd3c32177b..61114c1e0f3d 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -47,7 +47,6 @@ struct AccessibleEventObject; }}}} - // classes and helper-classes used for accessibility in the graphic-window @@ -145,7 +144,6 @@ public: }; - // classes and helper-classes used for accessibility in the command-window @@ -297,8 +295,6 @@ public: }; - - typedef cppu::WeakImplHelper < @@ -371,7 +367,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index d6c91b76cb8a..e987b664e0e8 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -145,8 +145,6 @@ SmCfgOther::SmCfgOther() } - - SmFontFormat::SmFontFormat() { aName = FONTNAME_MATH; @@ -193,8 +191,6 @@ bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const } - - SmFntFmtListEntry::SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ) : aId (rId), aFntFmt (rFntFmt) @@ -266,7 +262,6 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const OUString &rFntFmtId } - const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const { const SmFontFormat *pRes = nullptr; @@ -332,7 +327,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 54fca7ec2371..2abbfced833a 100644 --- a/starmath/source/detreg.cxx +++ b/starmath/source/detreg.cxx @@ -68,5 +68,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 6a97fba67d6d..04656de72863 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1438,8 +1438,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 63dbfbe07e37..9e2a745c46ef 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -785,7 +785,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 203740a7b3fa..62deaa898786 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -59,8 +59,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; - - void SmGetLeftSelectionPart(const ESelection &rSel, sal_Int32 &nPara, sal_uInt16 &nPos) // returns paragraph number and position of the selections left part @@ -84,7 +82,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 94222820af1d..44dcd38aed22 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 3e983078aaa5..591a81819480 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -392,7 +392,6 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( } - SmXMLImport::SmXMLImport( const css::uno::Reference< css::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlags) @@ -430,7 +429,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance( } - OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisMetaImporter" ); @@ -450,7 +448,6 @@ throw( uno::Exception ) } - OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw() { return OUString( "com.sun.star.comp.Math.XMLOasisSettingsImporter" ); @@ -525,7 +522,6 @@ void SmXMLImport::endDocument() } - class SmXMLImportContext: public SvXMLImportContext { public: @@ -569,7 +565,6 @@ SvXMLImportContext * SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix } - struct SmXMLContext_Helper { sal_Int8 nIsBold; @@ -743,7 +738,6 @@ void SmXMLContext_Helper::ApplyAttrs() } - class SmXMLDocContext_Impl : public SmXMLImportContext { public: @@ -757,7 +751,6 @@ public: }; - /*avert thy gaze from the proginator*/ class SmXMLRowContext_Impl : public SmXMLDocContext_Impl { @@ -780,7 +773,6 @@ public: }; - class SmXMLEncloseContext_Impl : public SmXMLRowContext_Impl { public: @@ -805,7 +797,6 @@ void SmXMLEncloseContext_Impl::EndElement() } - class SmXMLFracContext_Impl : public SmXMLRowContext_Impl { public: @@ -818,7 +809,6 @@ public: }; - class SmXMLSqrtContext_Impl : public SmXMLRowContext_Impl { public: @@ -830,7 +820,6 @@ public: }; - class SmXMLRootContext_Impl : public SmXMLRowContext_Impl { public: @@ -842,7 +831,6 @@ public: }; - class SmXMLStyleContext_Impl : public SmXMLRowContext_Impl { protected: @@ -879,7 +867,6 @@ void SmXMLStyleContext_Impl::EndElement() } - class SmXMLPaddedContext_Impl : public SmXMLRowContext_Impl { public: @@ -903,7 +890,6 @@ void SmXMLPaddedContext_Impl::EndElement() } - class SmXMLPhantomContext_Impl : public SmXMLRowContext_Impl { public: @@ -937,7 +923,6 @@ void SmXMLPhantomContext_Impl::EndElement() } - class SmXMLFencedContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1032,8 +1017,6 @@ void SmXMLFencedContext_Impl::EndElement() } - - class SmXMLErrorContext_Impl : public SmXMLRowContext_Impl { public: @@ -1061,7 +1044,6 @@ void SmXMLErrorContext_Impl::EndElement() } - class SmXMLNumberContext_Impl : public SmXMLImportContext { protected: @@ -1093,7 +1075,6 @@ void SmXMLNumberContext_Impl::EndElement() } - class SmXMLAnnotationContext_Impl : public SmXMLImportContext { bool bIsStarMath; @@ -1140,7 +1121,6 @@ void SmXMLAnnotationContext_Impl::Characters(const OUString &rChars) } - class SmXMLTextContext_Impl : public SmXMLImportContext { protected: @@ -1172,7 +1152,6 @@ void SmXMLTextContext_Impl::EndElement() } - class SmXMLStringContext_Impl : public SmXMLImportContext { protected: @@ -1214,7 +1193,6 @@ void SmXMLStringContext_Impl::EndElement() } - class SmXMLIdentifierContext_Impl : public SmXMLImportContext { protected: @@ -1278,7 +1256,6 @@ void SmXMLIdentifierContext_Impl::TCharacters(const OUString &rChars) } - class SmXMLOperatorContext_Impl : public SmXMLImportContext { bool bIsStretchy; @@ -1317,7 +1294,6 @@ void SmXMLOperatorContext_Impl::EndElement() } - void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -1345,8 +1321,6 @@ void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< } - - class SmXMLSpaceContext_Impl : public SmXMLImportContext { public: @@ -1372,7 +1346,6 @@ void SmXMLSpaceContext_Impl::StartElement( } - class SmXMLSubContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1417,7 +1390,6 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup eSubSup } - class SmXMLSupContext_Impl : public SmXMLSubContext_Impl { public: @@ -1432,7 +1404,6 @@ public: }; - class SmXMLSubSupContext_Impl : public SmXMLRowContext_Impl { protected: @@ -1478,7 +1449,6 @@ void SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType, } - class SmXMLUnderContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1545,7 +1515,6 @@ void SmXMLUnderContext_Impl::EndElement() } - class SmXMLOverContext_Impl : public SmXMLSubContext_Impl { protected: @@ -1603,7 +1572,6 @@ void SmXMLOverContext_Impl::HandleAccent() } - class SmXMLUnderOverContext_Impl : public SmXMLSubSupContext_Impl { public: @@ -1618,7 +1586,6 @@ public: }; - class SmXMLMultiScriptsContext_Impl : public SmXMLSubSupContext_Impl { bool bHasPrescripts; @@ -1638,7 +1605,6 @@ public: }; - class SmXMLNoneContext_Impl : public SmXMLImportContext { public: @@ -1662,7 +1628,6 @@ void SmXMLNoneContext_Impl::EndElement() } - class SmXMLPrescriptsContext_Impl : public SmXMLImportContext { public: @@ -1672,7 +1637,6 @@ public: }; - class SmXMLTableRowContext_Impl : public SmXMLRowContext_Impl { public: @@ -1687,8 +1651,6 @@ public: }; - - class SmXMLTableContext_Impl : public SmXMLTableRowContext_Impl { public: @@ -1704,8 +1666,6 @@ public: }; - - class SmXMLTableCellContext_Impl : public SmXMLRowContext_Impl { public: @@ -1716,7 +1676,6 @@ public: }; - class SmXMLAlignGroupContext_Impl : public SmXMLRowContext_Impl { public: @@ -1732,7 +1691,6 @@ public: }; - class SmXMLActionContext_Impl : public SmXMLRowContext_Impl { size_t mnSelection; // 1-based @@ -1749,7 +1707,6 @@ public: }; - // NB: virtually inherit so we can multiply inherit properly // in SmXMLFlatDocContext_Impl class SmXMLOfficeContext_Impl : public virtual SvXMLImportContext @@ -1786,7 +1743,6 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref } - // context for flat file xml format class SmXMLFlatDocContext_Impl : public SmXMLOfficeContext_Impl, public SvXMLMetaDocumentContext @@ -1834,7 +1790,6 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( } - static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = { { XML_NAMESPACE_MATH, XML_SEMANTICS, XML_TOK_SEMANTICS }, @@ -2991,7 +2946,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 dc021cb6c06b..1bf881415cbd 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 dded5750985d..024dd8cf05f1 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -62,8 +62,6 @@ SmToken::SmToken(SmTokenType eTokenType, } - - static const SmTokenTableEntry aTokenTable[] = { { "Im" , TIM, MS_IM, TGSTANDALONE, 5 }, @@ -314,8 +312,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 a0c8c67058f6..1e69966e151a 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -31,7 +31,6 @@ - // '\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 32ef68f5fb6b..41ffd321941a 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 39b04440402b..6ac33fc2ce26 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() @@ -220,7 +215,6 @@ void SmFontPickListBox::Remove(const vcl::Font &rFont) } - bool IsItalic( const vcl::Font &rFont ) { FontItalic eItalic = rFont.GetItalic(); @@ -291,5 +285,4 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac) } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |