INTEGRATION: CWS swwarnings (1.35.242); FILE MERGED 2007/08/24 08:55:19 tl 1.35.242.7: #i69287# warning-free code 2007/08/20 15:14:53 tl 1.35.242.6: RESYNC: (1.36-1.37); FILE MERGED 2007/05/29 10:38:49 os 1.35.242.5: RESYNC: (1.35-1.36); FILE MERGED 2007/04/03 12:57:04 tl 1.35.242.4: #i69287# warning-free code 2007/03/12 08:48:16 fme 1.35.242.3: #i69287# Warning free code 2007/03/05 12:43:15 tl 1.35.242.2: #i69287# warning-free code 2007/02/22 15:05:35 tl 1.35.242.1: #i69287# warning-free code

--- sw/inc/crsrsh.hxx
+++ sw/inc/crsrsh.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: crsrsh.hxx,v $
  *
- *  $Revision: 1.37 $
- *
- *  last change: $Author: hr $ $Date: 2007-06-27 13:13:02 $
+ *  $Revision: 1.38 $
+ *
+ *  last change: $Author: hr $ $Date: 2007-09-27 07:57:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -119,11 +119,11 @@

 namespace com { namespace sun { namespace star { namespace text {
     class XTextRange;
-}}}};
+}}}}

 namespace com { namespace sun { namespace star { namespace container {
     class XStringKeyMap;
-}}}};
+}}}}

 // enum und struktur, um ueber die Doc-Position Informationen zu erfragen

@@ -171,7 +171,7 @@
     }

     // befindet sich der Node in einem geschuetzten Bereich?
-    FASTBOOL IsInProtectSect() const;
+    BOOL IsInProtectSect() const;
     bool     IsInRTLText()const;
 };

@@ -311,16 +311,15 @@
     // <- #i27615#

     // private method(s) accessed from public inline method(s) must be exported.
-                  FASTBOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
-    SW_DLLPRIVATE FASTBOOL UpDown( BOOL, USHORT );
-    SW_DLLPRIVATE FASTBOOL LRMargin( BOOL, BOOL bAPI = FALSE );
-    SW_DLLPRIVATE FASTBOOL IsAtLRMargin( BOOL, BOOL bAPI = FALSE ) const;
-    FASTBOOL SttEndDoc( BOOL bStt );
+                  BOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
+    SW_DLLPRIVATE BOOL UpDown( BOOL, USHORT );
+    SW_DLLPRIVATE BOOL LRMargin( BOOL, BOOL bAPI = FALSE );
+    SW_DLLPRIVATE BOOL IsAtLRMargin( BOOL, BOOL bAPI = FALSE ) const;

     SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;

-typedef FASTBOOL (SwCursor:: *FNCrsr)();
-    SW_DLLPRIVATE FASTBOOL CallCrsrFN( FNCrsr );
+typedef BOOL (SwCursor:: *FNCrsr)();
+    SW_DLLPRIVATE BOOL CallCrsrFN( FNCrsr );

     SW_DLLPRIVATE const SwRedline* _GotoRedline( USHORT nArrPos, BOOL bSelect );

@@ -348,11 +347,11 @@
                     const xub_StrLen nOffset = 0 );

     // --> FME 2004-07-30 #i32329# Enhanced table selection
-    FASTBOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+    BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
     // <--

     // --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary
-    bool SetInFrontOfLabel( FASTBOOL bNew );
+    bool SetInFrontOfLabel( BOOL bNew );
     // <--

     /**
@@ -363,8 +362,7 @@

 public:
     TYPEINFO();
-    SwCrsrShell( SwDoc& rDoc, Window *pWin,
-                SwRootFrm * = 0, const SwViewOption *pOpt = 0 );
+    SwCrsrShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 );
     // verkleideter Copy-Constructor
     SwCrsrShell( SwCrsrShell& rShell, Window *pWin );
     virtual ~SwCrsrShell();
@@ -374,12 +372,12 @@
     // neuen Cusror erzeugen und den alten anhaengen
     SwPaM * CreateCrsr();
     // loesche den aktuellen Cursor und der folgende wird zum Aktuellen
-    FASTBOOL DestroyCrsr();
+    BOOL DestroyCrsr();
     // TableCursor in normale Cursor verwandeln, Tablemode aufheben
     void TblCrsrToCursor();

-    SwPaM* GetCrsr( FASTBOOL bMakeTblCrsr = TRUE ) const;
-    inline SwCursor* GetSwCrsr( FASTBOOL bMakeTblCrsr = TRUE ) const;
+    SwPaM* GetCrsr( BOOL bMakeTblCrsr = TRUE ) const;
+    inline SwCursor* GetSwCrsr( BOOL bMakeTblCrsr = TRUE ) const;
     // nur den akt. Cursor returnen
           SwShellCrsr* _GetCrsr()                       { return pCurCrsr; }
     const SwShellCrsr* _GetCrsr() const                 { return pCurCrsr; }
@@ -403,23 +401,22 @@
     // Basiscursortravelling
     long GetUpDownX() const             { return nUpDownX; }

-    FASTBOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
+    BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
         { return LeftRight( TRUE, nCnt, nMode, bAllowVisual ); }
-    FASTBOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
+    BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
         { return LeftRight( FALSE, nCnt, nMode, bAllowVisual ); }
-    FASTBOOL Up( USHORT nCnt = 1 )      { return UpDown( TRUE, nCnt ); }
-    FASTBOOL Down( USHORT nCnt = 1 )    { return UpDown( FALSE, nCnt ); }
-    FASTBOOL LeftMargin()               { return LRMargin( TRUE ); }
-    FASTBOOL RightMargin(BOOL bAPI = FALSE) { return LRMargin( FALSE, bAPI ); }
-    FASTBOOL SttDoc()                   { return SttEndDoc( TRUE ); }
-    FASTBOOL EndDoc()                   { return SttEndDoc( FALSE ); }
-
-    FASTBOOL MovePage( SwWhichPage, SwPosPage );
-    FASTBOOL MovePara( SwWhichPara, SwPosPara );
-    FASTBOOL MoveSection( SwWhichSection, SwPosSection );
-    FASTBOOL MoveTable( SwWhichTable, SwPosTable );
-    FASTBOOL MoveColumn( SwWhichColumn, SwPosColumn );
-    FASTBOOL MoveRegion( SwWhichRegion, SwPosRegion );
+    BOOL Up( USHORT nCnt = 1 )      { return UpDown( TRUE, nCnt ); }
+    BOOL Down( USHORT nCnt = 1 )    { return UpDown( FALSE, nCnt ); }
+    BOOL LeftMargin()               { return LRMargin( TRUE ); }
+    BOOL RightMargin(BOOL bAPI = FALSE) { return LRMargin( FALSE, bAPI ); }
+    BOOL SttEndDoc( BOOL bStt );
+
+    BOOL MovePage( SwWhichPage, SwPosPage );
+    BOOL MovePara( SwWhichPara, SwPosPara );
+    BOOL MoveSection( SwWhichSection, SwPosSection );
+    BOOL MoveTable( SwWhichTable, SwPosTable );
+    BOOL MoveColumn( SwWhichColumn, SwPosColumn );
+    BOOL MoveRegion( SwWhichRegion, SwPosRegion );

     // die Suchfunktionen
     ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
@@ -432,7 +429,7 @@
                 BOOL& bCancel,
                 FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );

-    ULONG Find( const SfxItemSet& rSet, FASTBOOL bNoCollections,
+    ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections,
                 SwDocPositions eStart, SwDocPositions eEnde,
                 BOOL& bCancel,
                 FindRanges eRng,
@@ -461,7 +458,7 @@

     // Bereiche
     inline void SetMark();
-    inline FASTBOOL HasMark();
+    inline BOOL HasMark();

     void ClearMark();

@@ -475,7 +472,7 @@
     void NormalizePam(BOOL bPointFirst = TRUE);

     void SwapPam();
-    FASTBOOL ChgCurrPam( const Point & rPt,
+    BOOL ChgCurrPam( const Point & rPt,
                      BOOL bTstOnly = TRUE,      //Nur testen, nicht setzen
                      BOOL bTstHit  = FALSE );   //Nur genaue Treffer
     void KillPams();
@@ -489,7 +486,7 @@
      *
      *  Return:  es war auf dem Stack noch einer vorhanden
      */
-    FASTBOOL Pop( BOOL bOldCrsr = TRUE );
+    BOOL Pop( BOOL bOldCrsr = TRUE );
     /*
      * Verbinde zwei Cursor miteinander.
      * Loesche vom Stack den obersten und setzen dessen Mark im Aktuellen.
@@ -523,22 +520,22 @@
     void ShowCrsrs( BOOL bCrsrVis );
     void HideCrsrs();

-    FASTBOOL IsOverwriteCrsr() const { return bOverwriteCrsr; }
-    void SetOverwriteCrsr( FASTBOOL bFlag ) { bOverwriteCrsr = bFlag; }
+    BOOL IsOverwriteCrsr() const { return bOverwriteCrsr; }
+    void SetOverwriteCrsr( BOOL bFlag ) { bOverwriteCrsr = bFlag; }

     // gebe den aktuellen Frame, in dem der Cursor steht, zurueck
     SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const;

     //TRUE wenn der Crsr wenn der Crsr wegen Readonly gehidet ist,
     //FALSE wenn der arbeitet (trotz Readonly).
-    FASTBOOL IsCrsrReadonly() const;
+    BOOL IsCrsrReadonly() const;
     // Cursor steht in etwas geschuetztem oder in die Selektion umspannt
     // etwas geschuetztes.
-    FASTBOOL HasReadonlySel() const;
+    BOOL HasReadonlySel() const;
     // darf der Cursor in ReadOnlyBereiche?
-    FASTBOOL IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
+    BOOL IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
     void SetReadOnlyAvailable( BOOL bFlag );
-    FASTBOOL IsOverReadOnlyPos( const Point& rPt ) const;
+    BOOL IsOverReadOnlyPos( const Point& rPt ) const;

     // Methoden fuer aFlyMacroLnk
     void        SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; }
@@ -557,21 +554,21 @@

     // Abfrage, ob der aktuelle Cursor eine Selektion aufspannt,
     // also, ob Mark gesetzt und SPoint und Mark unterschiedlich sind.
-    FASTBOOL HasSelection() const;
+    BOOL HasSelection() const;

     // Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor
     // aufgespannt oder nicht der einzigste ist.
-    inline FASTBOOL IsSelection() const;
+    inline BOOL IsSelection() const;
     // returns if multiple cursors are available
-    inline FASTBOOL IsMultiSelection() const;
+    inline BOOL IsMultiSelection() const;

     // Abfrage, ob ein kompletter Absatz selektiert wurde
-    FASTBOOL IsSelFullPara() const;
+    BOOL IsSelFullPara() const;
     // Abfrage, ob die Selektion in einem Absatz ist
-    inline FASTBOOL IsSelOnePara() const;
+    inline BOOL IsSelOnePara() const;

     //Sollte fuer das Clipboard der WaitPtr geschaltet werden.
-    FASTBOOL ShouldWait() const;
+    BOOL ShouldWait() const;

     /*
      * liefert das SRectangle, auf dem der Cursor steht.
@@ -581,7 +578,7 @@
      * liefert zurueck, ob der Cursor sich ganz oder teilweise im
      * sichtbaren Bereich befindet.
      */
-    FASTBOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
+    BOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }

     // gebe die aktuelle Seitennummer zurueck:
     // TRUE:  in der der Cursor steht
@@ -593,23 +590,23 @@
     USHORT GetNextPrevPageNum( BOOL bNext = TRUE );

     // setze den Cursor auf die Seite "nPage" an den Anfang
-    FASTBOOL GotoPage( USHORT nPage );
+    BOOL GotoPage( USHORT nPage );

     // gebe alle Dokumentseiten zurueck
     USHORT GetPageCnt();

     // Gehe zur naechsten Selection
-    FASTBOOL GoNextCrsr();
+    BOOL GoNextCrsr();
     // gehe zur vorherigen Selection
-    FASTBOOL GoPrevCrsr();
+    BOOL GoPrevCrsr();

     // am CurCrsr.SPoint
-    FASTBOOL SetBookmark( const KeyCode&, const String& rName,
+    BOOL SetBookmark( const KeyCode&, const String& rName,
                 const String& rShortName, IDocumentBookmarkAccess::BookmarkType eMark = IDocumentBookmarkAccess::BOOKMARK);
-    FASTBOOL GotoBookmark( USHORT );    // setzt CurCrsr.SPoint
-    FASTBOOL GotoBookmark( USHORT nPos, BOOL bAtStart ); //
-    FASTBOOL GoNextBookmark(); // TRUE, wenn's noch eine gab
-    FASTBOOL GoPrevBookmark();
+    BOOL GotoBookmark( USHORT );    // setzt CurCrsr.SPoint
+    BOOL GotoBookmark( USHORT nPos, BOOL bAtStart ); //
+    BOOL GoNextBookmark(); // TRUE, wenn's noch eine gab
+    BOOL GoPrevBookmark();
     USHORT GetBookmarkCnt(BOOL bBkmrk = FALSE) const;
     SwBookmark& GetBookmark( USHORT, BOOL bBkmrk = FALSE );
     void DelBookmark( USHORT );
@@ -635,36 +632,36 @@
     inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
     // erfrage die Document - Layout - Position vom akt. Crsr
     inline Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
-    inline FASTBOOL IsCrsrPtAtEnd() const;
+    inline BOOL IsCrsrPtAtEnd() const;

     inline const  SwPaM* GetTblCrs() const;
     inline        SwPaM* GetTblCrs();

-    FASTBOOL IsTblComplex() const;
-    FASTBOOL IsTblComplexForChart();
+    BOOL IsTblComplex() const;
+    BOOL IsTblComplexForChart();
     // erfrage die akt. TabellenSelektion als Text
     String GetBoxNms() const;

     // setze Crsr in die naechsten/vorherigen Celle
-    FASTBOOL GoNextCell( BOOL bAppendLine = TRUE );
-    FASTBOOL GoPrevCell();
+    BOOL GoNextCell( BOOL bAppendLine = TRUE );
+    BOOL GoPrevCell();
     // gehe zu dieser Box (wenn vorhanden und in Tabelle!)
-    FASTBOOL GotoTable( const String& rName );
+    BOOL GotoTable( const String& rName );

     // select a table row, column or box (based on the current cursor)
-    FASTBOOL SelTblRow() { return _SelTblRowOrCol( true  ); }
-    FASTBOOL SelTblCol() { return _SelTblRowOrCol( false ); }
-    FASTBOOL SelTblBox();
+    BOOL SelTblRow() { return _SelTblRowOrCol( true  ); }
+    BOOL SelTblCol() { return _SelTblRowOrCol( false ); }
+    BOOL SelTblBox();
     // --> FME 2004-07-30 #i32329# Enhanced table selection
-    FASTBOOL SelTbl();
+    BOOL SelTbl();
     // <--

     // zum naechsten/vorhergehenden Punkt auf gleicher Ebene
-    FASTBOOL GotoNextNum();
-    FASTBOOL GotoPrevNum();
+    BOOL GotoNextNum();
+    BOOL GotoPrevNum();

         // zu diesem Gliederungspunkt
-    FASTBOOL GotoOutline( const String& rName );
+    BOOL GotoOutline( const String& rName );
         // zum naechsten/vorhergehenden oder angegebenen OultineNode
     void GotoOutline( USHORT nIdx );
         // suche die "Outline-Position" im Nodes-Array vom akt. Kaiptel
@@ -672,138 +669,138 @@
         // selektiere den angeben Bereich von OutlineNodes. Optional
         // inclusive der Childs. Die USHORT sind die Positionen im
         // OutlineNds-Array!! (EditShell)
-    FASTBOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
+    BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
                         BOOL bWithChilds = FALSE );

-    FASTBOOL GotoNextOutline();         // naechster Node mit Outline-Num.
-    FASTBOOL GotoPrevOutline();         // vorheriger Node mit Outline-Num.
+    BOOL GotoNextOutline();         // naechster Node mit Outline-Num.
+    BOOL GotoPrevOutline();         // vorheriger Node mit Outline-Num.

         // ist der Crsr in einer Tabelle und ist die Selection ueber
         // zwei Spalten
-    FASTBOOL IsTableMode() const { return 0 != pTblCrsr; }
+    BOOL IsTableMode() const { return 0 != pTblCrsr; }

         // erfrage den Tabellen Crsr; ausserhalb von Tabellen immer 0
     const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; }
     SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; }
     USHORT UpdateTblSelBoxes();

-    FASTBOOL GotoFtnTxt();      // springe aus dem Content zur Fussnote
-    FASTBOOL GotoFtnAnchor();   // springe aus der Fussnote zum Anker
-    FASTBOOL GotoPrevFtnAnchor();
-    FASTBOOL GotoNextFtnAnchor();
-
-    FASTBOOL GotoFlyAnchor();       // springe aus dem Rahmen zum Anker
-    FASTBOOL GotoHeaderTxt();       // springe aus dem Content zum Header
-    FASTBOOL GotoFooterTxt();       // springe aus dem Content zum Footer
+    BOOL GotoFtnTxt();      // springe aus dem Content zur Fussnote
+    BOOL GotoFtnAnchor();   // springe aus der Fussnote zum Anker
+    BOOL GotoPrevFtnAnchor();
+    BOOL GotoNextFtnAnchor();
+
+    BOOL GotoFlyAnchor();       // springe aus dem Rahmen zum Anker
+    BOOL GotoHeaderTxt();       // springe aus dem Content zum Header
+    BOOL GotoFooterTxt();       // springe aus dem Content zum Footer
     // springe in den Header/Footer des angegebenen oder akt. PageDesc
-    FASTBOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX,
-                            FASTBOOL bInHeader = TRUE );
+    BOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX,
+                            BOOL bInHeader = TRUE );
     // is point of cursor in header/footer. pbInHeader return TRUE if it is
     // in a headerframe otherwise in a footerframe
-    FASTBOOL IsInHeaderFooter( FASTBOOL* pbInHeader = 0 ) const;
+    BOOL IsInHeaderFooter( BOOL* pbInHeader = 0 ) const;

     // springe zum naechsten Verzeichnis [mit dem Namen]
-    FASTBOOL GotoNextTOXBase( const String* = 0 );
+    BOOL GotoNextTOXBase( const String* = 0 );
     // springe zum vorherigen Verzeichnis [mit dem Namen]
-    FASTBOOL GotoPrevTOXBase( const String* = 0 );
-    FASTBOOL GotoTOXMarkBase();     // springe zum Verzeichnis vom TOXMark
+    BOOL GotoPrevTOXBase( const String* = 0 );
+    BOOL GotoTOXMarkBase();     // springe zum Verzeichnis vom TOXMark
     // springe zum naechsten (vorherigen) Verzeichniseintrag
-    FASTBOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE );
+    BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE );
     // Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln
     const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );

     // springe zum naechsten (vorherigen) Tabellenformel
     // optional auch nur zu kaputten Formeln springen
-    FASTBOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE,
+    BOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE,
                                     BOOL bOnlyErrors = FALSE );
     // jump to the next / previous hyperlink - inside text and also
     // on graphics
-    FASTBOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE );
+    BOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE );

     // springe zu dieser Refmark
-    FASTBOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
+    BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
                             USHORT nSeqNo = 0 );

     // hole vom Start/Ende der akt. Selection das nte Zeichen
     sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 );
     // erweiter die akt. Selection am Anfang/Ende um n Zeichen
-    FASTBOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 );
+    BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 );
     // setze nur den sichtbaren Cursor an die angegebene Dokument-Pos.
     // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde.
     // (wird zum Anzeigen von Drag&Drop/Copy-Cursor benoetigt)
-    FASTBOOL SetVisCrsr( const Point &rPt );
+    BOOL SetVisCrsr( const Point &rPt );
     inline void UnSetVisCrsr();

     // springe zum nachsten/vorherigen Feld des entsprechenden Types
-    FASTBOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext,
+    BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext,
                                             USHORT nSubType = USHRT_MAX,
                                             USHORT nResType = USHRT_MAX );
     // springe genau zu diesem Feld
-    FASTBOOL GotoFld( const SwFmtFld& rFld );
+    BOOL GotoFld( const SwFmtFld& rFld );

     // returne die Anzahl der Cursor im Ring (Flag besagt ob man nur
     // aufgepspannte haben will - sprich etwas selektiert ist (Basic))
     USHORT GetCrsrCnt( BOOL bAll = TRUE ) const;

     // Char Travelling - Methoden (in crstrvl1.cxx)
-    FASTBOOL GoStartWord();
-    FASTBOOL GoEndWord();
-    FASTBOOL GoNextWord();
-    FASTBOOL GoPrevWord();
-    FASTBOOL GoNextSentence();
-    FASTBOOL GoPrevSentence();
-    FASTBOOL GoStartSentence();
-    FASTBOOL GoEndSentence();
-    FASTBOOL SelectWord( const Point* pPt = 0 );
+    BOOL GoStartWord();
+    BOOL GoEndWord();
+    BOOL GoNextWord();
+    BOOL GoPrevWord();
+    BOOL GoNextSentence();
+    BOOL GoPrevSentence();
+    BOOL GoStartSentence();
+    BOOL GoEndSentence();
+    BOOL SelectWord( const Point* pPt = 0 );

     // Position vom akt. Cursor erfragen
-    FASTBOOL IsStartWord()const;
-    FASTBOOL IsEndWord() const;
-    FASTBOOL IsInWord() const;
-    FASTBOOL IsStartSentence() const;
-    FASTBOOL IsEndSentence() const;
-    FASTBOOL IsSttPara() const;
-    FASTBOOL IsEndPara() const;
-    FASTBOOL IsStartOfDoc() const;
-    FASTBOOL IsEndOfDoc() const;
-    FASTBOOL IsInFrontOfLabel() const;
-    FASTBOOL IsAtLeftMargin()   const       { return IsAtLRMargin( TRUE ); }
-    FASTBOOL IsAtRightMargin(BOOL bAPI = FALSE) const   { return IsAtLRMargin( FALSE, bAPI ); }
+    BOOL IsStartWord()const;
+    BOOL IsEndWord() const;
+    BOOL IsInWord() const;
+    BOOL IsStartSentence() const;
+    BOOL IsEndSentence() const;
+    BOOL IsSttPara() const;
+    BOOL IsEndPara() const;
+    BOOL IsStartOfDoc() const;
+    BOOL IsEndOfDoc() const;
+    BOOL IsInFrontOfLabel() const;
+    BOOL IsAtLeftMargin()   const       { return IsAtLRMargin( TRUE ); }
+    BOOL IsAtRightMargin(BOOL bAPI = FALSE) const   { return IsAtLRMargin( FALSE, bAPI ); }

     // loesche alle erzeugten Crsr, setze den Tabellen-Crsr und den letzten
     // Cursor auf seinen TextNode (oder StartNode?).
     // Beim naechsten ::GetCrsr werden sie wieder alle erzeugt.
     // Wird fuers Drag&Drop/ClipBorad-Paste in Tabellen benoetigt.
-    FASTBOOL ParkTblCrsr();
+    BOOL ParkTblCrsr();

     // gibt es nicht aufgespannte Attribute?
-    FASTBOOL IsGCAttr() const { return bGCAttr; }
+    BOOL IsGCAttr() const { return bGCAttr; }
     void ClearGCAttr() { bGCAttr = FALSE; }
     void    UpdateAttr() {  bGCAttr = TRUE; }

     // ist das gesamte Dokument geschuetzt/versteckt?? (fuer UI,..)
-    FASTBOOL IsAllProtect() const { return bAllProtect; }
+    BOOL IsAllProtect() const { return bAllProtect; }

 #ifdef SW_CRSR_TIMER
     // setze das Flag am VisCrsr, ob dieser ueber Timer getriggert (TRUE)
     // oder direkt (FALSE) angezeigt wird. (default ist Timer getriggert)
-    FASTBOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE );
+    BOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE );
 #endif

     BOOL BasicActionPend() const    { return nBasicActionCnt != nStartAction; }

         // springe zum benannten Bereich
-    FASTBOOL GotoRegion( const String& rName );
+    BOOL GotoRegion( const String& rName );

     // zeige die aktuelle Selektion an
     virtual void MakeSelVisible();

     // setzte den Cursor auf einen NICHT geschuetzten/versteckten Node
-    FASTBOOL FindValidCntntNode( BOOL bOnlyText = FALSE );
-
-    FASTBOOL GetContentAtPos( const Point& rPt,
+    BOOL FindValidCntntNode( BOOL bOnlyText = FALSE );
+
+    BOOL GetContentAtPos( const Point& rPt,
                             SwContentAtPos& rCntntAtPos,
-                            FASTBOOL bSetCrsr = FALSE,
+                            BOOL bSetCrsr = FALSE,
                             SwRect* pFldRect = 0 );

     // get smart tags at point position
@@ -818,18 +815,17 @@
                           ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
                           ::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const;

-    FASTBOOL IsPageAtPos( const Point &rPt ) const;
+    BOOL IsPageAtPos( const Point &rPt ) const;

         // Attribut selelktieren
-    FASTBOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand = FALSE,
-                            const SwTxtAttr* pAttr = 0 );
-    FASTBOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
+    BOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand, const SwTxtAttr* pAttr = 0 );
+    BOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
     const SwFmtINetFmt* FindINetAttr( const String& rName ) const;

-    FASTBOOL CheckTblBoxCntnt( const SwPosition* pPos = 0 );
+    BOOL CheckTblBoxCntnt( const SwPosition* pPos = 0 );
     void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
     void ClearTblBoxCntnt();
-    FASTBOOL EndAllTblBoxEdit();
+    BOOL EndAllTblBoxEdit();

     // wird gerufen, wenn eine Tabellenselektion im UpdateCrsr erzeugt wird,
     // ohne das die UI davon etaws weiss
@@ -841,18 +837,18 @@
     BOOL IsAutoUpdateCells() const              { return bAutoUpdateCells; }
     void SetAutoUpdateCells( BOOL bFlag )       { bAutoUpdateCells = bFlag; }

-    FASTBOOL GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
-                            SwRect& rRect, SwHoriOrient& rOrient );
-    FASTBOOL SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
+    BOOL GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
+                            SwRect& rRect, short& rOrient );
+    BOOL SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );

     const SwRedline* SelNextRedline();
     const SwRedline* SelPrevRedline();
     const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE );

     // is cursor or the point in/over a vertical formatted text?
-    FASTBOOL IsInVerticalText( const Point* pPt = 0 ) const;
+    BOOL IsInVerticalText( const Point* pPt = 0 ) const;
     // is cursor or the point in/over a right to left formatted text?
-    FASTBOOL IsInRightToLeftText( const Point* pPt = 0 ) const;
+    BOOL IsInRightToLeftText( const Point* pPt = 0 ) const;

     // If the current cursor position is inside a hidden range, the hidden range
     // is selected and true is returned:
@@ -892,7 +888,7 @@
     return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
 }

-inline SwCursor* SwCrsrShell::GetSwCrsr( FASTBOOL bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( BOOL bMakeTblCrsr ) const
 {
     return (SwCursor*)GetCrsr( bMakeTblCrsr );
 }
@@ -901,19 +897,19 @@

 inline void SwCrsrShell::SetMark() { pCurCrsr->SetMark(); }

-inline FASTBOOL SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
-
-inline FASTBOOL SwCrsrShell::IsSelection() const
+inline BOOL SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
+
+inline BOOL SwCrsrShell::IsSelection() const
 {
     return IsTableMode() || pCurCrsr->HasMark() ||
             pCurCrsr->GetNext() != pCurCrsr;
 }
-inline FASTBOOL SwCrsrShell::IsMultiSelection() const
+inline BOOL SwCrsrShell::IsMultiSelection() const
 {
     return pCurCrsr->GetNext() != pCurCrsr;
 }

-inline FASTBOOL SwCrsrShell::IsSelOnePara() const
+inline BOOL SwCrsrShell::IsSelOnePara() const
 {
     return pCurCrsr == pCurCrsr->GetNext() &&
            pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode;
@@ -924,7 +920,7 @@
     return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
 }

-inline FASTBOOL SwCrsrShell::IsCrsrPtAtEnd() const
+inline BOOL SwCrsrShell::IsCrsrPtAtEnd() const
 {
     return pCurCrsr->End() == pCurCrsr->GetPoint();
 }


Reorder functions to group members together.

--- lib/FrontendTool/ReferenceDependencies.cpp
+++ lib/FrontendTool/ReferenceDependencies.cpp
@@ -115,30 +115,6 @@
 };
 } // end anon namespace

-void ProvidesEmitter::CollectedProvidedDeclarations::findNominalsAndOperators(DeclRange members) {
-  for (const Decl *D : members) {
-    auto *VD = dyn_cast<ValueDecl>(D);
-    if (!VD)
-      continue;
-
-    if (VD->hasAccess() &&
-        VD->getFormalAccess() <= AccessLevel::FilePrivate) {
-      continue;
-    }
-
-    if (VD->getFullName().isOperator()) {
-      memberOperatorDecls.push_back(cast<FuncDecl>(VD));
-      continue;
-    }
-
-    auto nominal = dyn_cast<NominalTypeDecl>(D);
-    if (!nominal)
-      continue;
-    extendedNominals[nominal] |= true;
-    findNominalsAndOperators(nominal->getMembers());
-  }
-}
-
 static bool declIsPrivate(const Decl *member) {
   auto *VD = dyn_cast<ValueDecl>(member);
   if (!VD) {
@@ -206,6 +182,17 @@
   return llvm::yaml::escape(name.userFacingName());
 }

+static SmallVector<std::pair<DeclBaseName, bool>, 16>
+sortedByName(const llvm::DenseMap<DeclBaseName, bool> map) {
+  SmallVector<std::pair<DeclBaseName, bool>, 16> pairs{map.begin(), map.end()};
+  llvm::array_pod_sort(pairs.begin(), pairs.end(),
+                       [](const std::pair<DeclBaseName, bool> *first,
+                          const std::pair<DeclBaseName, bool> *second) -> int {
+                         return first->first.compare(second->first);
+                       });
+  return pairs;
+}
+
 std::unique_ptr<llvm::raw_fd_ostream>ReferenceDependenciesEmitter::openFile(DiagnosticEngine &diags, StringRef outputPath) {
   // Before writing to the dependencies file path, preserve any previous file
   // that may have been there. No error handling -- this is just a nicety, it
@@ -271,6 +258,16 @@

 void ReferenceDependenciesEmitter::emitProvides() {
   ProvidesEmitter::emit(SF, out);
+}
+
+void ReferenceDependenciesEmitter::emitDepends() {
+  DependsEmitter::emit(SF, depTracker, out);
+}
+
+void ReferenceDependenciesEmitter::emitInterfaceHash() {
+  llvm::SmallString<32> interfaceHash;
+  SF->getInterfaceHash(interfaceHash);
+  out << "interface-hash: \"" << interfaceHash << "\"\n";
 }

 ProvidesEmitter::CollectedProvidedDeclarations ProvidesEmitter::emitTopLevelNames() {
@@ -379,6 +376,30 @@
   out << "- \"" << escape(NTD->getName()) << "\"\n";
   cpd.extendedNominals[NTD] |= true;
   cpd.findNominalsAndOperators(NTD->getMembers());
+}
+
+void ProvidesEmitter::CollectedProvidedDeclarations::findNominalsAndOperators(DeclRange members) {
+  for (const Decl *D : members) {
+    auto *VD = dyn_cast<ValueDecl>(D);
+    if (!VD)
+      continue;
+
+    if (VD->hasAccess() &&
+        VD->getFormalAccess() <= AccessLevel::FilePrivate) {
+      continue;
+    }
+
+    if (VD->getFullName().isOperator()) {
+      memberOperatorDecls.push_back(cast<FuncDecl>(VD));
+      continue;
+    }
+
+    auto nominal = dyn_cast<NominalTypeDecl>(D);
+    if (!nominal)
+      continue;
+    extendedNominals[nominal] |= true;
+    findNominalsAndOperators(nominal->getMembers());
+  }
 }

 void ProvidesEmitter::emitValueDecl(const ValueDecl *const VD) {
@@ -461,21 +482,6 @@
   }
 }

-static SmallVector<std::pair<DeclBaseName, bool>, 16>
-sortedByName(const llvm::DenseMap<DeclBaseName, bool> map) {
-  SmallVector<std::pair<DeclBaseName, bool>, 16> pairs{map.begin(), map.end()};
-  llvm::array_pod_sort(pairs.begin(), pairs.end(),
-                       [](const std::pair<DeclBaseName, bool> *first,
-                          const std::pair<DeclBaseName, bool> *second) -> int {
-                         return first->first.compare(second->first);
-                       });
-  return pairs;
-}
-
-void ReferenceDependenciesEmitter::emitDepends() {
-  DependsEmitter::emit(SF, depTracker, out);
-}
-
 void DependsEmitter::emit(const SourceFile *SF, const DependencyTracker &depTracker,
                           llvm::raw_ostream &out) {
   DependsEmitter(SF, depTracker, out).emit();
@@ -587,9 +593,3 @@
     out << "- \"" << llvm::yaml::escape(entry) << "\"\n";
   }
 }
-
-void ReferenceDependenciesEmitter::emitInterfaceHash() {
-  llvm::SmallString<32> interfaceHash;
-  SF->getInterfaceHash(interfaceHash);
-  out << "interface-hash: \"" << interfaceHash << "\"\n";
-}


Consider contour thickness when validating medial axis segments

--- xs/src/Geometry.cpp
+++ xs/src/Geometry.cpp
@@ -254,11 +254,19 @@
         Line segment1 = this->retrieve_segment(cell1);
         Line segment2 = this->retrieve_segment(cell2);
         if (segment1.a == segment2.b || segment1.b == segment2.a) return false;
-        if (fabs(segment1.atan2_() - segment2.atan2_()) < PI/3) {
-            //printf("segment1 atan2 = %f, segment2 atan2 = %f\n", segment1.atan2_(), segment2.atan2_());
-            //printf("  => SAME ATAN2\n");
-            return false;
-        }
+        if (fabs(segment1.atan2_() - segment2.atan2_()) < PI/3) return false;
+
+        // we can assume that distance between any of the vertices and any of the cell segments
+        // is about the same
+        Point p0( edge.vertex0()->x(), edge.vertex0()->y() );
+        double dist = p0.distance_to(segment1);
+
+        // if distance between this edge and the thin area boundary is greater
+        // than half the max width, then it's not a true medial axis segment;
+        // if it's too small then it's not suitable for extrusion since it would
+        // exceed the desired shape too much (this also traps some very narrow
+        // areas caused by collapsing/mitering that we should ignore)
+        if (dist > this->width/2 || dist < this->width/10) return false;
     }

     return true;


minor change

minor change

--- scm_gl_core/src/scm/gl_core/render_device/opengl/util/constants_helper.inl
+++ scm_gl_core/src/scm/gl_core/render_device/opengl/util/constants_helper.inl
@@ -194,7 +194,7 @@
         GL_VERTEX_SHADER,   // STAGE_VERTEX_SHADER      = 0x00,
         GL_GEOMETRY_SHADER, // STAGE_GEOMETRY_SHADER
         GL_FRAGMENT_SHADER,  // STAGE_FRAGMENT_SHADER
-        GL_COMPUTE_SHADER  // STAGE_FRAGMENT_SHADER
+        GL_COMPUTE_SHADER  // STAGE_COMPUTE_SHADER
 #if SCM_GL_CORE_OPENGL_CORE_VERSION >= SCM_GL_CORE_OPENGL_CORE_VERSION_400
         ,
         GL_TESS_EVALUATION_SHADER,  // STAGE_TESS_EVALUATION_SHADER,


stc config dialog uses spin ctrl for auto fold

git-svn-id: e171abefef93db0a74257c7d87d5b6400fe00c1f@1975 f22100f3-aa73-48fe-a4fb-fd497bb32605

--- trunk/extension/src/stc.cpp
+++ trunk/extension/src/stc.cpp
@@ -759,7 +759,7 @@
     echoices.insert(make_pair(wxSTC_EDGE_BACKGROUND, _("Background")));
     items.push_back(wxExConfigItem(_("Edge line"), echoices, true, _("Edge")));

-    items.push_back(wxExConfigItem(_("Auto fold"), CONFIG_INT, _("Folding")));
+    items.push_back(wxExConfigItem(_("Auto fold"), 0, INT_MAX, _("Folding")));
     items.push_back(wxExConfigItem()); // spacer
     items.push_back(wxExConfigItem(_("Indentation guide"), CONFIG_CHECKBOX, _("Folding")));


Add possibility to generate dictionaries for interactivity only

This is achieved only generating the code necessary for the
payload injection. This strategy will allow transparent migration to
pcms.

--- core/utils/src/rootcling.cxx
+++ core/utils/src/rootcling.cxx
@@ -2751,7 +2751,172 @@
    }
 }

-//_____________________________________________________________________________
+//______________________________________________________________________________
+int GenerateFullDict(std::ostream& dictStream,
+                     cling::Interpreter& interp,
+                     RScanner& scan,
+                     SelectionRules& selectionRules,
+                     bool onepcm,
+                     bool interpreteronly,
+                     bool isGenreflex)
+{
+
+   ROOT::TMetaUtils::TNormalizedCtxt normCtxt(interp.getLookupHelper());
+
+   RScanner::ClassColl_t::const_iterator iter = scan.fSelectedClasses.begin();
+   RScanner::ClassColl_t::const_iterator end = scan.fSelectedClasses.end();
+
+   bool needsCollectionProxy = false;
+
+   if (!onepcm) {
+
+      //
+      // We will loop over all the classes several times.
+      // In order we will call
+      //
+      //     WriteClassInit (code to create the TGenericClassInfo)
+      //     check for constructor and operator input
+      //     WriteClassFunctions (declared in ClassDef)
+      //     WriteClassCode (Streamer,ShowMembers,Auxiliary functions)
+      //
+
+      if (!interpreteronly){
+
+         // The order of addition to the list of constructor type
+         // is significant.  The list is sorted by with the highest
+         // priority first.
+         ROOT::TMetaUtils::AddConstructorType("TRootIOCtor", interp);
+         ROOT::TMetaUtils::AddConstructorType("", interp);
+
+         //
+         // Loop over all classes and create Streamer() & Showmembers() methods
+         //
+
+         // SELECTION LOOP
+         RScanner::NamespaceColl_t::const_iterator ns_iter = scan.fSelectedNamespaces.begin();
+         RScanner::NamespaceColl_t::const_iterator ns_end = scan.fSelectedNamespaces.end();
+         for( ; ns_iter != ns_end; ++ns_iter) {
+            WriteNamespaceInit(*ns_iter, interp);
+         }
+
+         for( ; iter != end; ++iter)
+         {
+            if (!iter->GetRecordDecl()->isCompleteDefinition()) {
+               ROOT::TMetaUtils::Error(0,"A dictionary has been requested for %s but there is no declaration!\n",ROOT::TMetaUtils::GetQualifiedName(* iter).c_str());
+               continue;
+            }
+            if (iter->RequestOnlyTClass()) {
+               // fprintf(stderr,"rootcling: Skipping class %s\n",R__GetQualifiedName(* iter->GetRecordDecl()).c_str());
+               // For now delay those for later.
+               continue;
+            }
+
+            // Very important: here we decide if we want to attach attributes to the decl.
+            if (clang::CXXRecordDecl* CXXRD =
+               llvm::dyn_cast<clang::CXXRecordDecl>(const_cast<clang::RecordDecl*>(iter->GetRecordDecl()))){
+               AnnotateDecl(*CXXRD,selectionRules,interp);
+               }
+
+               const clang::CXXRecordDecl* CRD = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
+
+            if (CRD) {
+               ROOT::TMetaUtils::Info(0,"Generating code for class %s\n", iter->GetNormalizedName() );
+               if (TMetaUtils::IsStdClass(*CRD) && 0 != TClassEdit::STLKind(CRD->getName().str().c_str() /* unqualified name without template arguement */) ) {
+                  // coverity[fun_call_w_exception] - that's just fine.
+                  RStl::Instance().GenerateTClassFor( iter->GetNormalizedName(), CRD, interp, normCtxt);
+               } else {
+                  ROOT::TMetaUtils::WriteClassInit(dictStream, *iter, CRD, interp, normCtxt, needsCollectionProxy);
+               }
+            }
+         }
+      }
+      //
+      // Write all TBuffer &operator>>(...), Class_Name(), Dictionary(), etc.
+      // first to allow template specialisation to occur before template
+      // instantiation (STK)
+      //
+      // SELECTION LOOP
+      iter = scan.fSelectedClasses.begin();
+      end = scan.fSelectedClasses.end();
+      for( ; iter != end; ++iter)
+      {
+         if (!iter->GetRecordDecl()->isCompleteDefinition()) {
+            continue;
+         }
+         if (iter->RequestOnlyTClass()) {
+            // For now delay those for later.
+            continue;
+         }
+         const clang::CXXRecordDecl* cxxdecl = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
+         if (cxxdecl && ROOT::TMetaUtils::ClassInfo__HasMethod(*iter,"Class_Name")) {
+            if (!interpreteronly)
+               WriteClassFunctions(cxxdecl);
+            else {
+               ROOT::TMetaUtils::Error("GenerateFullDict",
+                                       "Interactivity only dictionaries are not supported for classes with ClassDef\n");
+               return 1;
+            }
+         }
+      }
+
+      // LINKDEF SELECTION LOOP
+      // Loop to get the shadow class for the class marker 'RequestOnlyTClass' (but not the
+      // STL class which is done via RStl::Instance().WriteClassInit(0);
+      // and the ClassInit
+      if (!interpreteronly){
+         iter = scan.fSelectedClasses.begin();
+         end = scan.fSelectedClasses.end();
+         for( ; iter != end; ++iter)
+         {
+            if (!iter->GetRecordDecl()->isCompleteDefinition()) {
+               continue;
+            }
+            if (!iter->RequestOnlyTClass()) {
+               continue;
+            }
+
+            const clang::CXXRecordDecl* CRD = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
+
+            if (!ROOT::TMetaUtils::IsSTLContainer(*iter)) {
+               ROOT::TMetaUtils::WriteClassInit(dictStream, *iter, CRD, interp, normCtxt, needsCollectionProxy);
+            }
+         }
+         // Loop to write all the ClassCode
+         iter = scan.fSelectedClasses.begin();
+         end = scan.fSelectedClasses.end();
+         for( ; iter != end; ++iter)
+         {
+            ROOT::TMetaUtils::WriteClassCode(&CallWriteStreamer,
+                                             *iter,
+                                             interp,
+                                             normCtxt,
+                                             dictStream,
+                                             isGenreflex);
+         }
+      }
+   } else {
+      // We need annotations even in the PCH
+      iter = scan.fSelectedClasses.begin();
+      end = scan.fSelectedClasses.end();
+      for( ; iter != end; ++iter)
+      {
+         // Very important: here we decide if we want to attach attributes to the decl.
+         if (clang::CXXRecordDecl* CXXRD =
+            llvm::dyn_cast<clang::CXXRecordDecl>(const_cast<clang::RecordDecl*>(iter->GetRecordDecl()))){
+            AnnotateDecl(*CXXRD,selectionRules,interp);
+            }
+      }
+   }
+
+   if (!interpreteronly){
+      // coverity[fun_call_w_exception] - that's just fine.
+      ROOT::RStl::Instance().WriteClassInit(dictStream, interp, normCtxt, needsCollectionProxy);
+      }
+
+   return 0;
+}
+
+//______________________________________________________________________________

 // cross-compiling for iOS and iOS simulator (assumes host is Intel Mac OS X)
 #if defined(R__IOSSIM) || defined(R__IOS)
@@ -2810,6 +2975,25 @@

    }

+   //______________________________________________
+   int clean(){
+      int retval=0;
+      // rename the temp files into the normal ones
+      for (unsigned int i = 0; i < m_size; ++i){
+         const char* tmpName=m_tempNames[i].c_str();
+         // Check if the file exists
+         std::ifstream ifile(tmpName);
+         if (!ifile)
+            ROOT::TMetaUtils::Error(0, "Cannot find %s!\n", tmpName);
+
+         if ( 0 != std::remove( tmpName )){
+            ROOT::TMetaUtils::Error(0, "Removing %s!\n", tmpName);
+            retval++;
+         }
+      }
+      return retval;
+   }
+
    //______________________________________________
    int commit(){
       int retval=0;
@@ -3058,6 +3242,7 @@
    std::string capaFileName;

    bool inlineInputHeader = false;
+   bool interpreteronly = false;

    // Temporary to decide if the new format is to be used
    bool useNewRmfFormat = false;
@@ -3093,6 +3278,13 @@
             ic+=1;
             continue;
          }
+
+         if (strcmp("-interpreteronly", argv[ic]) == 0) {
+            // name for the rootmap file
+            interpreteronly = true;
+            ic+=1;
+            continue;
+         }

          if (strcmp("-s", argv[ic]) == 0 && (ic+1) < argc) {
             // precompiled modules
@@ -3559,143 +3751,18 @@
       exit(1);
    }

-   bool needsCollectionProxy = false;
-
-   if (!onepcm) {
-
-      //
-      // We will loop over all the classes several times.
-      // In order we will call
-      //
-      //     WriteClassInit (code to create the TGenericClassInfo)
-      //     check for constructor and operator input
-      //     WriteClassFunctions (declared in ClassDef)
-      //     WriteClassCode (Streamer,ShowMembers,Auxiliary functions)
-      //
-
-      // The order of addition to the list of constructor type
-      // is significant.  The list is sorted by with the highest
-      // priority first.
-      ROOT::TMetaUtils::AddConstructorType("TRootIOCtor", interp);
-      ROOT::TMetaUtils::AddConstructorType("", interp);
-
-      //
-      // Loop over all classes and create Streamer() & Showmembers() methods
-      //
-
-      // SELECTION LOOP
-      RScanner::NamespaceColl_t::const_iterator ns_iter = scan.fSelectedNamespaces.begin();
-      RScanner::NamespaceColl_t::const_iterator ns_end = scan.fSelectedNamespaces.end();
-      for( ; ns_iter != ns_end; ++ns_iter) {
-         WriteNamespaceInit(*ns_iter, interp);
-      }
-
-      iter = scan.fSelectedClasses.begin();
-      end = scan.fSelectedClasses.end();
-      for( ; iter != end; ++iter)
-      {
-         if (!iter->GetRecordDecl()->isCompleteDefinition()) {
-            ROOT::TMetaUtils::Error(0,"A dictionary has been requested for %s but there is no declaration!\n",ROOT::TMetaUtils::GetQualifiedName(* iter).c_str());
-            continue;
-         }
-         if (iter->RequestOnlyTClass()) {
-            // fprintf(stderr,"rootcling: Skipping class %s\n",R__GetQualifiedName(* iter->GetRecordDecl()).c_str());
-            // For now delay those for later.
-            continue;
-         }
-
-         // Very important: here we decide if we want to attach attributes to the decl.
-         if (clang::CXXRecordDecl* CXXRD =
-              llvm::dyn_cast<clang::CXXRecordDecl>(const_cast<clang::RecordDecl*>(iter->GetRecordDecl()))){
-            AnnotateDecl(*CXXRD,selectionRules,interp);
-         }
-
-         const clang::CXXRecordDecl* CRD = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
-
-         if (CRD) {
-            ROOT::TMetaUtils::Info(0,"Generating code for class %s\n", iter->GetNormalizedName() );
-            if (TMetaUtils::IsStdClass(*CRD) && 0 != TClassEdit::STLKind(CRD->getName().str().c_str() /* unqualified name without template arguement */) ) {
-               // coverity[fun_call_w_exception] - that's just fine.
-               RStl::Instance().GenerateTClassFor( iter->GetNormalizedName(), CRD, interp, normCtxt);
-            } else {
-               ROOT::TMetaUtils::WriteClassInit(*dictSrcOut, *iter, CRD, interp, normCtxt, needsCollectionProxy);
-            }
-         }
-      }
-
-      //
-      // Write all TBuffer &operator>>(...), Class_Name(), Dictionary(), etc.
-      // first to allow template specialisation to occur before template
-      // instantiation (STK)
-      //
-      // SELECTION LOOP
-      iter = scan.fSelectedClasses.begin();
-      end = scan.fSelectedClasses.end();
-      for( ; iter != end; ++iter)
-      {
-         if (!iter->GetRecordDecl()->isCompleteDefinition()) {
-            continue;
-         }
-         if (iter->RequestOnlyTClass()) {
-            // For now delay those for later.
-            continue;
-         }
-         const clang::CXXRecordDecl* cxxdecl = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
-         if (cxxdecl && ROOT::TMetaUtils::ClassInfo__HasMethod(*iter,"Class_Name")) {
-            WriteClassFunctions(cxxdecl);
-         }
-      }
-
-      // LINKDEF SELECTION LOOP
-      // Loop to get the shadow class for the class marker 'RequestOnlyTClass' (but not the
-      // STL class which is done via RStl::Instance().WriteClassInit(0);
-      // and the ClassInit
-      iter = scan.fSelectedClasses.begin();
-      end = scan.fSelectedClasses.end();
-      for( ; iter != end; ++iter)
-      {
-         if (!iter->GetRecordDecl()->isCompleteDefinition()) {
-            continue;
-         }
-         if (!iter->RequestOnlyTClass()) {
-            continue;
-         }
-
-         const clang::CXXRecordDecl* CRD = llvm::dyn_cast<clang::CXXRecordDecl>(iter->GetRecordDecl());
-
-         if (!ROOT::TMetaUtils::IsSTLContainer(*iter)) {
-            ROOT::TMetaUtils::WriteClassInit(*dictSrcOut, *iter, CRD, interp, normCtxt, needsCollectionProxy);
-         }
-      }
-      // Loop to write all the ClassCode
-      iter = scan.fSelectedClasses.begin();
-      end = scan.fSelectedClasses.end();
-      for( ; iter != end; ++iter)
-      {
-         ROOT::TMetaUtils::WriteClassCode(&CallWriteStreamer,
-                                          *iter,
-                                          interp,
-                                          normCtxt,
-                                          *dictSrcOut,
-                                          isGenreflex);
-      }
-   } else {
-      // We need annotations even in the PCH
-      iter = scan.fSelectedClasses.begin();
-      end = scan.fSelectedClasses.end();
-      for( ; iter != end; ++iter)
-      {
-         // Very important: here we decide if we want to attach attributes to the decl.
-         if (clang::CXXRecordDecl* CXXRD =
-              llvm::dyn_cast<clang::CXXRecordDecl>(const_cast<clang::RecordDecl*>(iter->GetRecordDecl()))){
-            AnnotateDecl(*CXXRD,selectionRules,interp);
-         }
-      }
-   }
-
-   // coverity[fun_call_w_exception] - that's just fine.
-   ROOT::RStl::Instance().WriteClassInit(*dictSrcOut, interp, normCtxt, needsCollectionProxy);
-
+   int retCode = GenerateFullDict(*dictSrcOut,
+                                  interp,
+                                  scan,
+                                  selectionRules,
+                                  onepcm,
+                                  interpreteronly,
+                                  isGenreflex);
+   if (retCode!=0){
+      return retCode;
+   }
+
+
    // Now we have done all our looping and thus all the possible
    // annotation, let's write the pcms.
    GenerateModule(modGen, CI, currentDirectory,inlineInputHeader);
@@ -3953,6 +4020,7 @@
                     bool newRmfFormat,
                     const std::string& rootmapLibName,
                     const std::string& capaFileName,
+                    bool interpreteronly,
                     bool isDeep,
                     const std::vector<std::string>& headersNames,
                     const std::string& ofilename){
@@ -4020,6 +4088,10 @@
       argvVector.push_back(string2charptr(newCapaFileName));
    }

+   // Interpreter only dictionaries
+   if (interpreteronly)
+      argvVector.push_back(string2charptr("-interpreteronly"));
+
    if (!targetLibName.empty()){
       argvVector.push_back(string2charptr("-s"));
       argvVector.push_back(string2charptr(targetLibName));
@@ -4075,6 +4147,7 @@
                         bool newRmfFormat,
                         const std::string& rootmapLibName,
                         const std::string& capaFileName,
+                        bool interpreteronly,
                         bool isDeep,
                         const std::vector<std::string>& headersNames,
                         const std::string& outputDirName_const="")
@@ -4105,6 +4178,7 @@
                                        newRmfFormat,
                                        rootmapLibName,
                                        capaFileName,
+                                       interpreteronly,
                                        isDeep,
                                        namesSingleton,
                                        outputDirName+ofilesNames[i]);
@@ -4208,8 +4282,8 @@
                        DEBUG,
                        QUIET,
                        HELP,
-                       // Warnings
                        CAPABILITIESFILENAME,
+                       INTERPRETERONLY,
                        NOMEMBERTYPEDEFS,
                        NOTEMPLATETYPEDEFS,
                        // Don't show up in the help
@@ -4318,6 +4392,12 @@
         option::FullArg::Required,
         "-c, --capabilities\t Name of the output capabilities file"},

+      {INTERPRETERONLY,
+        NOTYPE,
+        "" , "interpreteronly",
+        option::Arg::None,
+        "--interpreteronly  \tGenerate minimal dictionary required for interactivity (no I/O)\n"},
+
       {PCMFILENAME,
         STRING ,
         "m" , "" ,
@@ -4477,6 +4557,10 @@
    if (options[NEWRMFFORMAT])
       newRmfFormat=true;

+   bool interpreteronly = false;
+   if (options[INTERPRETERONLY])
+      interpreteronly=true;
+
    // Add the .so extension to the rootmap lib if not there
    if (!rootmapLibName.empty() && !endsWith(rootmapLibName,gLibraryExtension)){
       rootmapLibName+=gLibraryExtension;
@@ -4529,6 +4613,7 @@
                                     newRmfFormat,
                                     rootmapLibName,
                                     capaFileName,
+                                    interpreteronly,
                                     isDeep,
                                     headersNames,
                                     ofileName);
@@ -4545,6 +4630,7 @@
                                         newRmfFormat,
                                         rootmapLibName,
                                         capaFileName,
+                                        interpreteronly,
                                         isDeep,
                                         headersNames,
                                         ofileName);


INTEGRATION: CWS writercorehandoff (1.6.4); FILE MERGED 2006/07/31 06:20:58 fme 1.6.4.1: #i50348# Resync

--- sw/inc/fmtcol.hxx
+++ sw/inc/fmtcol.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: fmtcol.hxx,v $
  *
- *  $Revision: 1.6 $
- *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:48:41 $
+ *  $Revision: 1.7 $
+ *
+ *  last change: $Author: hr $ $Date: 2006-08-14 15:23:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -230,7 +230,7 @@

 typedef SwCollCondition* SwCollConditionPtr;
-SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 );
+SV_DECL_PTRARR_DEL( SwFmtCollConditions, SwCollConditionPtr, 0, 5 )

 class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl
 {


Factor out file openning & error handling.

--- lib/FrontendTool/ReferenceDependencies.cpp
+++ lib/FrontendTool/ReferenceDependencies.cpp
@@ -133,33 +133,39 @@
                         llvm::raw_ostream &out);
 static void emitInterfaceHash(SourceFile *SF, llvm::raw_ostream &out);

+static std::unique_ptr<llvm::raw_fd_ostream>openFile(DiagnosticEngine &diags, StringRef outputPath) {
+  // Before writing to the dependencies file path, preserve any previous file
+  // that may have been there. No error handling -- this is just a nicety, it
+  // doesn't matter if it fails.
+  llvm::sys::fs::rename(outputPath, outputPath + "~");
+
+  std::error_code EC;
+  auto out = llvm::make_unique<llvm::raw_fd_ostream>(outputPath, EC, llvm::sys::fs::F_None);
+
+  if (out->has_error() || EC) {
+    diags.diagnose(SourceLoc(), diag::error_opening_output, outputPath,
+                   EC.message());
+    out->clear_error();
+    return nullptr;
+  }
+  return out;
+}
+
 bool swift::emitReferenceDependencies(DiagnosticEngine &diags,
                                       SourceFile *const SF,
                                       const DependencyTracker &depTracker,
                                       StringRef outputPath) {
   assert(SF && "Cannot emit reference dependencies without a SourceFile");
+  std::unique_ptr<llvm::raw_ostream> out = openFile(diags, outputPath);
+  if (!out.get())
+    return true;

-  // Before writing to the dependencies file path, preserve any previous file
-  // that may have been there. No error handling -- this is just a nicety, it
-  // doesn't matter if it fails.
-  llvm::sys::fs::rename(outputPath, outputPath + "~");
-
-  std::error_code EC;
-  llvm::raw_fd_ostream out(outputPath, EC, llvm::sys::fs::F_None);
-
-  if (out.has_error() || EC) {
-    diags.diagnose(SourceLoc(), diag::error_opening_output, outputPath,
-                   EC.message());
-    out.clear_error();
-    return true;
-  }
-
-  out << "### Swift dependencies file v0 ###\n";
-
-  emitProvides(SF, out);
-  emitDepends(SF, depTracker, out);
-  emitInterfaceHash(SF, out);
-
+  *out << "### Swift dependencies file v0 ###\n";
+
+  emitProvides(SF, *out);
+  emitDepends(SF, depTracker, *out);
+  emitInterfaceHash(SF, *out);
+
   return false;
 }


Add support to output Colour elements to webm_info.

BUG=https://bugs.chromium.org/p/webm/issues/detail?id=1178

Change-Id: I50825e320a0c93dd565bf89c9478feb434277ddb

--- webm_info.cc
+++ webm_info.cc
@@ -33,7 +33,7 @@
 using libwebm::kNanosecondsPerSecond;
 using libwebm::kNanosecondsPerSecondi;

-const char VERSION_STRING[] = "1.0.3.0";
+const char VERSION_STRING[] = "1.0.3.1";

 struct Options {
   Options();
@@ -476,6 +476,116 @@
                 indent->indent_str().c_str(), display_height);
         fprintf(o, "%sDisplayUnit   : %" PRId64 "\n",
                 indent->indent_str().c_str(), display_unit);
+      }
+
+      const mkvparser::Colour* const colour = video_track->GetColour();
+      if (colour) {
+        // TODO(fgalligan): Add support for Colour's address and size.
+        fprintf(o, "%sColour:\n", indent->indent_str().c_str());
+        indent->Adjust(libwebm::kIncreaseIndent);
+
+        const int64_t matrix_coefficients = colour->matrix_coefficients;
+        const int64_t bits_per_channel = colour->bits_per_channel;
+        const int64_t chroma_subsampling_horz = colour->chroma_subsampling_horz;
+        const int64_t chroma_subsampling_vert = colour->chroma_subsampling_vert;
+        const int64_t cb_subsampling_horz = colour->cb_subsampling_horz;
+        const int64_t cb_subsampling_vert = colour->cb_subsampling_vert;
+        const int64_t chroma_siting_horz = colour->chroma_siting_horz;
+        const int64_t chroma_siting_vert = colour->chroma_siting_vert;
+        const int64_t range = colour->range;
+        const int64_t transfer_characteristics =
+            colour->transfer_characteristics;
+        const int64_t primaries = colour->primaries;
+        const int64_t max_cll = colour->max_cll;
+        const int64_t max_fall = colour->max_fall;
+        if (matrix_coefficients != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sMatrixCoefficients      : %" PRId64 "\n",
+                  indent->indent_str().c_str(), matrix_coefficients);
+        if (bits_per_channel != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sBitsPerChannel          : %" PRId64 "\n",
+                  indent->indent_str().c_str(), bits_per_channel);
+        if (chroma_subsampling_horz != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sChromaSubsamplingHorz   : %" PRId64 "\n",
+                  indent->indent_str().c_str(), chroma_subsampling_horz);
+        if (chroma_subsampling_vert != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sChromaSubsamplingVert   : %" PRId64 "\n",
+                  indent->indent_str().c_str(), chroma_subsampling_vert);
+        if (cb_subsampling_horz != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sCbSubsamplingHorz       : %" PRId64 "\n",
+                  indent->indent_str().c_str(), cb_subsampling_horz);
+        if (cb_subsampling_vert != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sCbSubsamplingVert       : %" PRId64 "\n",
+                  indent->indent_str().c_str(), cb_subsampling_vert);
+        if (chroma_siting_horz != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sChromaSitingHorz        : %" PRId64 "\n",
+                  indent->indent_str().c_str(), chroma_siting_horz);
+        if (chroma_siting_vert != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sChromaSitingVert        : %" PRId64 "\n",
+                  indent->indent_str().c_str(), chroma_siting_vert);
+        if (range != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sRange                   : %" PRId64 "\n",
+                  indent->indent_str().c_str(), range);
+        if (transfer_characteristics != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sTransferCharacteristics : %" PRId64 "\n",
+                  indent->indent_str().c_str(), transfer_characteristics);
+        if (primaries != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sPrimaries               : %" PRId64 "\n",
+                  indent->indent_str().c_str(), primaries);
+        if (max_cll != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sMaxCLL                  : %" PRId64 "\n",
+                  indent->indent_str().c_str(), max_cll);
+        if (max_fall != mkvparser::Colour::kValueNotPresent)
+          fprintf(o, "%sMaxFALL                 : %" PRId64 "\n",
+                  indent->indent_str().c_str(), max_fall);
+
+        const mkvparser::MasteringMetadata* const metadata =
+            colour->mastering_metadata;
+        if (metadata) {
+          // TODO(fgalligan): Add support for MasteringMetadata's address and
+          // size.
+          fprintf(o, "%sMasteringMetadata:\n", indent->indent_str().c_str());
+          indent->Adjust(libwebm::kIncreaseIndent);
+
+          const mkvparser::PrimaryChromaticity* const red = metadata->r;
+          const mkvparser::PrimaryChromaticity* const green = metadata->g;
+          const mkvparser::PrimaryChromaticity* const blue = metadata->b;
+          const mkvparser::PrimaryChromaticity* const white =
+              metadata->white_point;
+          const float max = metadata->luminance_max;
+          const float min = metadata->luminance_min;
+          if (red) {
+            fprintf(o, "%sPrimaryRChromaticityX   : %g\n",
+                    indent->indent_str().c_str(), red->x);
+            fprintf(o, "%sPrimaryRChromaticityY   : %g\n",
+                    indent->indent_str().c_str(), red->y);
+          }
+          if (green) {
+            fprintf(o, "%sPrimaryGChromaticityX   : %g\n",
+                    indent->indent_str().c_str(), green->x);
+            fprintf(o, "%sPrimaryGChromaticityY   : %g\n",
+                    indent->indent_str().c_str(), green->y);
+          }
+          if (blue) {
+            fprintf(o, "%sPrimaryBChromaticityX   : %g\n",
+                    indent->indent_str().c_str(), blue->x);
+            fprintf(o, "%sPrimaryBChromaticityY   : %g\n",
+                    indent->indent_str().c_str(), blue->y);
+          }
+          if (white) {
+            fprintf(o, "%sWhitePointChromaticityX : %g\n",
+                    indent->indent_str().c_str(), white->x);
+            fprintf(o, "%sWhitePointChromaticityY : %g\n",
+                    indent->indent_str().c_str(), white->y);
+          }
+          if (max != mkvparser::MasteringMetadata::kValueNotPresent)
+            fprintf(o, "%sLuminanceMax            : %g\n",
+                    indent->indent_str().c_str(), max);
+          if (min != mkvparser::MasteringMetadata::kValueNotPresent)
+            fprintf(o, "%sLuminanceMin            : %g\n",
+                    indent->indent_str().c_str(), min);
+          indent->Adjust(libwebm::kDecreaseIndent);
+        }
+        indent->Adjust(libwebm::kDecreaseIndent);
       }
     } else if (track_type == mkvparser::Track::kAudio) {
       const mkvparser::AudioTrack* const audio_track =


removed StyleResetDefault

removed StyleResetDefault

git-svn-id: e171abefef93db0a74257c7d87d5b6400fe00c1f@2735 f22100f3-aa73-48fe-a4fb-fd497bb32605

--- trunk/extension/src/stc.cpp
+++ trunk/extension/src/stc.cpp
@@ -2155,8 +2155,6 @@
 {
   ClearDocumentStyle();

-  StyleResetDefault();
-
   // Reset all old properties.
   // Should be before GetFileName().SetLexer().
   SetProperties(true); //reset


commented out time

commented out time

git-svn-id: 5398946ba177a3e438c2dae55e2cdfc2fb96c905@4569 a9d63959-f2ad-4865-b262-bf0e56cfafb6

--- features/include/pcl/features/impl/feature.hpp
+++ features/include/pcl/features/impl/feature.hpp
@@ -244,9 +244,9 @@
   }

   // Copy the properties
-#ifndef USE_ROS
-  output.properties.acquisition_time = input_->header.stamp;
-#endif
+//#ifndef USE_ROS
+//  output.properties.acquisition_time = input_->header.stamp;
+//#endif
   output.properties.sensor_origin = input_->sensor_origin_;
   output.properties.sensor_orientation = input_->sensor_orientation_;


--- copasi/UI/copasiui3window.cpp
+++ copasi/UI/copasiui3window.cpp
@@ -215,7 +215,7 @@
 #endif //COPASI_SEDML support

 #ifdef COPASI_Provenance
-  , mProvenanceParentOfCurrentModel(QString(""))
+  //, mProvenanceParentOfCurrentModel(QString(""))
   , mProvenanceOrigionFileType(QString("Created"))
   , mProvenanceOrigionTime(QDateTime::currentDateTimeUtc().toString())
   , mProvenanceOfOrigionOfFile(QString(""))
@@ -746,17 +746,16 @@

       connect(mpDataModelGUI, SIGNAL(finished(bool)), this, SLOT(slotFileSaveFinished(bool)));
       mpDataModelGUI->saveModel(TO_UTF8(tmp), true);
-
-#ifdef COPASI_Provenance
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
-      ProvenanceXMLWriter->updateCurrentSessionProvenance();
-      mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
-      ProvenanceXMLWriter->updateOrigionOfProvenance(mProvenanceOfOrigionOfFile);
-#endif
-
 #ifdef COPASI_Versioning
       mpVersionHierarchy->setPathFile(FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()));
       //mLastSavedParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
+#endif
+#ifdef COPASI_Provenance
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mpVersionHierarchy->getVersionsPathToCurrentModel());
+      ProvenanceXMLWriter->updateCurrentSessionProvenance();
+      //mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
+      ProvenanceXMLWriter->updateOrigionOfProvenance(mProvenanceOfOrigionOfFile);
 #endif
     }
 }
@@ -859,7 +858,7 @@

 #ifdef COPASI_Provenance
   // Update Main Body Provenance
-  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
   ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -907,7 +906,7 @@
 #endif

 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = QString("");
+  //mProvenanceParentOfCurrentModel = QString("");
   mProvenanceOrigionFileType = QString("Created");
   mProvenanceOfOrigionOfFile = QString("");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
@@ -1010,7 +1009,8 @@

 #ifdef COPASI_Provenance
 // Update Main Body Provenace
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
       ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -1068,7 +1068,7 @@
 #endif

 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
+  //mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
   mProvenanceOrigionFileType = QString("Opened");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
 #endif
@@ -1346,9 +1346,10 @@
       mpDataModelGUI->saveModel(FileName, true);
 #ifdef COPASI_Provenance
       //update Current Session Provenance and Origion of Provenance
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mpVersionHierarchy->getVersionsPathToCurrentModel());
       ProvenanceXMLWriter->updateCurrentSessionProvenance();
-      mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
+      //mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
       ProvenanceXMLWriter->updateOrigionOfProvenance(mProvenanceOfOrigionOfFile);
 #endif

@@ -1405,7 +1406,8 @@
     }

 #ifdef COPASI_Provenance
-  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+  //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
   ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -1556,7 +1558,8 @@

 #ifdef COPASI_Provenance
       //Update Main Body Provenance
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
       ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -1590,7 +1593,7 @@
 #endif

 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = QString("");
+  //mProvenanceParentOfCurrentModel = QString("");
   mProvenanceOrigionFileType = QString("Imported");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
 #endif
@@ -1694,7 +1697,8 @@

 #ifdef COPASI_Provenance
       // Update Main Body Provenance
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
       ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -1730,7 +1734,7 @@
   //mLastSavedParentOfCurrentModel = QString("");
 #endif
 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = QString("");
+  //mProvenanceParentOfCurrentModel = QString("");
   mProvenanceOrigionFileType = QString("Imported");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
 #endif
@@ -3110,7 +3114,7 @@
 #endif

 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = QString("");
+  //mProvenanceParentOfCurrentModel = QString("");
   mProvenanceOrigionFileType = QString("Imported");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
 #endif
@@ -3169,7 +3173,7 @@
 #endif

 #ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = QString("");
+  //mProvenanceParentOfCurrentModel = QString("");
   mProvenanceOrigionFileType = QString("Imported");
   mProvenanceOrigionTime = QDateTime::currentDateTime().toString();
 #endif
@@ -3269,7 +3273,8 @@

 #ifdef COPASI_Provenance
       //Update Main Body Provenance
-      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+      CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime);
       ProvenanceXMLWriter->updateMainBodyProvenace();
 #endif

@@ -3515,9 +3520,10 @@
                 {
                   mpDataModelGUI->saveModel(dataFile.toStdString(), true);
 #ifdef COPASI_Provenance
-//   Update Provenace and store it as provenance of the Version  - Clear Undo Stack
-                  mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
-                  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
+//   Update Provenace and store it - Clear Undo Stack
+                  //mProvenanceParentOfCurrentModel = mpVersionHierarchy->getParentOfCurrentModel();
+                  //CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel(), mpVersionHierarchy->getVersionsPathToCurrentModel());
+                  CProvenanceXMLWriter* ProvenanceXMLWriter = new CProvenanceXMLWriter(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceOrigionFileType, mProvenanceOrigionTime, mpVersionHierarchy->getVersionsPathToCurrentModel());
                   ProvenanceXMLWriter->updateVersionProvenanceXMLFile(CreateVersionDialog->getVersion());
                   mpUndoStack->clear();
 #endif
@@ -3546,14 +3552,16 @@
 {
   CBrowseModelVersionDialog* ModelVersionDialog = new  CBrowseModelVersionDialog(this, mpVersionHierarchy, mpDataModelGUI, mpUndoStack
 #ifdef COPASI_Provenance
-      , FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceParentOfCurrentModel
+//      , FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mProvenanceParentOfCurrentModel
+      , FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory())
 #endif
                                                                                );
   ModelVersionDialog->setWindowTitle("Model Versions");
   ModelVersionDialog->exec();
-#ifdef COPASI_Provenance
-  mProvenanceParentOfCurrentModel = ModelVersionDialog->getProvenanceParentOfCurrentModel();
-#endif
+// The end of session maintance will be done by COMBINE Archive
+//#ifdef COPASI_Provenance
+  //mProvenanceParentOfCurrentModel = ModelVersionDialog->getProvenanceParentOfCurrentModel();
+//#endif
   //mLastSavedParentOfCurrentModel = ModelVersionDialog->getLastSavedParentOfCurrentModel();
   ModelVersionDialog->~CBrowseModelVersionDialog();
 }
@@ -3562,14 +3570,15 @@
 #ifdef COPASI_Provenance
 void CopasiUI3Window::slotProvenance()
 {
-  CProvenanceDialog* ProvenanceDialog = new CProvenanceDialog(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mpVersionHierarchy->getVersionsPathToCurrentModel(), mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+  //CProvenanceDialog* ProvenanceDialog = new CProvenanceDialog(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mpVersionHierarchy->getVersionsPathToCurrentModel(), mProvenanceParentOfCurrentModel, mpVersionHierarchy->getParentOfCurrentModel());
+  CProvenanceDialog* ProvenanceDialog = new CProvenanceDialog(this, mpUndoStack, FROM_UTF8(CCopasiRootContainer::getConfiguration()->getWorkingDirectory()), mpVersionHierarchy->getVersionsPathToCurrentModel());
   ProvenanceDialog->setWindowTitle("Provenance");
   ProvenanceDialog->exec();
 }

-QString CopasiUI3Window::getProvenanceParentOfCurrentVersion()
-{
-  return (mProvenanceParentOfCurrentModel);
-}
-
-#endif
+//QString CopasiUI3Window::getProvenanceParentOfCurrentVersion()
+//{
+//  return (mProvenanceParentOfCurrentModel);
+//}
+
+#endif


Temporarily #include TObject for genreflex.

Until we have the new class state, determining the TClass property "inherits from TClass" requires TObject.h.
As all STL types have their std stripped, and as EmitStreamerInfo() needs to find the classes, genreflex also needs using std.

--- core/utils/src/rootcling.cxx
+++ core/utils/src/rootcling.cxx
@@ -3801,7 +3801,26 @@
 #else
    const bool useROOTINCDIR = false;
 #endif
-   if (!isGenreflex) {
+   if (isGenreflex) {
+      // genrefex needs TObject because the TClass properties test for "inherits
+      // from TObject" using TObject::Class() which in turn needs the dictionary
+      // of TObject initialized which in turn needs th declaration of TObject.
+      if ((!useROOTINCDIR
+           && interp.declare("using namespace std;\n"
+                             "#include \"TObject.h\"") != cling::Interpreter::kSuccess)
+#ifdef ROOTINCDIR
+          || (useROOTINCDIR
+              && interp.declare("using namespace std;\n"
+                                "#include \"" ROOTINCDIR "/TObject.h\"") != cling::Interpreter::kSuccess
+              )
+#endif
+          ) {
+         // There was an error.
+         ROOT::TMetaUtils::Error(0,"Error loading the default header files.\n");
+         return 1;
+      }
+   } else {
+      // rootcling case
       if (interp.declare("namespace std {} using namespace std;") != cling::Interpreter::kSuccess
           // CINT uses to define a few header implicitly, we need to do it explicitly.
           || interp.declare("#include <assert.h>\n"


INTEGRATION: CWS swwarnings (1.10.566); FILE MERGED 2007/04/03 12:57:06 tl 1.10.566.2: #i69287# warning-free code 2007/02/27 13:06:34 tl 1.10.566.1: #i69287# warning-free code

--- sw/inc/grfatr.hxx
+++ sw/inc/grfatr.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: grfatr.hxx,v $
  *
- *  $Revision: 1.10 $
- *
- *  last change: $Author: obo $ $Date: 2006-01-19 18:15:59 $
+ *  $Revision: 1.11 $
+ *
+ *  last change: $Author: hr $ $Date: 2007-09-27 08:04:23 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -66,14 +66,14 @@
  *  class SwMirrorGrf
  ******************************************************************************/

-enum GRFMIRROR
-{
-RES_GRFMIRROR_BEGIN,
-    RES_DONT_MIRROR_GRF = RES_GRFMIRROR_BEGIN,
-    RES_MIRROR_GRF_VERT,
-    RES_MIRROR_GRF_HOR,
-    RES_MIRROR_GRF_BOTH,
-RES_GRFMIRROR_END
+enum MirrorGraph
+{
+RES_MIRROR_GRAPH_BEGIN,
+    RES_MIRROR_GRAPH_DONT = RES_MIRROR_GRAPH_BEGIN,
+    RES_MIRROR_GRAPH_VERT,
+    RES_MIRROR_GRAPH_HOR,
+    RES_MIRROR_GRAPH_BOTH,
+RES_MIRROR_GRAPH_END
 };

 class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem
@@ -81,8 +81,8 @@
     BOOL bGrfToggle; // auf geraden Seiten Grafiken spiegeln

 public:
-    SwMirrorGrf( USHORT nMiro = RES_DONT_MIRROR_GRF )
-        : SfxEnumItem( RES_GRFATR_MIRRORGRF, nMiro ), bGrfToggle( sal_False )
+    SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT )
+        : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< USHORT >(eMiro) ), bGrfToggle( sal_False )
     {}
     SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
         : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()),
@@ -197,8 +197,8 @@
 class SwChannelGrf : public SfxInt16Item
 {
 protected:
-    SwChannelGrf( sal_Int16 nVal, USHORT nWhich )
-        : SfxInt16Item( nWhich, nVal )
+    SwChannelGrf( sal_Int16 nVal, USHORT nWhichL )
+        : SfxInt16Item( nWhichL, nVal )
     {}

 public:


small fix

small fix

--- cmpmodel.cc
+++ cmpmodel.cc
@@ -80,10 +80,9 @@
       HmmState &second_model_state = second_model.state(i);
       Mixture *second_model_mixture = second_model.get_emission_pdf(second_model_state.emission_pdf);

-      if (config["kl"].specified) {
-        kl = first_model_mixture->kullback_leibler(*second_model_mixture, 10000);
+      kl = first_model_mixture->kullback_leibler(*second_model_mixture, 10000);
+      if (config["kl"].specified)
         std::cout << "kl-divergence, state " << i << ": "  << kl << std::endl;
-      }
       if (config["skl"].specified) {
         kl += second_model_mixture->kullback_leibler(*first_model_mixture, 10000);
         std::cout << "symmetric kl-divergence, state " << i << ": "  << kl << std::endl;


Use the correct routine.

Use the correct routine.

--- lib/Interpreter/ASTNullDerefProtection.cpp
+++ lib/Interpreter/ASTNullDerefProtection.cpp
@@ -170,8 +170,7 @@
               bool Result = false;
               if (Op->EvaluateAsBooleanCondition(Result, *Context)) {
                 if(!Result) {
-                  Expr* Throw = InsertThrow(&SL, Op);
-                  Stmts.push_back(Throw);
+                  Stmts.push_back(SynthesizeCheck(SL, Op));
                 }
               }
               else {
@@ -185,8 +184,7 @@
               bool Result = false;
               if (Op->EvaluateAsBooleanCondition(Result, *Context)) {
                 if(!Result) {
-                  Expr* Throw = InsertThrow(&SL, Op);
-                  Stmts.push_back(Throw);
+                  Stmts.push_back(SynthesizeCheck(SL, Op));
                 }
               }
               else {


appearance: Fix typo from @aca544479

appearance: Fix typo from @aca544479

--- lxqt-config-appearance/iconthemeconfig.cpp
+++ lxqt-config-appearance/iconthemeconfig.cpp
@@ -129,7 +129,7 @@
         ++it;
     }

-    iconFollowColorSchemeCB->setChecked(m_settings->value("icon_follow_color_theme", true).toBool());
+    iconFollowColorSchemeCB->setChecked(m_settings->value("icon_follow_color_scheme", true).toBool());

     update();
 }


vcs auto fixes

vcs auto fixes

git-svn-id: e171abefef93db0a74257c7d87d5b6400fe00c1f@3941 f22100f3-aa73-48fe-a4fb-fd497bb32605

--- trunk/extension/src/vcs.cpp
+++ trunk/extension/src/vcs.cpp
@@ -324,7 +324,21 @@

 long wxExVCS::GetVCS() const
 {
-  return wxConfigBase::Get()->ReadLong("VCS", VCS_SVN);
+  long vcs = wxConfigBase::Get()->ReadLong("VCS", VCS_SVN);
+
+  if (vcs == VCS_AUTO)
+  {
+    if (CheckVCS(m_FileName))
+    {
+      vcs = VCS_SVN;
+    }
+    else if (CheckGIT(m_FileName))
+    {
+      vcs = VCS_GIT;
+    }
+  }
+
+  return vcs;
 }

 const wxString wxExVCS::GetVCSName() const


minor changes to renderer - sensor request

git-svn-id: 767549f2a3626ae39d79f5348867a3ebb5082aca@3675 c7283977-0100-402a-a91a-fa70b306dbfe

--- software/perception/world_model/maps/src/renderers/DataControlRenderer.cpp
+++ software/perception/world_model/maps/src/renderers/DataControlRenderer.cpp
@@ -14,7 +14,7 @@
 #include <gtkmm-renderer/RendererBase.hpp>

 #include <lcmtypes/drc/data_request_list_t.hpp>
-#include <lcmtypes/drc/sensor_rateset_t.hpp>
+#include <lcmtypes/drc/sensor_request_t.hpp>
 #include <lcmtypes/drc/map_image_t.hpp>
 #include <lcmtypes/drc/neck_pitch_t.hpp>

@@ -359,7 +359,7 @@
   }

   void onSpinRateControlButton() {
-    drc::sensor_rateset_t msg;
+    drc::sensor_request_t msg;
     msg.utime = drc::Clock::instance()->getCurrentTime();
     msg.spindle_rpm = mSpinRate;
     msg.multisense_fps = -1;
@@ -367,7 +367,7 @@
   }

   void onCameraRateControlButton() {
-    drc::sensor_rateset_t msg;
+    drc::sensor_request_t msg;
     msg.utime = drc::Clock::instance()->getCurrentTime();
     msg.spindle_rpm = -1;
     msg.multisense_fps = mCameraFrameRate;


fixed a bug in saveOld()

fixed a bug in saveOld()

--- copasi/function/CFunction.cpp
+++ copasi/function/CFunction.cpp
@@ -118,6 +118,7 @@
   C_INT32 dummy, i, sizem, sizep;
   unsigned C_INT32 pos;
   string tmpstr1, tmpstr2;
+  CCopasiVectorNS < CUsageRange > tmpusage;

   if (mType == UserDefined)
     dummy = 1;
@@ -130,7 +131,12 @@
   configBuffer.setVariable("Substrates", "C_INT32", &dummy);
   dummy = mUsageDescriptions["PRODUCTS"]->getLow();
   configBuffer.setVariable("Products", "C_INT32", &dummy);
-  sizem = mParameters.getUsageRanges()["MODIFIER"]->getLow();
+  tmpusage = mParameters.getUsageRanges();
+  i = tmpusage.getIndex("MODIFIER");
+  if (i == -1)
+    sizem = 0;
+  else
+    sizem = tmpusage[i]->getLow();
   configBuffer.setVariable("Modifiers", "C_INT32", &sizem);
   sizep = mParameters.getUsageRanges()["PARAMETER"]->getLow();
   configBuffer.setVariable("Constants", "C_INT32", &sizep);


Emit: Add support for `while` and `do {} while` statements

These were being passed over by the emit logic because I didn't have tests that used them.

--- source/slang/emit.cpp
+++ source/slang/emit.cpp
@@ -1717,6 +1717,27 @@
         }
         Emit(context, ")\n");
         EmitBlockStmt(context, forStmt->Statement);
+        return;
+    }
+    else if (auto whileStmt = stmt.As<WhileStatementSyntaxNode>())
+    {
+        EmitLoopAttributes(context, whileStmt);
+
+        Emit(context, "while(");
+        EmitExpr(context, whileStmt->Predicate);
+        Emit(context, ")\n");
+        EmitBlockStmt(context, whileStmt->Statement);
+        return;
+    }
+    else if (auto doWhileStmt = stmt.As<DoWhileStatementSyntaxNode>())
+    {
+        EmitLoopAttributes(context, doWhileStmt);
+
+        Emit(context, "do(");
+        EmitBlockStmt(context, doWhileStmt->Statement);
+        Emit(context, " while(");
+        EmitExpr(context, doWhileStmt->Predicate);
+        Emit(context, ")\n");
         return;
     }
     else if (auto discardStmt = stmt.As<DiscardStatementSyntaxNode>())


INTEGRATION: CWS changefileheader (1.2.78); FILE MERGED 2008/04/01 15:56:17 thb 1.2.78.2: #i85898# Stripping all external header guards 2008/03/31 16:52:40 rt 1.2.78.1: #i87441# Change license header to LPGL v3.

--- sw/inc/postit.hxx
+++ sw/inc/postit.hxx
@@ -1,58 +1,45 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: postit.hxx,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: rt $ $Date: 2008-02-19 13:34:29 $
- *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
- *
- *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *    This library is free software; you can redistribute it and/or
- *    modify it under the terms of the GNU Lesser General Public
- *    License version 2.1, as published by the Free Software Foundation.
- *
- *    This library is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public
- *    License along with this library; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *    MA  02111-1307  USA
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: postit.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/

 #ifndef _POSTIT_HXX
 #define _POSTIT_HXX

-#ifndef _WINDOW_HXX
 #include <vcl/window.hxx>
-#endif
-
-#ifndef _SDR_OVERLAY_OVERLAYOBJECT_HXX
 #include <svx/sdr/overlay/overlayobject.hxx>
-#endif

 //TODO: move to cxx
 // does not work with forward declaration, why??
 #ifndef _LINEINFO_HXX
 #include <vcl/lineinfo.hxx>
 #endif
-
-#ifndef _BGFX_POLYGON_B2DPOLYGON_HXX
 #include <basegfx/polygon/b2dpolygon.hxx>
-#endif

 class SwPostItMgr;
 class SwPostItField;


Improved documentation wording re: evaluation steps.

--- code/om.hpp
+++ code/om.hpp
@@ -273,8 +273,10 @@
 	</tt>

<tt>{23}</tt>

-Broken down into evaluation steps, where the code that is about to be replaced
-is bold, and the code that was just replaced is italicized:
+Each step of an evaluation can be represented as a program.  The following is
+the above program broken down into its evaluation steps, where the code that is
+about to be replaced is bold, and the code that was just replaced is
+italicized:

 -	<tt>define

 	{ minutes { dequote choose {minutes} {} = {:} <-characters } }


change version to 0.9.1

change version to 0.9.1

--- trunk/src/core/srs_core.hpp
+++ trunk/src/core/srs_core.hpp
@@ -1,121 +1,121 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2013-2014 winlin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef SRS_CORE_HPP
-#define SRS_CORE_HPP
-
-/*
-#include <srs_core.hpp>
-*/
-
-/**
-* the core provides the common defined macros, utilities,
-* user must include the srs_core.hpp before any header, or maybe
-* build failed.
-*/
-
-// for int64_t print using PRId64 format.
-#ifndef __STDC_FORMAT_MACROS
-    #define __STDC_FORMAT_MACROS
-#endif
-#include <inttypes.h>
-
-#include <assert.h>
-#define srs_assert(expression) assert(expression)
-
-#include <stddef.h>
-#include <sys/types.h>
-
-#include <st.h>
-
-// generated by configure.
-#include <srs_auto_headers.hpp>
-
-// free the p and set to NULL.
-// p must be a T*.
-#define srs_freep(p) \
-	if (p) { \
-		delete p; \
-		p = NULL; \
-	} \
-	(void)0
-// free the p which represents a array
-#define srs_freepa(p) \
-	if (p) { \
-		delete[] p; \
-		p = NULL; \
-	} \
-	(void)0
-
-// current release version
-#define RTMP_SIG_SRS_VERSION "0.9.0"
-// server info.
-#define RTMP_SIG_SRS_KEY "srs"
-#define RTMP_SIG_SRS_ROLE "origin server"
-#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(simple rtmp server)"
-#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT
-#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
-#define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin"
-#define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
-#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
-#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin"
-#define RTMP_SIG_SRS_PRIMARY_AUTHROS "winlin,wenjiegit"
-
-// compare
-#define srs_min(a, b) (((a) < (b))? (a) : (b))
-#define srs_max(a, b) (((a) < (b))? (b) : (a))
-
-// get current system time in ms, use cache to avoid performance problem
-extern int64_t srs_get_system_time_ms();
-// the deamon st-thread will update it.
-extern void srs_update_system_time_ms();
-
-// signal defines.
-#define SIGNAL_RELOAD SIGHUP
-
-#include <string>
-// replace utility
-extern std::string srs_replace(std::string str, std::string old_str, std::string new_str);
-// dns resolve utility, return the resolved ip address.
-extern std::string srs_dns_resolve(std::string host);
-// resolve the vhost in query string
-// @param app, may contains the vhost in query string format:
-// 		app?vhost=request_vhost
-//		app...vhost...request_vhost
-extern void srs_vhost_resolve(std::string& vhost, std::string& app);
-
-// close the netfd, and close the underlayer fd.
-extern void srs_close_stfd(st_netfd_t& stfd);
-
-/**
-* disable copy constructor of class
-*/
-#define disable_default_copy(className)\
-    private:\
-        /** \
-        * disable the copy constructor and operator=, donot allow directly copy. \
-        */ \
-        className(const className&); \
-        className& operator= (const className&)
-
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2014 winlin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef SRS_CORE_HPP
+#define SRS_CORE_HPP
+
+/*
+#include <srs_core.hpp>
+*/
+
+/**
+* the core provides the common defined macros, utilities,
+* user must include the srs_core.hpp before any header, or maybe
+* build failed.
+*/
+
+// for int64_t print using PRId64 format.
+#ifndef __STDC_FORMAT_MACROS
+    #define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
+
+#include <assert.h>
+#define srs_assert(expression) assert(expression)
+
+#include <stddef.h>
+#include <sys/types.h>
+
+#include <st.h>
+
+// generated by configure.
+#include <srs_auto_headers.hpp>
+
+// free the p and set to NULL.
+// p must be a T*.
+#define srs_freep(p) \
+	if (p) { \
+		delete p; \
+		p = NULL; \
+	} \
+	(void)0
+// free the p which represents a array
+#define srs_freepa(p) \
+	if (p) { \
+		delete[] p; \
+		p = NULL; \
+	} \
+	(void)0
+
+// current release version
+#define RTMP_SIG_SRS_VERSION "0.9.1"
+// server info.
+#define RTMP_SIG_SRS_KEY "srs"
+#define RTMP_SIG_SRS_ROLE "origin server"
+#define RTMP_SIG_SRS_NAME RTMP_SIG_SRS_KEY"(simple rtmp server)"
+#define RTMP_SIG_SRS_URL "https://"RTMP_SIG_SRS_URL_SHORT
+#define RTMP_SIG_SRS_URL_SHORT "github.com/winlinvip/simple-rtmp-server"
+#define RTMP_SIG_SRS_WEB "http://blog.csdn.net/win_lin"
+#define RTMP_SIG_SRS_EMAIL "winlin@vip.126.com"
+#define RTMP_SIG_SRS_LICENSE "The MIT License (MIT)"
+#define RTMP_SIG_SRS_COPYRIGHT "Copyright (c) 2013-2014 winlin"
+#define RTMP_SIG_SRS_PRIMARY_AUTHROS "winlin,wenjiegit"
+
+// compare
+#define srs_min(a, b) (((a) < (b))? (a) : (b))
+#define srs_max(a, b) (((a) < (b))? (b) : (a))
+
+// get current system time in ms, use cache to avoid performance problem
+extern int64_t srs_get_system_time_ms();
+// the deamon st-thread will update it.
+extern void srs_update_system_time_ms();
+
+// signal defines.
+#define SIGNAL_RELOAD SIGHUP
+
+#include <string>
+// replace utility
+extern std::string srs_replace(std::string str, std::string old_str, std::string new_str);
+// dns resolve utility, return the resolved ip address.
+extern std::string srs_dns_resolve(std::string host);
+// resolve the vhost in query string
+// @param app, may contains the vhost in query string format:
+// 		app?vhost=request_vhost
+//		app...vhost...request_vhost
+extern void srs_vhost_resolve(std::string& vhost, std::string& app);
+
+// close the netfd, and close the underlayer fd.
+extern void srs_close_stfd(st_netfd_t& stfd);
+
+/**
+* disable copy constructor of class
+*/
+#define disable_default_copy(className)\
+    private:\
+        /** \
+        * disable the copy constructor and operator=, donot allow directly copy. \
+        */ \
+        className(const className&); \
+        className& operator= (const className&)
+
 #endif