LazReport, check for duplicate object names in designer, issue #13979

git-svn-id: trunk@20653 -

components/lazreport/source/languages/lr_const.de.po

@@ -517,6 +517,10 @@ msgstr "Version"
 msgid "Version"
 msgstr "Version"
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "&Große Schrift"

components/lazreport/source/languages/lr_const.es.po

@@ -506,6 +506,10 @@ msgstr "Lanzamiento"
 msgid "Version"
 msgstr "Verisón"
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "Fuente &Grande"

components/lazreport/source/languages/lr_const.fr.po

@@ -515,6 +515,10 @@ msgstr "Version"
 msgid "Version"
 msgstr "Version"
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "&Grande police"

components/lazreport/source/languages/lr_const.id.po

@@ -506,6 +506,10 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "Font &Besar"

components/lazreport/source/languages/lr_const.lt.po

@@ -508,6 +508,10 @@ msgstr "Laida"
 msgid "Version"
 msgstr "Versija"
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "&Didelis šriftas"

components/lazreport/source/languages/lr_const.po

@@ -501,6 +501,10 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr ""

components/lazreport/source/languages/lr_const.ru.po

@@ -506,6 +506,10 @@ msgstr "Выпуск"
 msgid "Version"
 msgstr "Версия"
 
+#: lr_const.sduplicatedobjectname
+msgid "An object named \"%s\" already exists"
+msgstr ""
+
 #: lr_const.seditorformbig
 msgid "&Big font"
 msgstr "&Большой шрифт"

components/lazreport/source/lr_class.pas

@@ -1455,9 +1455,9 @@ end;
 
 procedure TfrView.Assign(From: TfrView);
 begin
-  Inherited Assign(From);
+  inherited Assign(From);
   
-  Name := From.Name;
+  fName := From.Name;
   Typ := From.Typ;
   Selected := From.Selected;
 
@@ -9575,26 +9575,19 @@ end;
 
 procedure TfrObject.SetName(const AValue: string);
 var i   : Integer;
-    Flg : Boolean;
 begin
   if fName=AValue then exit;
-  Flg:=False;
-  
-  {if Assigned(Objects) then
+
+  if (frDesigner<>nil) and (CurReport<>nil) then
   begin
-    for i:=0 to Objects.Count-1 do
+    if CurReport.FindObject(AValue)<>nil then
     begin
-      if (TfrView(Objects[i]).Name=aValue) then
-      begin
-        Flg:=True;
-        MessageDlg('This name it''s already exists.',mtError,[mbOk],0);
-        Break;
-      end;
+      MessageDlg(format(sDuplicatedObjectName,[AValue]),mtError,[mbOk],0);
+      exit;
     end;
   end;
-  }
-  if not Flg then
-    fName:=AValue;
+
+  fName:=AValue;
 end;
 
 procedure TfrObject.SetScript(const AValue: TfrScriptStrings);

components/lazreport/source/lr_const.pas

@@ -249,6 +249,7 @@ resourcestring
   sSpecVal = 'Other';
   sFRFError='Unsupported FRF format';
   sClassObjectNotFound='Class Object "%s" not found';
+  sDuplicatedObjectName = 'An object named "%s" already exists';
   
   SDoc = 'Report:';
   SBand = 'Band:';