Сделана отрисовка заливки текста (поле Shd). Сделано, чтобы в CTextPr поле Shd...

Сделана отрисовка заливки текста (поле Shd). Сделано, чтобы в CTextPr поле Shd могло быть неопределено.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55922 954022d7-b5bf-4e40-9824-e11837661b57

Word/Editor/Paragraph.js

@@ -6689,6 +6689,19 @@ Paragraph.prototype =
                         pGraphics.df();
                     }
 
+                    //----------------------------------------------------------------------------------------------------------
+                    // Рисуем заливку текста
+                    //----------------------------------------------------------------------------------------------------------
+                    var aShd = PDSH.Shd;
+                    var Element = aShd.Get_Next();
+                    while ( null != Element )
+                    {
+                        pGraphics.b_color1( Element.r, Element.g, Element.b, 255 );
+                        pGraphics.rect( Element.x0, Element.y0, Element.x1 - Element.x0, Element.y1 - Element.y0 );
+                        pGraphics.df();
+                        Element = aShd.Get_Next();
+                    }
+
                     //----------------------------------------------------------------------------------------------------------
                     // Рисуем выделение текста
                     //----------------------------------------------------------------------------------------------------------
@@ -22293,6 +22306,7 @@ function CParagraphDrawStateHightlights()
     this.Coll   = new CParaDrawingRangeLines();
     this.Find   = new CParaDrawingRangeLines();
     this.Comm   = new CParaDrawingRangeLines();
+    this.Shd    = new CParaDrawingRangeLines();
 
     this.Comments     = new Array();
     this.CommentsFlag = comments_NoComment;

Word/Editor/Run.js

@@ -2789,6 +2789,7 @@ ParaRun.prototype =
         var aColl     = PDSH.Coll;
         var aFind     = PDSH.Find;
         var aComm     = PDSH.Comm;
+        var aShd      = PDSH.Shd;
 
         var Range    = this.Lines[CurLine].Ranges[CurRange];
         var StartPos = Range.StartPos;
@@ -2799,7 +2800,11 @@ ParaRun.prototype =
 
         var bDrawFind = PDSH.DrawFind;
         var bDrawColl = PDSH.DrawColl;
-
+        
+        var oShd = this.Get_CompiledPr(false).Shd;
+        var bDrawShd  = ( oShd === undefined || shd_Nil === oShd.Value ? false : true );
+        var ShdColor  = ( true === bDrawShd ? oShd.Get_Color( PDSH.Paragraph ) : null );
+        
         var X  = PDSH.X;
         var Y0 = PDSH.Y0;
         var Y1 = PDSH.Y1;
@@ -2832,6 +2837,9 @@ ParaRun.prototype =
 
             var DrawColl = this.CollaborativeMarks.Check( Pos );
 
+            if ( true === bDrawShd )
+                aShd.Add( Y0, Y1, X, X + Item.WidthVisible, 0, ShdColor.r, ShdColor.g, ShdColor.b );
+
             switch( Item.Type )
             {
                 case para_PageNum:
@@ -4421,6 +4429,9 @@ ParaRun.prototype =
 
         if ( undefined != TextPr.Lang )
             this.Set_Lang2( TextPr.Lang );
+        
+        if ( undefined !== TextPr.Shd )
+            this.Set_Shd( TextPr.Shd );
     },
 
     Set_Bold : function(Value)
@@ -4843,6 +4854,25 @@ ParaRun.prototype =
             this.Recalc_CompiledPr(false);
         }
     },
+    
+    Set_Shd : function(Shd)
+    {
+        if ( (undefined === this.Pr.Shd && undefined === Shd) || (undefined !== this.Pr.Shd && undefined !== Shd && true === this.Pr.Shd.Compare( Shd ) ) )
+            return;
+
+        var OldShd = this.Pr.Shd;
+
+        if ( undefined !== Shd )
+        {
+            this.Pr.Shd = new CDocumentShd();
+            this.Pr.Shd.Set_FromObject( Shd );
+        }
+        else
+            this.Pr.Shd = undefined;
+
+        History.Add( this, { Type : historyitem_ParaRun_Shd, New : this.Pr.Shd, Old : OldShd } );
+        this.Recalc_CompiledPr(false);
+    },
 
 //-----------------------------------------------------------------------------------
 // Undo/Redo функции
@@ -5188,6 +5218,14 @@ ParaRun.prototype =
 
                 break;
             }
+                
+            case historyitem_ParaRun_Shd:
+            {
+                this.Pr.Shd = Data.Old;
+                this.Recalc_CompiledPr(false);
+                
+                break;
+            }
         }
     },
 
@@ -5533,6 +5571,14 @@ ParaRun.prototype =
 
                 break;
             }
+
+            case historyitem_ParaRun_Shd:
+            {
+                this.Pr.Shd = Data.New;
+                this.Recalc_CompiledPr(false);
+
+                break;
+            }
         }
     },
 
@@ -5862,6 +5908,24 @@ ParaRun.prototype =
 
                 break;
             }
+
+            case historyitem_ParaRun_Shd:
+            {
+                // Bool : undefined
+                // false - >
+                // Variable : CDocumentShd
+                
+                if ( undefined !== Data.New )
+                {
+                    Writer.WriteBool(false);
+                    Data.New.Write_ToBinary(Writer);
+                }
+                else
+                    Writer.WriteBool(true);
+
+                break;
+            }
+
         }
 
         return Writer;
@@ -6373,6 +6437,27 @@ ParaRun.prototype =
 
                 break;
             }
+
+            case historyitem_ParaRun_Shd:
+            {
+                // Bool : undefined
+                // false - >
+                // Variable : CDocumentShd
+
+                if ( false === Reader.GetBool() )
+                {
+                    this.Pr.Shd = new CDocumentShd();
+                    this.Pr.Shd.Read_FromBinary( Reader );
+                }
+                else
+                    this.Pr.Shd = undefined;
+
+                this.Recalc_CompiledPr(false);
+
+                break;
+            }
+                
+                
         }
     },
 

Word/Editor/Styles.js

@@ -6372,7 +6372,7 @@ function CTextPr()
     this.RTL        = undefined;
     this.Lang       = new CLang();
     this.Unifill    = undefined;
-    this.Shd        = new CDocumentShd();
+    this.Shd        = undefined;
 }
 
 CTextPr.prototype =
@@ -6403,7 +6403,7 @@ CTextPr.prototype =
         this.RTL        = undefined;
         this.Lang       = new CLang();
         this.Unifill    = undefined;
-        this.Shd        = new CDocumentShd();
+        this.Shd        = undefined;
     },
 
     Copy : function()
@@ -6451,7 +6451,8 @@ CTextPr.prototype =
         if(undefined != this.Unifill)
             TextPr.Unifill = this.Unifill.createDuplicate();
         
-        TextPr.Shd        = this.Shd.Copy();
+        if (undefined !== this.Shd )
+            TextPr.Shd = this.Shd.Copy();
 
         return TextPr;
     },
@@ -6533,7 +6534,8 @@ CTextPr.prototype =
         if(undefined != TextPr.Unifill)
             this.Unifill = TextPr.Unifill.createDuplicate();
         
-        this.Shd = TextPr.Shd.Copy();
+        if ( undefined !== TextPr.Shd )
+            this.Shd = TextPr.Shd.Copy();
     },
 
     Init_Default : function()
@@ -6565,7 +6567,7 @@ CTextPr.prototype =
         this.RTL        = false;
         this.Lang.Init_Default();
         this.Unifill    = undefined;
-        this.Shd.Init_Default();        
+        this.Shd        = undefined;      
     },
 
     Set_FromObject : function(TextPr)
@@ -6625,7 +6627,12 @@ CTextPr.prototype =
             this.Unifill =  TextPr.Unifill ;
         
         if ( undefined !== TextPr.Shd )
+        {
+            this.Shd = new CDocumentShd();
             this.Shd.Set_FromObject( TextPr.Shd );
+        }
+        else
+            this.Shd = undefined;
     },
 
     Compare : function(TextPr)
@@ -6715,11 +6722,7 @@ CTextPr.prototype =
 
         // Lang
         this.Lang.Compare( TextPr.Lang );
-        //Result_TextPr.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill);
-        
-        // Shd
-        if ( this.Shd.Value !== TextPr.Shd.Value  )
-            this.Shd.Value = shd_Nil;
+        //Result_TextPr.Unifill = CompareUniFill(this.Unifill, TextPr.Unifill);        
 
         return this;
     },
@@ -7003,6 +7006,7 @@ CTextPr.prototype =
         // Shd
         if ( Flags & 8388608 )
         {
+            this.Shd = new CDocumentShd();
             this.Shd.Read_FromBinary( Reader );
         }
     },