BaseTextItem show Field names with StringTrimming.EllipsisCharacter,BaseImageItem show image source

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5686 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseImageItem.cs

@@ -68,8 +68,7 @@ namespace ICSharpCode.Reports.Addin
 				Image im = this.image;
 				if (im != null) {
 					graphics.DrawImage(this.Image,this.ClientRectangle);
-				}
+				} 
-				
 			}
 		}
 		
@@ -140,9 +139,11 @@ namespace ICSharpCode.Reports.Addin
 		[XmlIgnoreAttribute]
 		public Image Image {
 			get {
+				string text = "<Image>";
 				if (this.imageSource == GlobalEnums.ImageSource.Database ) {
-					this.image = FakeImage(base.Size,"<Database>");
+					text = "<Database>";
 				}
+				this.image = FakeImage(base.Size,text);
 				if (this.image != null) {
 					return image;
 				} else {

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs

@@ -52,6 +52,8 @@ namespace ICSharpCode.Reports.Addin
 		
 		public override void Draw(Graphics graphics)
 		{
+			StringTrimming designTrimmimg = StringTrimming.EllipsisCharacter;
+			
 			if (graphics == null) {
 				throw new ArgumentNullException("graphics");
 			}
@@ -59,11 +61,15 @@ namespace ICSharpCode.Reports.Addin
 				graphics.FillRectangle(b, base.DrawingRectangle);
 			}
 			
+			if (this.stringTrimming != StringTrimming.None) {
+				designTrimmimg = stringTrimming;
+			}
 			TextDrawer.DrawString(graphics,this.Text,this.Font,
 			                      new SolidBrush(this.ForeColor),
 			                      this.ClientRectangle,
-			                      this.stringTrimming,this.contentAlignment);
+			                      designTrimmimg,
-				
+			                      this.contentAlignment);
+			
 			base.DrawControl(graphics,base.DrawingRectangle);
 		}