[Libreoffice-commits] .: 2 commits - starmath/inc

[Lubos Lunak]

 starmath/inc/node.hxx     |    2 +-
 starmath/inc/visitors.hxx |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ca482d1120cba040cd37c91e106d63df25dfa3a0
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Mar 23 10:57:00 2011 +0100

    remove virtual from operator=
    
    Completely pointless, no inherited class overrides it, in fact
    nothing even seems to use it, and it generates a warning
    with -Woverloaded-virtual.

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index c590599..4ea622a 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -329,7 +329,7 @@ public:
             void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
             void SetSubNodes(const SmNodeArray &rNodeArray);
 
-    virtual SmStructureNode & operator = ( const SmStructureNode &rNode );
+    SmStructureNode & operator = ( const SmStructureNode &rNode );
 
     virtual void  GetAccessibleText( String &rText ) const;
 
commit c4d8c5cc20dedf8b530659a283818d9498a24842
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Mar 23 10:56:45 2011 +0100

    don't hide overloaded virtual methods

diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 8960a24..b137ef2 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -155,6 +155,7 @@ public:
     /** Given position and device this constructor will draw the caret */
     SmCaretDrawingVisitor( OutputDevice& rDevice, SmCaretPos position, Point offset, bool caretVisible );
     void Visit( SmTextNode* pNode );
+    using SmDefaultingVisitor::Visit;
 private:
     OutputDevice &rDev;
     SmCaretPos pos;
@@ -181,6 +182,7 @@ public:
         pos.pSelectedNode->Accept( this );
     }
     void Visit( SmTextNode* pNode );
+    using SmDefaultingVisitor::Visit;
     SmCaretLine GetResult( ){
         return line;
     }
@@ -273,6 +275,7 @@ public:
     void Visit( SmExpressionNode* pNode );
     void Visit( SmLineNode* pNode );
     void Visit( SmAlignNode* pNode );
+    using SmDefaultingVisitor::Visit;
     /** Set IsSelected on all pNodes of pSubTree */
     static void SetSelectedOnAll( SmNode* pSubTree, bool IsSelected = true );
 private:
@@ -415,6 +418,7 @@ public:
     /** Draws a selection on rDevice for the selection on pTree */
     SmSelectionDrawingVisitor( OutputDevice& rDevice, SmNode* pTree, Point Offset );
     void Visit( SmTextNode* pNode );
+    using SmDefaultingVisitor::Visit;
 private:
     /** Reference to drawing device */
     OutputDevice& rDev;