Removes fpsconvencoding in favor of lconvencoding

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2195 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/fpspreadsheet/fpspreadsheet.pas

@@ -14,7 +14,7 @@ unit fpspreadsheet;
 interface
 
 uses
-  Classes, SysUtils, AVL_Tree, fpsconvencoding;
+  Classes, SysUtils, AVL_Tree, lconvencoding;
 
 type
   TsSpreadsheetFormat = (sfExcel2, sfExcel3, sfExcel4, sfExcel5, sfExcel8,

components/fpspreadsheet/laz_fpspreadsheet.lpk

@@ -27,7 +27,7 @@
         <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
-    <Files Count="19">
+    <Files Count="18">
       <Item1>
         <Filename Value="fpolestorage.pas"/>
         <UnitName Value="fpolestorage"/>
@@ -100,10 +100,6 @@
         <Filename Value="xlscommon.pas"/>
         <UnitName Value="xlscommon"/>
       </Item18>
-      <Item19>
-        <Filename Value="fpsconvencoding.pas"/>
-        <UnitName Value="fpsconvencoding"/>
-      </Item19>
     </Files>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">

components/fpspreadsheet/laz_fpspreadsheet.pas

@@ -11,7 +11,7 @@ uses
   xlsbiff5, xlsbiff8, xlsxooxml, fpsutils, fpszipper, uvirtuallayer_types, 
   uvirtuallayer, uvirtuallayer_ole, uvirtuallayer_ole_helpers, 
   uvirtuallayer_ole_types, uvirtuallayer_stream, fpolebasic, xlscommon, 
-  fpsconvencoding, LazarusPackageIntf;
+  LazarusPackageIntf;
 
 implementation
 

components/fpspreadsheet/xlsbiff2.pas

@@ -34,7 +34,7 @@ interface
 
 uses
   Classes, SysUtils,
-  fpspreadsheet, xlscommon, fpsutils, fpsconvencoding;
+  fpspreadsheet, xlscommon, fpsutils, lconvencoding;
   
 type
 

components/fpspreadsheet/xlsbiff5.pas

@@ -69,7 +69,7 @@ uses
   {$else}
   fpolestorage,
   {$endif}
-  fpsutils, fpsconvencoding;
+  fpsutils, lconvencoding;
 
 type
 

components/fpspreadsheet/xlscommon.pas

@@ -9,7 +9,7 @@ interface
 uses
   Classes, SysUtils,
   fpspreadsheet,
-  fpsutils{, lconvencoding};
+  fpsutils, lconvencoding;
 
 const
   { Formula constants TokenID values }