diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 20:41:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:50:46 -0600 |
| commit | 7d99ec7f7ec095dfa0d203f5eb43bab0e69256be (patch) | |
| tree | 0fbe4279986d6b3d9a28c602e8e433632cd6d5a0 | |
| parent | 35e44118b8e55b2263bd10e8b11d9ac4e043228b (diff) | |
Remove visual noise from starmath
Change-Id: I45a716abba68521c5ebc203eed205e717efead7b
Reviewed-on: https://gerrit.libreoffice.org/8315
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
40 files changed, 322 insertions, 322 deletions
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx index 9b482845e0f7..6eb6ecb505f9 100644 --- a/starmath/inc/caret.hxx +++ b/starmath/inc/caret.hxx @@ -91,7 +91,7 @@ private: long _height; }; -/////////////////////////////// SmCaretPosGraph//////////////////////////////// +// SmCaretPosGraph /** An entry in SmCaretPosGraph */ struct SmCaretPosGraphEntry{ diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index fb5f64cc17b9..ee6a23b1e077 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -303,7 +303,7 @@ public: void SetDblClickHdl(const Link& rLink) { aSymbolWindow.SetDblClickHdl(rLink); } }; -//////////////////////////////////////////////////////////////////////////////// + class SmShowSymbol : public Control { @@ -325,7 +325,7 @@ public: void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; } }; -//////////////////////////////////////////////////////////////////////////////// + class SmSymDefineDialog; @@ -368,7 +368,7 @@ public: sal_uInt16 GetSelectedSymbol() const { return m_pSymbolSetDisplay->GetSelectSymbol(); } }; -//////////////////////////////////////////////////////////////////////////////// + class SmShowChar : public Control { @@ -384,7 +384,7 @@ public: void SetSymbol( sal_UCS4 cChar, const Font &rFont ); }; -//////////////////////////////////////////////////////////////////////////////// + class SmSymDefineDialog : public ModalDialog { diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 9d8c65d9ef5c..4452922ffd6c 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -66,7 +66,7 @@ class SmCursor; class SmDocShell; class EditEngine; -//////////////////////////////////////////////////////////// + class SmPrinterAccess { @@ -80,11 +80,11 @@ public: }; -//////////////////////////////////////////////////////////// + void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool); -//////////////////////////////////////////////////////////// + class SmDocShell : public SfxObjectShell, public SfxListener { diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index bce53f2c8004..c15ab259afbe 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -62,7 +62,7 @@ typedef std::vector< SmNode * > SmNodeArray; typedef std::vector< SmStructureNode * > SmStructureNodeArray; -//////////////////////////////////////////////////////////////////////////////// + enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT }; @@ -77,7 +77,7 @@ enum SmNodeType }; -//////////////////////////////////////////////////////////////////////////////// + class SmNode : public SmRect @@ -234,7 +234,7 @@ private: void DumpAsDot(std::ostream &out, OUString* label, int number, int& id, int parent) const; }; -//////////////////////////////////////////////////////////////////////////////// + /** A simple auxiliary iterator class for SmNode * @@ -293,7 +293,7 @@ private: bool bIsReverse; }; -//////////////////////////////////////////////////////////////////////////////// + /** Abstract baseclass for all composite node * @@ -344,7 +344,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Abstract base class for all visible node * @@ -367,7 +367,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + class SmGraphicNode : public SmVisibleNode @@ -383,7 +383,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Draws a rectangle * @@ -408,7 +408,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Polygon line node * @@ -436,7 +436,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Text node * @@ -501,7 +501,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Special node for user defined characters * @@ -527,7 +527,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Glyph node for custom operators * @@ -550,7 +550,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Math symbol node * @@ -579,7 +579,7 @@ public: void Accept(SmVisitor* pVisitor); }; -//////////////////////////////////////////////////////////////////////////////// + /** Math Identifier * @@ -594,7 +594,7 @@ public: : SmMathSymbolNode(NMATHIDENT, rNodeToken) {} }; -//////////////////////////////////////////////////////////////////////////////// + /** Root symbol node * @@ -619,7 +619,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Place node * @@ -642,7 +642,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Error node, for parsing errors * @@ -664,7 +664,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Table node * @@ -691,7 +691,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** A line * @@ -725,7 +725,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Expression node * @@ -746,7 +746,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Unary horizontical node * @@ -766,7 +766,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Root node * @@ -806,7 +806,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Binary horizontial node * @@ -840,7 +840,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Binary horizontical node * @@ -872,7 +872,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Binary diagonal node * @@ -902,7 +902,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Enum used to index sub-/supscripts in the 'aSubNodes' array @@ -985,7 +985,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Node for brace construction * @@ -1022,7 +1022,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Body of an SmBraceNode * @@ -1053,7 +1053,7 @@ inline SmBracebodyNode::SmBracebodyNode(const SmToken &rNodeToken) : } -//////////////////////////////////////////////////////////////////////////////// + /** Node for vertical brace construction * @@ -1091,7 +1091,7 @@ inline SmVerticalBraceNode::SmVerticalBraceNode(const SmToken &rNodeToken) : } -//////////////////////////////////////////////////////////////////////////////// + /** Operation Node @@ -1126,7 +1126,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Node used for alignment */ @@ -1142,7 +1142,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Attribute node * @@ -1172,7 +1172,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Font node * @@ -1202,7 +1202,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Matrix node * @@ -1234,7 +1234,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + /** Node for whitespace * @@ -1262,7 +1262,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////// + inline SmNode* SmRootNode::Argument() diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index 996d9148eb35..f348c8ef5261 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -31,7 +31,7 @@ class SmNode; -////////////////////////////////////////////////////////////////////// + // TokenGroups #define TGOPER 0x00000001 diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index 07436a544773..16a9d1f37e61 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -42,13 +42,13 @@ 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 // y-axis to the bottom. // Note: however, italic spaces can be negative! -// + // possible flags for the 'Draw' function below (just for debugging) #define SM_RECT_CORE 0x0001 diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index b7bf7a3ed25b..c60a6868d696 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -52,7 +52,7 @@ class SmSymbolManager; class SvtSysLocale; class VirtualDevice; -///////////////////////////////////////////////////////////////// + class SmResId : public ResId { @@ -84,7 +84,7 @@ public: const OUString GetExportSymbolSetName( const OUString &rUiName ) const; }; -///////////////////////////////////////////////////////////////// + class SmModule : public SfxModule, utl::ConfigurationListener { diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index bea8d26685f4..6dd282e44c9a 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -38,7 +38,7 @@ #define SYMBOL_NONE 0xFFFF -//////////////////////////////////////////////////////////////////////////////// + inline const OUString GetExportSymbolName( const OUString &rUiSymbolName ) { @@ -62,7 +62,7 @@ inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName ) return SM_MOD()->GetLocSymbolData().GetUiSymbolSetName( rExportSymbolSetName ); } -//////////////////////////////////////////////////////////////////////////////// + class SmSym { diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index ca1f28f782f6..b15fd46cee5b 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -23,11 +23,11 @@ #include <sal/types.h> #define FONTNAME_MATH "OpenSymbol" -///////////////////////////////////////////////////////////////// + enum SmPrintSize { PRINT_SIZE_NORMAL, PRINT_SIZE_SCALED, PRINT_SIZE_ZOOMED }; -///////////////////////////////////////////////////////////////// + inline sal_Bool IsInPrivateUseArea( sal_Unicode cChar ) { return 0xE000 <= cChar && cChar <= 0xF8FF; } @@ -36,12 +36,12 @@ inline sal_Bool IsGreekChar( sal_Unicode cChar ) { return 0x0370 <= cChar && c sal_Unicode ConvertMathToMathML( sal_Unicode cChar ); -///////////////////////////////////////////////////////////////// + // enum definitions for characters from the 'StarSymbol' font // (some chars have more than one alias!) //! Note: not listed here does not(!) mean "not used" //! (see %alpha ... %gamma for example) -// + enum MathSymbol { MS_FACT = (sal_Unicode) 0x0021, diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx index be979431c186..e3ec4a167f33 100644 --- a/starmath/inc/unomodel.hxx +++ b/starmath/inc/unomodel.hxx @@ -31,7 +31,7 @@ #include <oox/mathml/export.hxx> #include <oox/mathml/import.hxx> -//////////////////////////////////////////////////////////// + #define PRTUIOPT_TITLE_ROW "TitleRow" #define PRTUIOPT_FORMULA_TEXT "FormulaText" @@ -46,9 +46,9 @@ public: }; -//////////////////////////////////////////////////////////// -//----------------------------------------------------------------------------- + + class SmModel : public SfxBaseModel, public comphelper::PropertySetHelper, public com::sun::star::lang::XServiceInfo, @@ -102,7 +102,7 @@ public: static OUString getImplementationName_Static(); }; -//////////////////////////////////////////////////////////// + #endif diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index 8218dfe53254..9ede3a57af3e 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -70,10 +70,10 @@ class SmViewShell; SmViewShell * SmGetActiveView(); -//////////////////////////////////////////////////////////// -// + + // SmFace -// + bool IsItalic( const Font &rFont ); bool IsBold( const Font &rFont ); @@ -112,10 +112,10 @@ public: SmFace & operator *= (SmFace &rFace, const Fraction &rFrac); -//////////////////////////////////////////////////////////// -// + + // SmFontPickList -// + class SmFontDialog; @@ -147,10 +147,10 @@ public: void WriteTo(SmFontDialog& rDialog) const; }; -//////////////////////////////////////////////////////////// -// + + // SmFontPickListBox -// + class SmFontPickListBox : public SmFontPickList, public ListBox { diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx index 5c872cf68911..630b311411b7 100644 --- a/starmath/inc/visitors.hxx +++ b/starmath/inc/visitors.hxx @@ -88,7 +88,7 @@ private: void VisitChildren( SmNode* pNode ); }; -/////////////////////////////// SmDefaultingVisitor //////////////////////////////// +// SmDefaultingVisitor /** Visitor that uses DefaultVisit for handling visits by default @@ -133,7 +133,7 @@ protected: virtual void DefaultVisit( SmNode* pNode ) = 0; }; -/////////////////////////////// SmCaretDrawingVisitor //////////////////////////////// +// SmCaretDrawingVisitor /** Visitor for drawing a caret position */ class SmCaretDrawingVisitor : public SmDefaultingVisitor @@ -155,7 +155,7 @@ protected: void DefaultVisit( SmNode* pNode ); }; -/////////////////////////////// SmCaretPos2LineVisitor //////////////////////////////// +// SmCaretPos2LineVisitor /** Visitor getting a line from a caret position */ class SmCaretPos2LineVisitor : public SmDefaultingVisitor @@ -184,7 +184,7 @@ protected: void DefaultVisit( SmNode* pNode ); }; -/////////////////////////////// SmDrawingVisitor //////////////////////////////// +// SmDrawingVisitor /** Visitor for drawing SmNodes to OutputDevice */ class SmDrawingVisitor : public SmVisitor @@ -249,7 +249,7 @@ private: Point Position; }; -/////////////////////////////// SmSetSelectionVisitor //////////////////////////////// +// SmSetSelectionVisitor /** Set Selection Visitor * Sets the IsSelected( ) property on all SmNodes of the tree @@ -291,7 +291,7 @@ private: }; -/////////////////////////////// SmCaretPosGraphBuildingVisitor //////////////////////////////// +// SmCaretPosGraphBuildingVisitor /** A visitor for building a SmCaretPosGraph @@ -357,7 +357,7 @@ private: SmCaretPosGraph* pGraph; }; -/////////////////////////////// SmCloningVisitor /////////////////////////////// +// SmCloningVisitor /** Visitor for cloning a pNode * @@ -406,7 +406,7 @@ private: }; -/////////////////////////////// SmSelectionDrawingVisitor /////////////////////////////// +// SmSelectionDrawingVisitor class SmSelectionDrawingVisitor : public SmDefaultingVisitor { @@ -431,7 +431,7 @@ private: void VisitChildren( SmNode* pNode ); }; -/////////////////////////////// SmNodeToTextVisitor /////////////////////////////// +// SmNodeToTextVisitor /** Extract command text from pNodes */ class SmNodeToTextVisitor : public SmVisitor diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi index 84a934b6d4e1..94caccacec4b 100644 --- a/starmath/sdi/smath.sdi +++ b/starmath/sdi/smath.sdi @@ -40,7 +40,7 @@ SfxVoidItem ChangeAlignment SID_ALIGN GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeDistance SID_DISTANCE () [ @@ -65,7 +65,7 @@ SfxVoidItem ChangeDistance SID_DISTANCE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeFont SID_FONT () [ @@ -90,7 +90,7 @@ SfxVoidItem ChangeFont SID_FONT GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem ChangeFontSize SID_FONTSIZE () [ @@ -115,7 +115,7 @@ SfxVoidItem ChangeFontSize SID_FONTSIZE GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- + SfxVoidItem CommandWindow SID_CMDBOXWINDOW () [ @@ -140,7 +140,7 @@ SfxVoidItem CommandWindow SID_CMDBOXWINDOW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ElementsDockingWindow SID_ELEMENTSDOCKINGWINDOW () [ @@ -165,7 +165,7 @@ SfxVoidItem ElementsDockingWindow SID_ELEMENTSDOCKINGWINDOW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem Preferences SID_PREFERENCES () [ @@ -190,7 +190,7 @@ SfxVoidItem Preferences SID_PREFERENCES GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxStringItem ConfigName SID_TEXT [ @@ -217,7 +217,7 @@ SfxStringItem ConfigName SID_TEXT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem CopyObject SID_COPYOBJECT () [ @@ -242,7 +242,7 @@ SfxVoidItem CopyObject SID_COPYOBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem Draw SID_DRAW () [ @@ -267,7 +267,7 @@ SfxVoidItem Draw SID_DRAW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem FormelCursor SID_FORMULACURSOR () [ @@ -292,7 +292,7 @@ SfxBoolItem FormelCursor SID_FORMULACURSOR GroupId = GID_MATH; ] -//-------------------------------------------------------------------------- + SfxInt16Item Graphic SID_GAPHIC_SM [ @@ -319,7 +319,7 @@ SfxInt16Item Graphic SID_GAPHIC_SM GroupId = GID_MATH; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertCommand SID_INSERTCOMMAND () [ @@ -368,7 +368,7 @@ SfxVoidItem InsertCommandText SID_INSERTCOMMANDTEXT GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem InsertConfigName SID_INSERTSYMBOL () [ @@ -393,7 +393,7 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxBoolItem ImportFormula SID_IMPORT_FORMULA (SfxStringItem Name SID_IMPORT_FORMULA,SfxStringItem Filter FN_PARAM_1) [ @@ -418,7 +418,7 @@ SfxBoolItem ImportFormula SID_IMPORT_FORMULA GroupId = GID_INSERT; ] -//-------------------------------------------------------------------------- + SfxVoidItem LoadSymbols SID_LOADSYMBOLS () [ @@ -443,7 +443,7 @@ SfxVoidItem LoadSymbols SID_LOADSYMBOLS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxStringItem ModifyStatus SID_MODIFYSTATUS [ @@ -470,7 +470,7 @@ SfxStringItem ModifyStatus SID_MODIFYSTATUS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem NextError SID_NEXTERR () [ @@ -495,7 +495,7 @@ SfxVoidItem NextError SID_NEXTERR GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem NextMark SID_NEXTMARK () [ @@ -520,7 +520,7 @@ SfxVoidItem NextMark SID_NEXTMARK GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem PasteObject SID_PASTEOBJECT () [ @@ -545,7 +545,7 @@ SfxVoidItem PasteObject SID_PASTEOBJECT GroupId = GID_EDIT; ] -//-------------------------------------------------------------------------- + SfxVoidItem PrevError SID_PREVERR () [ @@ -570,7 +570,7 @@ SfxVoidItem PrevError SID_PREVERR GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxVoidItem PrevMark SID_PREVMARK () [ @@ -595,7 +595,7 @@ SfxVoidItem PrevMark SID_PREVMARK GroupId = GID_NAVIGATOR; ] -//-------------------------------------------------------------------------- + SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW [ @@ -622,7 +622,7 @@ SfxBoolItem RedrawAutomatic SID_AUTO_REDRAW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem SaveSymbols SID_SAVESYMBOLS () [ @@ -647,7 +647,7 @@ SfxVoidItem SaveSymbols SID_SAVESYMBOLS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem SetPaperSize SID_GETEDITTEXT () [ @@ -672,7 +672,7 @@ SfxVoidItem SetPaperSize SID_GETEDITTEXT GroupId = GID_MATH; ] -//-------------------------------------------------------------------------- + SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE () [ @@ -697,7 +697,7 @@ SfxVoidItem SymbolCatalogue SID_SYMBOLS_CATALOGUE GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxVoidItem Symbols SID_SYMBOLS () [ @@ -722,7 +722,7 @@ SfxVoidItem Symbols SID_SYMBOLS GroupId = GID_OPTIONS; ] -//-------------------------------------------------------------------------- + SfxBoolItem Textmode SID_TEXTMODE [ @@ -749,7 +749,7 @@ SfxBoolItem Textmode SID_TEXTMODE GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxStringItem TextStatus SID_TEXTSTATUS [ @@ -776,7 +776,7 @@ SfxStringItem TextStatus SID_TEXTSTATUS GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ToolBoxWindow SID_TOOLBOXWINDOW () [ @@ -801,7 +801,7 @@ SfxVoidItem ToolBoxWindow SID_TOOLBOXWINDOW GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxBoolItem ToolBox SID_TOOLBOX [ @@ -828,7 +828,7 @@ SfxBoolItem ToolBox SID_TOOLBOX GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomIn SID_ZOOMIN () [ @@ -853,7 +853,7 @@ SfxVoidItem ZoomIn SID_ZOOMIN GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- + SfxVoidItem ZoomOut SID_ZOOMOUT () [ diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi index 99effc907843..017fc16a65f4 100644 --- a/starmath/sdi/smitems.sdi +++ b/starmath/sdi/smitems.sdi @@ -15,7 +15,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------- + enum SvxAdjust { @@ -28,7 +28,7 @@ enum SvxAdjust }; item SvxAdjust SvxAdjustItem; -//------------------------------------------------------------------------- + enum SvxCaseMap { @@ -41,7 +41,7 @@ enum SvxCaseMap }; item SvxCaseMap SvxCaseMapItem; -//------------------------------------------------------------------------- + enum CharSet { @@ -59,7 +59,7 @@ enum CharSet }; item CharSet CharSetItem; -//------------------------------------------------------------------------- + enum FontFamily { @@ -73,7 +73,7 @@ enum FontFamily }; item FontFamily FontFamilyItem; -//------------------------------------------------------------------------- + enum FontPitch { @@ -83,7 +83,7 @@ enum FontPitch }; item FontPitch FontPitchItem; -//------------------------------------------------------------------------- + enum FontAlign { @@ -93,7 +93,7 @@ enum FontAlign }; item FontAlign FontAlignItem; -//------------------------------------------------------------------------- + enum FontWeight { @@ -111,7 +111,7 @@ enum FontWeight }; item FontWeight FontWeightItem; -//------------------------------------------------------------------------- + enum FontUnderline { @@ -122,7 +122,7 @@ enum FontUnderline }; item FontUnderline FontUnderlineItem; -//------------------------------------------------------------------------- + enum FontStrikeout { @@ -132,7 +132,7 @@ enum FontStrikeout }; item FontStrikeout FontStrikeoutItem; -//------------------------------------------------------------------------- + enum FontItalic { @@ -142,7 +142,7 @@ enum FontItalic }; item FontItalic FontItalicItem; -//------------------------------------------------------------------------- + enum SvxDbType { @@ -152,7 +152,7 @@ enum SvxDbType }; item SvxDbType SvxDbTypeItem; -//------------------------------------------------------------------------- + enum SvxLineSpace { @@ -163,7 +163,7 @@ enum SvxLineSpace }; item SvxLineSpace SvxLineSpaceItem; -//------------------------------------------------------------------------- + enum SvxInterLineSpace { @@ -174,7 +174,7 @@ enum SvxInterLineSpace }; item SvxInterLineSpace SvxInterLineSpaceItem; -//------------------------------------------------------------------------- + enum SvxBreak { @@ -189,7 +189,7 @@ enum SvxBreak }; item SvxBreak SvxBreakItem; -//------------------------------------------------------------------------- + enum BrushStyle { @@ -208,7 +208,7 @@ enum BrushStyle }; item BrushStyle BrushStyleItem; -//------------------------------------------------------------------------- + enum SvxNumType { @@ -223,7 +223,7 @@ enum SvxNumType }; item SvxNumType SvxNumTypeItem; -//------------------------------------------------------------------------- + enum SvxShadowLocation { @@ -236,7 +236,7 @@ enum SvxShadowLocation }; item SvxShadowLocation SvxShadowLocationItem; -//------------------------------------------------------------------------- + struct SvxBrush { @@ -247,7 +247,7 @@ struct SvxBrush }; item SvxBrush SvxBrushItem; -//------------------------------------------------------------------------- + struct SvxCharSetColor { @@ -256,14 +256,14 @@ struct SvxCharSetColor }; item SvxCharSetColor SvxCharSetColorItem; -//------------------------------------------------------------------------- + item BOOL SvxAutoKernItem; item UINT32 SvxColorItem; item BOOL SvxContourItem; item FontStrikeout SvxCrossedOutItem; -//------------------------------------------------------------------------- + struct SvxEscapement { @@ -272,7 +272,7 @@ struct SvxEscapement }; item SvxEscapement SvxEscapementItem; -//------------------------------------------------------------------------- + struct SvxFmtBreak { @@ -281,7 +281,7 @@ struct SvxFmtBreak } item SvxFmtBreak SvxFmtBreakItem; -//------------------------------------------------------------------------- + item BOOL SvxFmtKeepItem; item BOOL SvxFmtSplitItem; @@ -293,7 +293,7 @@ struct SvxFontHeight }; item SvxFontHeight SvxFontHeightItem; -//------------------------------------------------------------------------- + struct SvxFont { @@ -305,7 +305,7 @@ struct SvxFont }; item SvxFont SvxFontItem; -//------------------------------------------------------------------------- + struct SvxHyphenZone { @@ -317,11 +317,11 @@ struct SvxHyphenZone }; item SvxHyphenZone SvxHyphenZoneItem; -//------------------------------------------------------------------------- + item INT16 SvxKerningItem; -//------------------------------------------------------------------------- + struct SvxLine { @@ -332,7 +332,7 @@ struct SvxLine }; item SvxLine SvxLineItem; -//------------------------------------------------------------------------- + struct SvxLRSpace { @@ -342,7 +342,7 @@ struct SvxLRSpace }; item SvxLRSpace SvxLRSpaceItem; -//------------------------------------------------------------------------- + item UINT16 SvxLanguage; @@ -355,14 +355,14 @@ struct SvxLineSpacing }; item SvxLineSpacing SvxLineSpacingItem; -//------------------------------------------------------------------------- + item BOOL SvxNoHyphenItem; item BOOL SvxNoLinebreakItem; item BOOL SvxOpaqueItem; item BYTE SvxOrphansItem; -//------------------------------------------------------------------------- + struct SvxPage { @@ -373,11 +373,11 @@ struct SvxPage }; item SvxPage SvxPageItem; -//------------------------------------------------------------------------- + item String SvxPageModelItem; -//------------------------------------------------------------------------- + struct SvxPagePosSize { @@ -388,11 +388,11 @@ struct SvxPagePosSize }; item SvxPagePosSize SvxPagePosSizeItem; -//------------------------------------------------------------------------- + item BYTE SvxPaperBinItem; -//------------------------------------------------------------------------- + item String SvxPostItAuthorItem; item String SvxPostItDateItem; @@ -401,7 +401,7 @@ item FontItalic SvxPostureItem; item BOOL SvxPrintItem; item UINT16 SvxPropSizeItem; -//------------------------------------------------------------------------- + struct SvxProtect { @@ -411,7 +411,7 @@ struct SvxProtect }; item SvxProtect SvxProtectItem; -//------------------------------------------------------------------------- + struct SvxSearch { @@ -427,11 +427,11 @@ struct SvxSearch }; item SvxSearch SvxSearchItem; -//------------------------------------------------------------------------- + item BOOL SvxShadowedItem; -//------------------------------------------------------------------------- + struct SvxShadow { @@ -444,7 +444,7 @@ struct SvxShadow }; item SvxShadow SvxShadowItem; -//------------------------------------------------------------------------- + struct SvxSize { @@ -453,7 +453,7 @@ struct SvxSize }; item SvxSize SvxSizeItem; -//------------------------------------------------------------------------- + struct SvxULSpace { @@ -462,7 +462,7 @@ struct SvxULSpace }; item SvxULSpace SvxULSpaceItem -//------------------------------------------------------------------------- + enum SvxChooseControlEnum { @@ -483,12 +483,12 @@ enum SvxChooseControlEnum } item SvxChooseControlEnum SvxChooseControlEnumItem; -//------------------------------------------------------------------------- + enum SvxDrawToolEnum { SVX_SNAP_DRAW_SELECT, - // + SVX_SNAP_DRAW_LINE, SVX_SNAP_DRAW_RECT, SVX_SNAP_DRAW_ELLIPSE, @@ -502,7 +502,7 @@ enum SvxDrawToolEnum } item SvxDrawToolEnum SvxDrawToolEnumItem; -//------------------------------------------------------------------------- + item SvxChooseControlEnum SvxChooseControlItem; item SvxDrawToolEnum SvxDrawToolItem; @@ -512,7 +512,7 @@ item BYTE SvxWidowsItem; item BOOL SvxWordLineModeItem; item String SvxBoxItem; //! Dummy -//------------------------------------------------------------------------- + enum SvxCellHorJustifyEnum { @@ -534,7 +534,7 @@ enum SvxCellVerJustifyEnum }; item SvxCellVerJustifyEnum SvxCellVerJustifyEnumItem; -//------------------------------------------------------------------------- + enum SvxCellOrientationEnum { @@ -545,13 +545,13 @@ enum SvxCellOrientationEnum }; item SvxCellOrientationEnum SvxCellOrientationEnumItem; -//------------------------------------------------------------------------- + item SvxCellHorJustifyEnum SvxHorJustifyItem; item SvxCellVerJustifyEnum SvxVerJustifyItem; item SvxCellOrientationEnum SvxOrientationItem; -//------------------------------------------------------------------------- + struct SvxLongLRSpace { @@ -560,7 +560,7 @@ struct SvxLongLRSpace }; item SvxLongLRSpace SvxLongLRSpaceItem; -//------------------------------------------------------------------------- + struct SvxLongULSpace { @@ -569,7 +569,7 @@ struct SvxLongULSpace }; item SvxLongULSpace SvxLongULSpaceItem; -//------------------------------------------------------------------------- + item SbxObject SvxTabStopItem; diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 69f65cc5fbec..3c554a93d193 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; -////////////////////////////////////////////////////////////////////// + static awt::Rectangle lcl_GetBounds( Window *pWin ) { @@ -103,7 +103,7 @@ static awt::Point lcl_GetLocationOnScreen( Window *pWin ) return aPos; } -////////////////////////////////////////////////////////////////////// + SmGraphicAccessible::SmGraphicAccessible( SmGraphicWindow *pGraphicWin ) : aAccName (SM_RESSTR(RID_DOCUMENTSTR)), @@ -811,7 +811,7 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames() return aNames; } -////////////////////////////////////////////////////////////////////// + @@ -1962,6 +1962,6 @@ Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames() return aNames; } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index d770d095443b..bec0c4742e46 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -51,10 +51,10 @@ namespace com { namespace sun { namespace star { namespace accessibility { struct AccessibleEventObject; }}}} -////////////////////////////////////////////////////////////////////// -// + + // classes and helper-classes used for accessibility in the graphic-window -// + typedef cppu::WeakImplHelper6 @@ -152,10 +152,10 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -////////////////////////////////////////////////////////////////////// -// + + // classes and helper-classes used for accessibility in the command-window -// + class SmEditAccessible; class SmEditSource; @@ -385,7 +385,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; -////////////////////////////////////////////////////////////////////// + #endif diff --git a/starmath/source/caret.cxx b/starmath/source/caret.cxx index 9f9e8f6abc51..25b4f843382d 100644 --- a/starmath/source/caret.cxx +++ b/starmath/source/caret.cxx @@ -8,7 +8,7 @@ */ #include "caret.hxx" -/////////////////////////////// SmCaretPosGraph //////////////////////////////// +/////////////////////////////// SmCaretPosGraph SmCaretPosGraphEntry* SmCaretPosGraphIterator::Next(){ if(nOffset >= pGraph->nOffset){ diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 2e65cbbe6593..182000635371 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -38,7 +38,7 @@ static const char aRootName[] = "Office.Math"; #define SYMBOL_LIST "SymbolList" #define FONT_FORMAT_LIST "FontFormatList" -///////////////////////////////////////////////////////////////// + static Sequence< OUString > lcl_GetFontPropertyNames() @@ -65,7 +65,7 @@ static Sequence< OUString > lcl_GetFontPropertyNames() return aNames; } -///////////////////////////////////////////////////////////////// + static Sequence< OUString > lcl_GetSymbolPropertyNames() @@ -90,7 +90,7 @@ static Sequence< OUString > lcl_GetSymbolPropertyNames() return aNames; } -///////////////////////////////////////////////////////////////// + static const char * aMathPropNames[] = { @@ -180,7 +180,7 @@ static Sequence< OUString > GetOtherPropertyNames() return lcl_GetPropertyNames( aMathPropNames, SAL_N_ELEMENTS( aMathPropNames ) ); } -///////////////////////////////////////////////////////////////// + struct SmCfgOther { @@ -209,7 +209,7 @@ SmCfgOther::SmCfgOther() bFormulaCursor = bIsSaveOnlyUsedSymbols = true; } -///////////////////////////////////////////////////////////////// + SmFontFormat::SmFontFormat() @@ -258,7 +258,7 @@ bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const } -///////////////////////////////////////////////////////////////// + SmFntFmtListEntry::SmFntFmtListEntry( const OUString &rId, const SmFontFormat &rFntFmt ) : aId (rId), @@ -396,7 +396,7 @@ const OUString SmFontFormatList::GetNewFontFormatId() const return OUString(); } -///////////////////////////////////////////////////////////////// + SmMathConfig::SmMathConfig() : ConfigItem(OUString(aRootName)) @@ -1273,6 +1273,6 @@ void SmMathConfig::SetShowFormulaCursor( bool bVal ) void SmMathConfig::Notify( const com::sun::star::uno::Sequence< OUString >& ) {} -///////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/commands.src b/starmath/source/commands.src index a51eae223967..7df736e55b51 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -1197,7 +1197,7 @@ String RID_CATEGORY_EXAMPLES Text [ en-US ] = "Examples" ; }; -////////////////////////////////////////// + Menu RID_COMMANDMENU diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx index 172b4ce96509..4756e8277721 100644 --- a/starmath/source/config.cxx +++ b/starmath/source/config.cxx @@ -34,7 +34,7 @@ #include "smmod.hxx" #include "starmath.hrc" -///////////////////////////////////////////////////////////////// + SmConfig::SmConfig() { @@ -113,7 +113,7 @@ void SmConfig::ConfigToItemSet(SfxItemSet &rSet) const } -///////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index 18f9a8462b21..4c770d0fd615 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -1550,7 +1550,7 @@ void SmCursor::MoveAfterBracket(SmBraceNode* pBraceNode, bool bMoveAnchor) } -/////////////////////////////////////// SmNodeListParser /////////////////////////////////////// +/////////////////////////////////////// SmNodeListParser SmNode* SmNodeListParser::Parse(SmNodeList* list, bool bDeleteErrorNodes){ pList = list; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 7cab5ff2fb61..2cd5f43c17d9 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -123,7 +123,7 @@ const SmFontStyles & GetFontStyles() return aImpl; } -///////////////////////////////////////////////////////////////// + void SetFontStyle(const OUString &rStyleName, Font &rFont) { @@ -1350,7 +1350,7 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol) } -//////////////////////////////////////////////////////////////////////////////// + void SmSymbolDialog::FillSymbolSets(bool bDeleteText) // populate the entries of possible SymbolsSets in the dialog with @@ -1563,7 +1563,7 @@ const SmSym * SmSymbolDialog::GetSymbol() const } -//////////////////////////////////////////////////////////////////////////////// + void SmShowChar::Paint(const Rectangle &rRect) @@ -1608,7 +1608,7 @@ void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont ) } -//////////////////////////////////////////////////////////////////////////////// + void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText) { diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index c550e567f524..5c4da925ff85 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -104,7 +104,7 @@ using namespace ::com::sun::star::uno; #define SmDocShell #include "smslots.hxx" -//////////////////////////////////////////////////////////// + TYPEINIT1( SmDocShell, SfxObjectShell ); @@ -302,9 +302,9 @@ void SmDocShell::ArrangeFormula() pOutDev->SetLayoutMode( TEXT_LAYOUT_BIDI_LTR ); sal_Int16 nDigitLang = pOutDev->GetDigitLanguage(); pOutDev->SetDigitLanguage( LANGUAGE_ENGLISH ); - // + pTree->Arrange(*pOutDev, rFormat); - // + pOutDev->SetLayoutMode( nLayoutMode ); pOutDev->SetDigitLanguage( nDigitLang ); @@ -317,12 +317,12 @@ void SmDocShell::ArrangeFormula() void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) { - // + // set fonts to be used - // + SvtLinguOptions aOpt; SvtLinguConfig().GetOptions( aOpt ); - // + struct FontDta { sal_Int16 nFallbackLang; sal_Int16 nLang; @@ -343,7 +343,7 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool) aTable[0].nLang = aOpt.nDefaultLanguage; aTable[1].nLang = aOpt.nDefaultLanguage_CJK; aTable[2].nLang = aOpt.nDefaultLanguage_CTL; - // + for (int i = 0; i < 3; ++i) { const FontDta &rFntDta = aTable[i]; @@ -474,7 +474,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel //Drawing using visitor SmDrawingVisitor(rDev, rPosition, pTree); - // + rDev.SetLayoutMode( nLayoutMode ); rDev.SetDigitLanguage( nDigitLang ); @@ -523,7 +523,7 @@ SmCursor& SmDocShell::GetCursor(){ return *pCursor; } -//////////////////////////////////////// + SmPrinterAccess::SmPrinterAccess( SmDocShell &rDocShell ) { @@ -587,7 +587,7 @@ SmPrinterAccess::~SmPrinterAccess() pRefDev->Pop(); } -//////////////////////////////////////// + Printer* SmDocShell::GetPrt() { diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index c8aaf98f7627..ecabca28839d 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -57,7 +57,7 @@ using namespace com::sun::star::accessibility; using namespace com::sun::star; using namespace com::sun::star::uno; -//////////////////////////////////////// + void SmGetLeftSelectionPart(const ESelection &rSel, @@ -82,7 +82,7 @@ bool SmEditWindow::IsInlineEditEnabled() return pView ? pView->IsInlineEditEnabled() : false; } -//////////////////////////////////////// + SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) : Window (&rMyCmdBoxWin), diff --git a/starmath/source/eqnolefilehdr.cxx b/starmath/source/eqnolefilehdr.cxx index c35903c7c3ea..32dd3d57aeaa 100644 --- a/starmath/source/eqnolefilehdr.cxx +++ b/starmath/source/eqnolefilehdr.cxx @@ -20,7 +20,7 @@ #include "eqnolefilehdr.hxx" #include <sot/storage.hxx> -////////////////////////////////////////////////////////////////////// + @@ -29,9 +29,9 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) sal_uInt8 nVer = 0; sal_Bool bSuccess = sal_False; - // + // code snippet copied from MathType::Parse - // + SvStorageStreamRef xSrc = pStor->OpenSotStream( OUString("Equation Native"), STREAM_STD_READ | STREAM_NOCREATE); @@ -39,7 +39,7 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) return bSuccess; SvStorageStream *pS = &xSrc; pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); - // + EQNOLEFILEHDR aHdr; aHdr.Read(pS); pS->ReadUChar( nVer ); @@ -52,6 +52,6 @@ sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion ) return bSuccess; } -////////////////////////////////////////////////////////////////////// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx index 448ee51b3976..79510805370b 100644 --- a/starmath/source/format.cxx +++ b/starmath/source/format.cxx @@ -22,7 +22,7 @@ #include <editeng/scripttypeitem.hxx> #include "format.hxx" -///////////////////////////////////////////////////////////////// + // Latin default-fonts static const sal_uInt16 aLatinDefFnts[FNT_END] = @@ -93,7 +93,7 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent ) } } -///////////////////////////////////////////////////////////////// + SmFormat::SmFormat() : aBaseSize(0, SmPtsTo100th_mm(12)) diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index dbde76c43f17..7e0b9397259c 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -714,10 +714,10 @@ void SmXMLExport::ExportBinaryHorizontal(const SmNode *pNode, int nLevel) // Unfold the binary tree structure as long as the nodes are SmBinHorNode // with the same nGroup. This will reduce the number of nested <mrow> // elements e.g. we only need three <mrow> levels to export - // + // "a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l = // a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l" - // + // See https://www.libreoffice.org/bugzilla/show_bug.cgi?id=66081 ::std::stack< const SmNode* > s; s.push(pNode); @@ -1276,10 +1276,10 @@ static bool lcl_HasEffectOnMathvariant( const SmTokenType eType ) void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) { - // + // gather the mathvariant attribut relevant data from all // successively following SmFontNodes... - // + int nBold = -1; // for the following variables: -1 = yet undefined; 0 = false; 1 = true; int nItalic = -1; // for the following variables: -1 = yet undefined; 0 = false; 1 = true; int nSansSerifFixed = -1; @@ -1452,14 +1452,14 @@ void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) void SmXMLExport::ExportVerticalBrace(const SmNode *pNode, int nLevel) { // "[body] overbrace [script]" - // + // Position body, overbrace and script vertically. First place the overbrace // OVER the body and then the script OVER this expression. - // + // [script] // --[overbrace]-- // XXXXXX[body]XXXXXXX - // + // Similarly for the underbrace construction. XMLTokenEnum which; diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 628ce35a754d..01a51f080f56 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { } } } -//////////////////////////////////////////////////////////// + class SmXMLExportWrapper { @@ -72,7 +72,7 @@ public: const sal_Char* pComponentName ); }; -//////////////////////////////////////////////////////////// + class SmXMLExport : public SvXMLExport { @@ -124,7 +124,7 @@ public: sal_Bool GetSuccess() {return bSuccess;} }; -//////////////////////////////////////////////////////////// + #endif diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index fd57c181ef06..0c55c035f552 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -79,7 +79,7 @@ using namespace ::xmloff::token; #define IMPORT_SVC_NAME "com.sun.star.xml.XMLImportFilter" -//////////////////////////////////////////////////////////// + namespace { template < typename T > @@ -405,7 +405,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent( return ERRCODE_SFX_DOLOADFAILED; } -//////////////////////////////////////////////////////////// + SmXMLImport::SmXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -454,7 +454,7 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance( return (cppu::OWeakObject*)new SmXMLImport(comphelper::getComponentContext(rSMgr), SmXMLImport_getImplementationName(), IMPORT_ALL); } -//////////////////////////////////////////////////////////// + OUString SAL_CALL SmXMLImportMeta_getImplementationName() throw() { @@ -476,7 +476,7 @@ throw( uno::Exception ) return (cppu::OWeakObject*)new SmXMLImport( comphelper::getComponentContext(rSMgr), SmXMLImportMeta_getImplementationName(), IMPORT_META ); } -//////////////////////////////////////////////////////////// + OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw() { @@ -554,7 +554,7 @@ void SmXMLImport::endDocument(void) SvXMLImport::endDocument(); } -//////////////////////////////////////////////////////////// + class SmXMLImportContext: public SvXMLImportContext { @@ -603,7 +603,7 @@ SvXMLImportContext * SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix return 0; } -//////////////////////////////////////////////////////////// + struct SmXMLContext_Helper { @@ -771,7 +771,7 @@ void SmXMLContext_Helper::ApplyAttrs() } } -//////////////////////////////////////////////////////////// + class SmXMLDocContext_Impl : public SmXMLImportContext { @@ -785,7 +785,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + /*avert thy gaze from the proginator*/ class SmXMLRowContext_Impl : public SmXMLDocContext_Impl @@ -808,7 +808,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + class SmXMLEncloseContext_Impl : public SmXMLRowContext_Impl { @@ -833,7 +833,7 @@ void SmXMLEncloseContext_Impl::EndElement() SmXMLRowContext_Impl::EndElement(); } -//////////////////////////////////////////////////////////// + class SmXMLFracContext_Impl : public SmXMLRowContext_Impl { @@ -846,7 +846,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + class SmXMLSqrtContext_Impl : public SmXMLRowContext_Impl { @@ -858,7 +858,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + class SmXMLRootContext_Impl : public SmXMLRowContext_Impl { @@ -870,7 +870,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + class SmXMLStyleContext_Impl : public SmXMLRowContext_Impl { @@ -907,7 +907,7 @@ void SmXMLStyleContext_Impl::EndElement() aStyleHelper.ApplyAttrs(); } -//////////////////////////////////////////////////////////// + class SmXMLPaddedContext_Impl : public SmXMLRowContext_Impl { @@ -931,7 +931,7 @@ void SmXMLPaddedContext_Impl::EndElement() SmXMLRowContext_Impl::EndElement(); } -//////////////////////////////////////////////////////////// + class SmXMLPhantomContext_Impl : public SmXMLRowContext_Impl { @@ -966,7 +966,7 @@ void SmXMLPhantomContext_Impl::EndElement() rNodeStack.push(pPhantom); } -//////////////////////////////////////////////////////////// + class SmXMLFencedContext_Impl : public SmXMLRowContext_Impl { @@ -1062,7 +1062,7 @@ void SmXMLFencedContext_Impl::EndElement() } -//////////////////////////////////////////////////////////// + class SmXMLErrorContext_Impl : public SmXMLRowContext_Impl { @@ -1091,7 +1091,7 @@ void SmXMLErrorContext_Impl::EndElement() } } -//////////////////////////////////////////////////////////// + class SmXMLNumberContext_Impl : public SmXMLImportContext { @@ -1123,7 +1123,7 @@ void SmXMLNumberContext_Impl::EndElement() GetSmImport().GetNodeStack().push(new SmTextNode(aToken,FNT_NUMBER)); } -//////////////////////////////////////////////////////////// + class SmXMLAnnotationContext_Impl : public SmXMLImportContext { @@ -1170,7 +1170,7 @@ void SmXMLAnnotationContext_Impl::Characters(const OUString &rChars) GetSmImport().SetText( GetSmImport().GetText() + rChars ); } -//////////////////////////////////////////////////////////// + class SmXMLTextContext_Impl : public SmXMLImportContext { @@ -1202,7 +1202,7 @@ void SmXMLTextContext_Impl::EndElement() GetSmImport().GetNodeStack().push(new SmTextNode(aToken,FNT_TEXT)); } -//////////////////////////////////////////////////////////// + class SmXMLStringContext_Impl : public SmXMLImportContext { @@ -1244,7 +1244,7 @@ void SmXMLStringContext_Impl::EndElement() GetSmImport().GetNodeStack().push(new SmTextNode(aToken,FNT_FIXED)); } -//////////////////////////////////////////////////////////// + class SmXMLIdentifierContext_Impl : public SmXMLImportContext { @@ -1308,7 +1308,7 @@ void SmXMLIdentifierContext_Impl::TCharacters(const OUString &rChars) aToken.aText = rChars; } -//////////////////////////////////////////////////////////// + class SmXMLOperatorContext_Impl : public SmXMLImportContext { @@ -1376,7 +1376,7 @@ void SmXMLOperatorContext_Impl::StartElement(const uno::Reference< } -//////////////////////////////////////////////////////////// + class SmXMLSpaceContext_Impl : public SmXMLImportContext { @@ -1402,7 +1402,7 @@ void SmXMLSpaceContext_Impl::StartElement( GetSmImport().GetNodeStack().push(pBlank); } -//////////////////////////////////////////////////////////// + class SmXMLSubContext_Impl : public SmXMLRowContext_Impl { @@ -1447,7 +1447,7 @@ void SmXMLSubContext_Impl::GenericEndElement(SmTokenType eType, SmSubSup eSubSup rNodeStack.push(pNode); } -//////////////////////////////////////////////////////////// + class SmXMLSupContext_Impl : public SmXMLSubContext_Impl { @@ -1462,7 +1462,7 @@ public: } }; -//////////////////////////////////////////////////////////// + class SmXMLSubSupContext_Impl : public SmXMLRowContext_Impl { @@ -1508,7 +1508,7 @@ void SmXMLSubSupContext_Impl::GenericEndElement(SmTokenType eType, rNodeStack.push(pNode); } -//////////////////////////////////////////////////////////// + class SmXMLUnderContext_Impl : public SmXMLSubContext_Impl { @@ -1573,7 +1573,7 @@ void SmXMLUnderContext_Impl::EndElement() HandleAccent(); } -//////////////////////////////////////////////////////////// + class SmXMLOverContext_Impl : public SmXMLSubContext_Impl { @@ -1631,7 +1631,7 @@ void SmXMLOverContext_Impl::HandleAccent() } -//////////////////////////////////////////////////////////// + class SmXMLUnderOverContext_Impl : public SmXMLSubSupContext_Impl { @@ -1646,7 +1646,7 @@ public: } }; -//////////////////////////////////////////////////////////// + class SmXMLMultiScriptsContext_Impl : public SmXMLSubSupContext_Impl { @@ -1666,7 +1666,7 @@ public: const uno::Reference< xml::sax::XAttributeList > &xAttrList); }; -//////////////////////////////////////////////////////////// + class SmXMLNoneContext_Impl : public SmXMLImportContext { @@ -1690,7 +1690,7 @@ void SmXMLNoneContext_Impl::EndElement(void) new SmTextNode(aToken,FNT_VARIABLE)); } -//////////////////////////////////////////////////////////// + class SmXMLPrescriptsContext_Impl : public SmXMLImportContext { @@ -1700,7 +1700,7 @@ public: : SmXMLImportContext(rImport,nPrefix,rLName) {} }; -//////////////////////////////////////////////////////////// + class SmXMLTableRowContext_Impl : public SmXMLRowContext_Impl { @@ -1716,7 +1716,7 @@ public: }; -//////////////////////////////////////////////////////////// + class SmXMLTableContext_Impl : public SmXMLTableRowContext_Impl { @@ -1733,7 +1733,7 @@ public: }; -//////////////////////////////////////////////////////////// + class SmXMLTableCellContext_Impl : public SmXMLRowContext_Impl { @@ -1744,7 +1744,7 @@ public: {} }; -//////////////////////////////////////////////////////////// + class SmXMLAlignGroupContext_Impl : public SmXMLRowContext_Impl { @@ -1760,7 +1760,7 @@ public: } }; -//////////////////////////////////////////////////////////// + class SmXMLActionContext_Impl : public SmXMLRowContext_Impl { @@ -1773,7 +1773,7 @@ public: void EndElement(); }; -//////////////////////////////////////////////////////////// + // NB: virtually inherit so we can multiply inherit properly // in SmXMLFlatDocContext_Impl @@ -1810,7 +1810,7 @@ SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPref return pContext; } -//////////////////////////////////////////////////////////// + // context for flat file xml format class SmXMLFlatDocContext_Impl @@ -1858,7 +1858,7 @@ SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( } } -//////////////////////////////////////////////////////////// + static const SvXMLTokenMapEntry aPresLayoutElemTokenMap[] = { @@ -1957,7 +1957,7 @@ static const SvXMLTokenMapEntry aColorTokenMap[] = }; -//////////////////////////////////////////////////////////// + const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap() { @@ -2024,7 +2024,7 @@ const SvXMLTokenMap& SmXMLImport::GetColorTokenMap() return *pColorTokenMap; } -//////////////////////////////////////////////////////////// + SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, @@ -2962,7 +2962,7 @@ 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 dcdae77d1325..a4b16b740e18 100644 --- a/starmath/source/mathmlimport.hxx +++ b/starmath/source/mathmlimport.hxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { class XPropertySet; } } } } -//////////////////////////////////////////////////////////// + class SmXMLImportWrapper { @@ -67,7 +67,7 @@ public: const sal_Char* pFilterName ); }; -//////////////////////////////////////////////////////////// + class SmXMLImport : public SvXMLImport { @@ -260,7 +260,7 @@ public: virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); }; -//////////////////////////////////////////////////////////// + enum SmXMLMathElemTokenMap { @@ -342,7 +342,7 @@ enum SmXMLAnnotationAttrTokenMap XML_TOK_ENCODING }; -//////////////////////////////////////////////////////////// + #endif diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 7bc5932b80e9..bbac173f9b69 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -41,7 +41,7 @@ #include <float.h> -//////////////////////////////////////// + // SmTmpDevice // Allows for font and color changes. The original settings will be restored // in the destructor. @@ -49,7 +49,7 @@ // argument in the 'Arrange' functions and restore changes made in the 'Draw' // functions. // Usually a MapMode of 1/100th mm will be used. -// + class SmTmpDevice { @@ -121,7 +121,7 @@ void SmTmpDevice::SetFont(const Font &rNewFont) } -/////////////////////////////////////////////////////////////////////////// + SmNode::SmNode(SmNodeType eNodeType, const SmToken &rNodeToken) @@ -650,7 +650,7 @@ long SmNode::GetFormulaBaseline() const return 0; } -/////////////////////////////////////////////////////////////////////////// + SmStructureNode::SmStructureNode( const SmStructureNode &rNode ) : SmNode( rNode.GetType(), rNode.GetToken() ) @@ -759,7 +759,7 @@ void SmStructureNode::GetAccessibleText( OUStringBuffer &rText ) const } } -/////////////////////////////////////////////////////////////////////////// + bool SmVisibleNode::IsVisible() const @@ -780,14 +780,14 @@ SmNode * SmVisibleNode::GetSubNode(sal_uInt16 /*nIndex*/) } -/////////////////////////////////////////////////////////////////////////// + void SmGraphicNode::GetAccessibleText( OUStringBuffer &rText ) const { rText.append(GetToken().aText); } -/////////////////////////////////////////////////////////////////////////// + void SmExpressionNode::CreateTextFromNode(OUString &rText) @@ -815,7 +815,7 @@ void SmExpressionNode::CreateTextFromNode(OUString &rText) } -/////////////////////////////////////////////////////////////////////////// + void SmTableNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) // arranges all subnodes in one column @@ -2928,7 +2928,7 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell // Actually only WEIGHT_NORMAL and WEIGHT_BOLD should occur... However, the sms-file also // contains e.g. 'WEIGHT_ULTRALIGHT'. Consequently, compare here with '>' instead of '!='. // (In the long term the necessity for 'PrepareAttribut' and thus also for this here should be dropped) - // + //! see also SmFontStyles::GetStyleName if (IsItalic( GetFont() )) SetAttribut(ATTR_ITALIC); diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 683f0799940f..e1b9f6733d7c 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; -/////////////////////////////////////////////////////////////////////////// + namespace { template < typename T > @@ -71,7 +71,7 @@ SmToken::SmToken(SmTokenType eTokenType, nCol = nRow = 0; } -/////////////////////////////////////////////////////////////////////////// + static const SmTokenTableEntry aTokenTable[] = @@ -129,11 +129,11 @@ static const SmTokenTableEntry aTokenTable[] = { "dlrarrow" , TDLRARROW, MS_DLRARROW, TGSTANDALONE, 5}, { "dot", TDOT, MS_DOT, TGATTRIBUT, 5}, { "dotsaxis", TDOTSAXIS, MS_DOTSAXIS, TGSTANDALONE, 5}, // 5 to continue expression - { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, // - { "dotsdown", TDOTSDOWN, MS_DOTSDOWN, TGSTANDALONE, 5}, // - { "dotslow", TDOTSLOW, MS_DOTSLOW, TGSTANDALONE, 5}, // - { "dotsup", TDOTSUP, MS_DOTSUP, TGSTANDALONE, 5}, // - { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, // + { "dotsdiag", TDOTSDIAG, MS_DOTSUP, TGSTANDALONE, 5}, + { "dotsdown", TDOTSDOWN, MS_DOTSDOWN, TGSTANDALONE, 5}, + { "dotslow", TDOTSLOW, MS_DOTSLOW, TGSTANDALONE, 5}, + { "dotsup", TDOTSUP, MS_DOTSUP, TGSTANDALONE, 5}, + { "dotsvert", TDOTSVERT, MS_DOTSVERT, TGSTANDALONE, 5}, { "downarrow" , TDOWNARROW, MS_DOWNARROW, TGSTANDALONE, 5}, { "drarrow" , TDRARROW, MS_DRARROW, TGSTANDALONE, 5}, { "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5}, @@ -232,10 +232,10 @@ static const SmTokenTableEntry aTokenTable[] = { "prod", TPROD, MS_PROD, TGOPER, 5}, { "prop", TPROP, MS_PROP, TGRELATION, 0}, { "rangle", TRANGLE, MS_RMATHANGLE, TGRBRACES, 0}, //! 0 to terminate expression - { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, // - { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, // - { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, // - { "rdline", TRDLINE, MS_DVERTLINE, TGRBRACES, 0}, // + { "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, + { "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, + { "rdbracket", TRDBRACKET, MS_RDBRACKET, TGRBRACES, 0}, + { "rdline", TRDLINE, MS_DVERTLINE, TGRBRACES, 0}, { "red", TRED, '\0', TGCOLOR, 0}, { "rfloor", TRFLOOR, MS_RFLOOR, TGRBRACES, 0}, //! 0 to terminate expression { "right", TRIGHT, '\0', 0, 0}, @@ -314,7 +314,7 @@ const SmTokenTableEntry * SmParser::GetTokenTableEntry( const OUString &rName ) } -/////////////////////////////////////////////////////////////////////////// + #if OSL_DEBUG_LEVEL > 1 @@ -942,9 +942,9 @@ void SmParser::NextToken() } -//////////////////////////////////////// + // grammar -// + void SmParser::Table() @@ -1743,10 +1743,10 @@ void SmParser::UnOper() // (text, group, level of the used token are of no interrest here) // we'll use row & column of the keyword for abs aNodeToken.eType = TABS; - // + aNodeToken.cMathChar = MS_VERTLINE; SmNode* pLeft = new SmMathSymbolNode(aNodeToken); - // + aNodeToken.cMathChar = MS_VERTLINE; SmNode* pRight = new SmMathSymbolNode(aNodeToken); diff --git a/starmath/source/rect.cxx b/starmath/source/rect.cxx index f278dab7df79..6b31b6dc7cd9 100644 --- a/starmath/source/rect.cxx +++ b/starmath/source/rect.cxx @@ -29,7 +29,7 @@ #include "smmod.hxx" -//////////////////////////////////////////////////////////////////////////////// + // '\0' terminated Array with symbol, which should be treat as letters in @@ -71,10 +71,10 @@ bool SmIsMathAlpha(const OUString &rText) } -//////////////////////////////////////// -// + + // SmRect members -// + SmRect::SmRect() diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx index aaddd599bb17..72104575241c 100644 --- a/starmath/source/smdetect.hxx +++ b/starmath/source/smdetect.hxx @@ -59,9 +59,9 @@ public: SFX_DECL_XSERVICEINFO_NOFACTORY - //---------------------------------------------------------------------------------- + // XExtendedFilterDetect - //---------------------------------------------------------------------------------- + virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); }; diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 5d40679adff6..11c9bc8eb1a3 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -55,7 +55,7 @@ SmResId::SmResId( sal_uInt16 nId ) { } -///////////////////////////////////////////////////////////////// + SmLocalizedSymbolData::SmLocalizedSymbolData() : Resource( SmResId(RID_LOCALIZED_NAMES) ), @@ -156,7 +156,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rU return aRes; } -///////////////////////////////////////////////////////////////// + SFX_IMPL_INTERFACE(SmModule, SfxModule, SmResId(RID_APPLICATION)) { diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 767c1ea761ce..c1c68c8902fe 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -32,7 +32,7 @@ #include "view.hxx" -//////////////////////////////////////////////////////////// + static sal_uInt16 GetImageListRID( sal_uInt16 nCategoryRID ) { @@ -102,7 +102,7 @@ static sal_uInt16 GetCategoryRID( sal_uInt16 nResId ) } -//////////////////////////////////////////////////////////// + SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 5519b1759b0e..b3a1bbd2e906 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star::script; #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) -//////////////////////////////////////////////////////////// + SmPrintUIOptions::SmPrintUIOptions() { @@ -155,10 +155,10 @@ SmPrintUIOptions::SmPrintUIOptions() } -//////////////////////////////////////////////////////////// -// + + // class SmModel -// + // values from com/sun/star/beans/PropertyAttribute #define PROPERTY_NONE 0 @@ -945,7 +945,7 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu } } -////////////////////////////////////////////////////////////////////// + sal_Int32 SAL_CALL SmModel::getRendererCount( const uno::Any& /*rSelection*/, diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index fbc487baad04..d1525fafc536 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -32,7 +32,7 @@ #include "smdll.hxx" -//////////////////////////////////////////////////////////// + // return pointer to active SmViewShell, if this is not possible // return 0 instead. @@ -45,7 +45,7 @@ SmViewShell * SmGetActiveView() } -//////////////////////////////////////////////////////////// + /**************************************************************************/ @@ -232,7 +232,7 @@ void SmFontPickListBox::Remove(const Font &rFont) return; } -//////////////////////////////////////// + bool IsItalic( const Font &rFont ) { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f7e51242bc28..e6f6add3c627 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -90,7 +90,7 @@ using namespace com::sun::star; using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; -////////////////////////////////////////////////////////////////////// + SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell): ScrollableWindow(&pShell->GetViewFrame()->GetWindow(), 0), @@ -159,10 +159,10 @@ void SmGraphicWindow::MouseButtonDown(const MouseEvent& rMEvt) GrabFocus(); - // + // set formula-cursor and selection of edit window according to the // position clicked at - // + SAL_WARN_IF( rMEvt.GetClicks() == 0, "starmath", "0 clicks" ); if ( rMEvt.IsLeft() ) { @@ -817,7 +817,7 @@ IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) // to allow for immediate typing. // Problem: There is no proper way to do this // Thus: this timer based soultion has been implemented (see GrabFocus below) - // + // Follow-up problem (#i114910): grabing the focus may bust the help system since // it relies on getting the current frame which conflicts with grabbing the focus. // Thus aside from the 'GrabFocus' call everything else is to get the diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx index 922d6c333e46..33624b0d5ae6 100644 --- a/starmath/source/visitors.cxx +++ b/starmath/source/visitors.cxx @@ -9,7 +9,7 @@ #include "visitors.hxx" #include "cursor.hxx" -///////////////////////////////////// SmVisitorTest ///////////////////////////////////// +// SmVisitorTest void SmVisitorTest::Visit( SmTableNode* pNode ) { @@ -180,7 +180,7 @@ void SmVisitorTest::VisitChildren( SmNode* pNode ) it->Accept( this ); } -/////////////////////////////// SmDefaultingVisitor //////////////////////////////// +// SmDefaultingVisitor void SmDefaultingVisitor::Visit( SmTableNode* pNode ) { @@ -317,7 +317,7 @@ void SmDefaultingVisitor::Visit( SmVerticalBraceNode* pNode ) DefaultVisit( pNode ); } -/////////////////////////////// SmCaretDrawingVisitor //////////////////////////////// +// SmCaretDrawingVisitor SmCaretDrawingVisitor::SmCaretDrawingVisitor( OutputDevice& rDevice, SmCaretPos position, @@ -402,7 +402,7 @@ void SmCaretDrawingVisitor::DefaultVisit( SmNode* pNode ) rDev.DrawLine( pLeft, pRight ); } -/////////////////////////////// SmCaretPos2LineVisitor //////////////////////////////// +// SmCaretPos2LineVisitor void SmCaretPos2LineVisitor::Visit( SmTextNode* pNode ) { @@ -434,7 +434,7 @@ void SmCaretPos2LineVisitor::DefaultVisit( SmNode* pNode ) line = SmCaretLine( p1.X( ), p1.Y( ), pNode->GetHeight( ) ); } -/////////////////////////////// Nasty temporary device!!! //////////////////////////////// +// Nasty temporary device!!! #include <tools/gen.hxx> #include <tools/fract.hxx> @@ -513,7 +513,7 @@ void SmTmpDevice2::SetFont( const Font &rNewFont ) rOutDev.SetTextColor( Impl_GetColor( rNewFont.GetColor( ) ) ); } -/////////////////////////////// SmDrawingVisitor //////////////////////////////// +// SmDrawingVisitor void SmDrawingVisitor::Visit( SmTableNode* pNode ) { @@ -762,7 +762,7 @@ void SmDrawingVisitor::DrawChildren( SmNode* pNode ) } } -/////////////////////////////// SmSetSelectionVisitor //////////////////////////////// +// SmSetSelectionVisitor SmSetSelectionVisitor::SmSetSelectionVisitor( SmCaretPos startPos, SmCaretPos endPos, SmNode* pTree) { StartPos = startPos; @@ -960,7 +960,7 @@ void SmSetSelectionVisitor::Visit( SmFontNode* pNode ) { VisitCompositionNode( pNode ); } -/////////////////////////////// SmCaretPosGraphBuildingVisitor //////////////////////////////// +// SmCaretPosGraphBuildingVisitor SmCaretPosGraphBuildingVisitor::SmCaretPosGraphBuildingVisitor( SmNode* pRootNode ) { pRightMost = NULL; @@ -1781,7 +1781,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmPolyLineNode* ) //Do nothing } -/////////////////////////////// SmCloningVisitor /////////////////////////////// +// SmCloningVisitor SmNode* SmCloningVisitor::Clone( SmNode* pNode ) { @@ -2030,7 +2030,7 @@ void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode ) pResult = pClone; } -/////////////////////////////// SmSelectionDrawingVisitor /////////////////////////////// +// SmSelectionDrawingVisitor SmSelectionDrawingVisitor::SmSelectionDrawingVisitor( OutputDevice& rDevice, SmNode* pTree, Point Offset ) : rDev( rDevice ) { @@ -2101,7 +2101,7 @@ void SmSelectionDrawingVisitor::Visit( SmTextNode* pNode ) } } -/////////////////////////////// SmNodeToTextVisitor /////////////////////////////// +// SmNodeToTextVisitor SmNodeToTextVisitor::SmNodeToTextVisitor( SmNode* pNode, OUString &rText ) { |