Merge branch 'FixNumdevices' into test_gdiDrawer

zamtmn · Oct 15, 2022 · 1bb88e5 · 1bb88e5
2 parents c2d928f + 0d6bcc8
commit 1bb88e5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cad_source/zcad/commands/uzccommand_numdevices.pas b/cad_source/zcad/commands/uzccommand_numdevices.pas
@@ -44,7 +44,8 @@ interface
   uzctnrvectorstrings,
   Varman, varmandef,
   uzcLog,uzctnrvectorgdbpalettecolor,
-  uzccomdraw,UGDBSelectedObjArray,uzeentdevice,uzgldrawcontext,uzcenitiesvariablesextender;
+  uzccomdraw,UGDBSelectedObjArray,uzeentdevice,uzgldrawcontext,
+  uzcenitiesvariablesextender,uzbstrproc;
 type
   TST=(
           TST_YX(*'Y-X'*),
@@ -61,8 +62,8 @@   TNumberingParams=record
                      StartNumber:Integer;(*'Start'*)
                      Increment:Integer;(*'Increment'*)
                      SaveStart:Boolean;(*'Save start number'*)
-                     BaseName:String;(*'Base name sorting devices'*)
-                     NumberVar:String;(*'Number variable'*)
+                     BaseName:AnsiString;(*'Base name sorting devices'*)
+                     NumberVar:AnsiString;(*'Number variable'*)
                end;
   Number_com= object(CommandRTEdObject)
                          procedure CommandStart(Operands:TCommandOperands); virtual;
@@ -167,7 +168,7 @@ procedure Number_com.Run(pdata:PtrInt);
             if pvd<>nil then
             begin
             if uppercase(pvd^.data.PTD^.GetUserValueAsString(pvd^.data.Addr.Instance))=
-               uppercase(NumberingParams.BaseName) then
+               uppercase(Tria_AnsiToUtf8(NumberingParams.BaseName)) then
                                                        process:=true
                                                    else
                                                        process:=false;