[Libreoffice-commits] core.git: 2 commits - desktop/source starmath/inc

[Takeshi Abe]

 desktop/source/app/officeipcthread.hxx |    6 ------
 starmath/inc/caret.hxx                 |    6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 6476aba045d71eaf53e03d4d0352f82e3eba6920
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Dec 22 18:42:12 2014 +0900

    Drop unused member variables
    
    They were gone with 4ce2602befd59e69264d8e4ced8730b40c2b947c /
    b6ff19fba3a1a6d65134539a71d7a8df0e35d4ff.
    
    Change-Id: Ida5790f77d619fdc91dfce11b186ed5e15587ddf

diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index a6b48c1..3f81d40 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -87,14 +87,8 @@ class OfficeIPCThread : public salhelper::Thread
     ::osl::Condition cReady;
 
     static ::osl::Mutex&        GetMutex();
-    static const char *sc_aTerminationSequence;
-    static const int sc_nTSeqLength;
     static const char *sc_aShowSequence;
     static const int sc_nShSeqLength;
-    static const char *sc_aConfirmationSequence;
-    static const int sc_nCSeqLength;
-    static const char *sc_aSendArgumentsSequence;
-    static const int sc_nCSASeqLength;
 
     OfficeIPCThread();
 
commit c6167c9c7545f7797a8b48b035d09f2901e545bf
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Dec 22 18:30:51 2014 +0900

    prefer constant to macro
    
    Change-Id: I5e629491b5be9e2de1f72fdbe6887038305d0742

diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index f435617..2b951b4 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -116,9 +116,6 @@ struct SmCaretPosGraphEntry{
     }
 };
 
-/** Define SmCaretPosGraph to be less than one page 4096 */
-#define SmCaretPosGraphSize   255
-
 class SmCaretPosGraph;
 
 /** Iterator for SmCaretPosGraph */
@@ -178,6 +175,9 @@ public:
     }
     friend class SmCaretPosGraphIterator;
 private:
+    /** Define SmCaretPosGraph to be less than one page 4096 */
+    static const int SmCaretPosGraphSize = 255;
+
     /** Next graph, to be used when this graph is full */
     SmCaretPosGraph* pNext;
     /** Next free entry in graph */