Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix EmbeddedResource access on net472 #1083

Merged
merged 1 commit into from
May 20, 2023
Merged

fix EmbeddedResource access on net472 #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions main/HSSF/UserModel/StaticFontMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ namespace NPOI.HSSF.UserModel
*/
class StaticFontMetrics
{
#if NETSTANDARD2_1 || NET6_0_OR_GREATER || NETSTANDARD2_0
private const String FONT_METRICS_PROPERTIES_FILE_NAME = "NPOI.Resources.font_metrics.properties";
#else
private const String FONT_METRICS_PROPERTIES_FILE_NAME = "font_metrics.properties";
#endif

/** The font metrics property file we're using */
private static Properties fontMetricsProps;
Expand Down
4 changes: 0 additions & 4 deletions main/SS/Formula/Function/FunctionMetadataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ namespace NPOI.SS.Formula.Function
*/
class FunctionMetadataReader
{
#if NETSTANDARD2_1 || NET6_0_OR_GREATER || NETSTANDARD2_0
private const String METADATA_FILE_NAME = "NPOI.Resources.functionMetadata.txt";
#else
private const String METADATA_FILE_NAME = "functionMetadata.txt";
#endif

/** plain ASCII text metadata file uses three dots for ellipsis */
private const string ELLIPSIS = "...";
Expand Down
4 changes: 0 additions & 4 deletions ooxml/XSSF/UserModel/XSSFBuiltinTableStyle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,7 @@ public enum XSSFBuiltinTableStyleEnum:int
}
public class XSSFBuiltinTableStyle
{
#if NETSTANDARD2_1 || NET6_0_OR_GREATER || NETSTANDARD2_0
const string presetTableStylesResourceName = "NPOI.OOXML.Resources.presetTableStyles.xml";
#else
const string presetTableStylesResourceName= "presetTableStyles.xml";
#endif

private static Dictionary<XSSFBuiltinTableStyleEnum, ITableStyle> styleMap = new Dictionary<XSSFBuiltinTableStyleEnum, ITableStyle>();
public static ITableStyle GetStyle(XSSFBuiltinTableStyleEnum style)
Expand Down