summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-31 15:13:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-31 18:10:52 +0000
commit959bcd564bca2e33036e0947a293ef2009341cf7 (patch)
tree39a39f00f1132e3c938be6554ff43fc7d1ba23cd
parent756fe1b298762ed145784a09c512d793d9c6fa92 (diff)
various other apparently unnecessary rsc stuff
Change-Id: I745695a92023e7a14ee547ca6bef5981dd329d19
-rw-r--r--include/tools/rc.h17
-rw-r--r--rsc/inc/rscdb.hxx10
-rw-r--r--rsc/source/parser/rscdb.cxx12
-rw-r--r--rsc/source/parser/rscibas.cxx13
-rw-r--r--rsc/source/parser/rscinit.cxx7
5 files changed, 0 insertions, 59 deletions
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 8c123acdd675..8747be4b575e 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -92,13 +92,6 @@ typedef short RSWND_STYLE;
#define METRICFORMATTER_UNIT 0x01
#define METRICFORMATTER_CUSTOMUNITTEXT 0x02
-#define DATEFORMATTER_MIN 0x01
-#define DATEFORMATTER_MAX 0x02
-#define DATEFORMATTER_LONGFORMAT 0x04
-#define DATEFORMATTER_STRICTFORMAT 0x08
-//#define DATEFORMATTER_I12 0x10 // removed (2005-06-17)
-#define DATEFORMATTER_VALUE 0x20
-
#define NUMERICFIELD_FIRST 0x01
#define NUMERICFIELD_LAST 0x02
#define NUMERICFIELD_SPINSIZE 0x04
@@ -107,9 +100,6 @@ typedef short RSWND_STYLE;
#define METRICFIELD_LAST 0x02
#define METRICFIELD_SPINSIZE 0x04
-#define DATEFIELD_FIRST 0x01
-#define DATEFIELD_LAST 0x02
-
// For "ToolBoxItem" resources:
#define RSC_TOOLBOXITEM_ID 0x0001
#define RSC_TOOLBOXITEM_TYPE 0x0002
@@ -160,13 +150,6 @@ typedef short RSWND_STYLE;
// FIXME obsolete, should be removed by MM
#define RSC_COLOR (RSC_NOTYPE + 0x16)
-#define TIME_HOUR 0x01
-#define TIME_MINUTE 0x02
-#define TIME_SECOND 0x04
-#define TIME_SEC100 0x08
-#define DATE_YEAR 0x01
-#define DATE_MONTH 0x02
-#define DATE_DAY 0x04
#endif
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index ce37ba54b8eb..9a8aa723d1de 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -39,7 +39,6 @@ class RscCmdLine;
enum class SymbolType : sal_uInt16;
enum class ToolBoxItemBits;
enum class WindowBorderStyle : sal_Int16;
-enum class TimeFieldFormat : sal_Int32;
enum class KeyFuncType : sal_Int32;
enum class MenuItemBits : sal_Int16;
enum class ToolBoxItemType;
@@ -150,14 +149,11 @@ class RscTypCont
inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, Atom p2, WindowBorderStyle p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, Atom p2, TimeFieldFormat p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
- inline void SETCONST( RscConst *p1, const char * p2, TimeFieldFormat p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
inline void SETCONST( RscConst *p1, const char * p2, ToolBoxItemType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
RscEnum * InitLangType();
RscEnum * InitFieldUnitsType();
- RscEnum * InitTimeFieldFormat();
RscEnum * InitColor();
RscEnum * InitMapUnit();
RscEnum * InitKey();
@@ -242,12 +238,6 @@ public:
RscIdRange aIdUShort;
RscIdRange aIdNoZeroUShort;
RscBreakRange aNoZeroShort;
- RscRange a1to12Short;
- RscRange a0to23Short;
- RscRange a1to31Short;
- RscRange a0to59Short;
- RscRange a0to99Short;
- RscRange a0to9999Short;
RscIdRange aIdLong;
RscString aString;
RscString aStringLiteral;
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 6af2194d4890..75aa7ec9e8a1 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -50,12 +50,6 @@ RscTypCont :: RscTypCont( RscError * pErrHdl,
, aIdUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE )
, aIdNoZeroUShort( pHS->getID( "IDUSHORT" ), RSC_NOTYPE )
, aNoZeroShort( pHS->getID( "NoZeroShort" ), RSC_NOTYPE )
- , a1to12Short( pHS->getID( "MonthShort" ), RSC_NOTYPE )
- , a0to23Short( pHS->getID( "HourShort" ), RSC_NOTYPE )
- , a1to31Short( pHS->getID( "DayShort" ), RSC_NOTYPE )
- , a0to59Short( pHS->getID( "MinuteShort" ), RSC_NOTYPE )
- , a0to99Short( pHS->getID( "_0to59Short" ), RSC_NOTYPE )
- , a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE )
, aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE )
, aString( pHS->getID( "Chars" ), RSC_NOTYPE )
, aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE )
@@ -242,12 +236,6 @@ RscTop * RscTypCont::SearchType( Atom nId )
ELSE_IF( aIdUShort )
ELSE_IF( aIdNoZeroUShort )
ELSE_IF( aNoZeroShort )
- ELSE_IF( a1to12Short )
- ELSE_IF( a0to23Short )
- ELSE_IF( a1to31Short )
- ELSE_IF( a0to59Short )
- ELSE_IF( a0to99Short )
- ELSE_IF( a0to9999Short )
ELSE_IF( aIdLong )
ELSE_IF( aString )
ELSE_IF( aWinBits )
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index da5d688cb7f2..b5f72362a568 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -203,19 +203,6 @@ RscEnum * RscTypCont::InitFieldUnitsType()
return pFieldUnits;
}
-RscEnum * RscTypCont::InitTimeFieldFormat()
-{
- RscEnum * pTimeFieldFormat;
- pTimeFieldFormat = new RscEnum( pHS->getID( "EnumTimeFieldFormat" ),
- RSC_NOTYPE );
-
- SETCONST( pTimeFieldFormat, "TIMEF_NONE", TimeFieldFormat::F_NONE );
- SETCONST( pTimeFieldFormat, "TIMEF_SEC", TimeFieldFormat::F_SEC );
- SETCONST( pTimeFieldFormat, "TIMEF_100TH_SEC", TimeFieldFormat::F_100TH_SEC );
-
- return pTimeFieldFormat;
-}
-
RscEnum * RscTypCont::InitColor()
{
RscEnum * pColor;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 94eb8900bf97..e09c4c651d9e 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -139,13 +139,6 @@ void RscTypCont::Init()
aNoZeroShort.SetRange( -32768, 32767 );
aNoZeroShort.SetOutRange( 0 );
- a1to12Short.SetRange( 1, 12 );
- a0to23Short.SetRange( 0, 23 );
- a1to31Short.SetRange( 1, 31 );
- a0to59Short.SetRange( 0, 59 );
- a0to99Short.SetRange( 0, 99 );
- a0to9999Short.SetRange( 0, 9999 );
-
aIdLong.SetRange( SAL_MIN_INT32, SAL_MAX_INT32 );
}
{