Skip to content

C
core
Kaydet (Commit) 1fec8340 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

no use of RSC_KEYCODE appears to remain 

Change-Id: I968093ef9a9a5647f410432918a60dbc2331192a
üst 73545e2e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 216 deletions
include/tools/rcid.h
Dosyayı görüntüle @ 1fec8340
......@@ -39,7 +39,6 @@
#define RSC_ACCEL (RSC_NOTYPE + 0x1a)
#define RSC_MENU (RSC_NOTYPE + 0x1c)
#define RSC_MENUITEM (RSC_NOTYPE + 0x1d) // only used internally
#define RSC_KEYCODE (RSC_NOTYPE + 0x1f)
#define RSC_IMAGE (RSC_NOTYPE + 0x23)
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
......
rsc/inc/rscdb.hxx
Dosyayı görüntüle @ 1fec8340
......@@ -84,7 +84,6 @@ class RscTypCont
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, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); }
RscEnum * InitFieldUnitsType();
RscEnum * InitKey();
RscTupel * InitStringLongTupel();
static RscCont * InitStringLongTupelList( RscTupel * pStringLongTupel );
RscArray * InitLangStringLongTupelList( RscCont * pStrLongTupelLst );
......@@ -93,7 +92,6 @@ class RscTypCont
RscTop * InitClassString( RscTop * pSuper );
RscTop * InitClassBitmap( RscTop * pSuper );
RscTop * InitClassImage( RscTop * pSuper, RscTop *pClassBitmap );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
RscTop * InitClassMenuItem( RscTop * pSuper );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
......
rsc/source/parser/rscibas.cxx
Dosyayı görüntüle @ 1fec8340
......@@ -193,122 +193,6 @@ RscEnum * RscTypCont::InitFieldUnitsType()
return pFieldUnits;
}
RscEnum * RscTypCont::InitKey()
{
RscEnum * pKey;
pKey = new RscEnum( pHS->getID( "EnumKey" ), RSC_NOTYPE );
SETCONST( pKey, "KEY_0", com::sun::star::awt::Key::NUM0 );
SETCONST( pKey, "KEY_1", com::sun::star::awt::Key::NUM1 );
SETCONST( pKey, "KEY_2", com::sun::star::awt::Key::NUM2 );
SETCONST( pKey, "KEY_3", com::sun::star::awt::Key::NUM3 );
SETCONST( pKey, "KEY_4", com::sun::star::awt::Key::NUM4 );
SETCONST( pKey, "KEY_5", com::sun::star::awt::Key::NUM5 );
SETCONST( pKey, "KEY_6", com::sun::star::awt::Key::NUM6 );
SETCONST( pKey, "KEY_7", com::sun::star::awt::Key::NUM7 );
SETCONST( pKey, "KEY_8", com::sun::star::awt::Key::NUM8 );
SETCONST( pKey, "KEY_9", com::sun::star::awt::Key::NUM9 );
SETCONST( pKey, "KEY_A", com::sun::star::awt::Key::A );
SETCONST( pKey, "KEY_B", com::sun::star::awt::Key::B );
SETCONST( pKey, "KEY_C", com::sun::star::awt::Key::C );
SETCONST( pKey, "KEY_D", com::sun::star::awt::Key::D );
SETCONST( pKey, "KEY_E", com::sun::star::awt::Key::E );
SETCONST( pKey, "KEY_F", com::sun::star::awt::Key::F );
SETCONST( pKey, "KEY_G", com::sun::star::awt::Key::G );
SETCONST( pKey, "KEY_H", com::sun::star::awt::Key::H );
SETCONST( pKey, "KEY_I", com::sun::star::awt::Key::I );
SETCONST( pKey, "KEY_J", com::sun::star::awt::Key::J );
SETCONST( pKey, "KEY_K", com::sun::star::awt::Key::K );
SETCONST( pKey, "KEY_L", com::sun::star::awt::Key::L );
SETCONST( pKey, "KEY_M", com::sun::star::awt::Key::M );
SETCONST( pKey, "KEY_N", com::sun::star::awt::Key::N );
SETCONST( pKey, "KEY_O", com::sun::star::awt::Key::O );
SETCONST( pKey, "KEY_P", com::sun::star::awt::Key::P );
SETCONST( pKey, "KEY_Q", com::sun::star::awt::Key::Q );
SETCONST( pKey, "KEY_R", com::sun::star::awt::Key::R );
SETCONST( pKey, "KEY_S", com::sun::star::awt::Key::S );
SETCONST( pKey, "KEY_T", com::sun::star::awt::Key::T );
SETCONST( pKey, "KEY_U", com::sun::star::awt::Key::U );
SETCONST( pKey, "KEY_V", com::sun::star::awt::Key::V );
SETCONST( pKey, "KEY_W", com::sun::star::awt::Key::W );
SETCONST( pKey, "KEY_X", com::sun::star::awt::Key::X );
SETCONST( pKey, "KEY_Y", com::sun::star::awt::Key::Y );
SETCONST( pKey, "KEY_Z", com::sun::star::awt::Key::Z );
SETCONST( pKey, "KEY_F1", com::sun::star::awt::Key::F1 );
SETCONST( pKey, "KEY_F2", com::sun::star::awt::Key::F2 );
SETCONST( pKey, "KEY_F3", com::sun::star::awt::Key::F3 );
SETCONST( pKey, "KEY_F4", com::sun::star::awt::Key::F4 );
SETCONST( pKey, "KEY_F5", com::sun::star::awt::Key::F5 );
SETCONST( pKey, "KEY_F6", com::sun::star::awt::Key::F6 );
SETCONST( pKey, "KEY_F7", com::sun::star::awt::Key::F7 );
SETCONST( pKey, "KEY_F8", com::sun::star::awt::Key::F8 );
SETCONST( pKey, "KEY_F9", com::sun::star::awt::Key::F9 );
SETCONST( pKey, "KEY_F10", com::sun::star::awt::Key::F10 );
SETCONST( pKey, "KEY_F11", com::sun::star::awt::Key::F11 );
SETCONST( pKey, "KEY_F12", com::sun::star::awt::Key::F12 );
SETCONST( pKey, "KEY_F13", com::sun::star::awt::Key::F13 );
SETCONST( pKey, "KEY_F14", com::sun::star::awt::Key::F14 );
SETCONST( pKey, "KEY_F15", com::sun::star::awt::Key::F15 );
SETCONST( pKey, "KEY_F16", com::sun::star::awt::Key::F16 );
SETCONST( pKey, "KEY_F17", com::sun::star::awt::Key::F17 );
SETCONST( pKey, "KEY_F18", com::sun::star::awt::Key::F18 );
SETCONST( pKey, "KEY_F19", com::sun::star::awt::Key::F19 );
SETCONST( pKey, "KEY_F20", com::sun::star::awt::Key::F20 );
SETCONST( pKey, "KEY_F21", com::sun::star::awt::Key::F21 );
SETCONST( pKey, "KEY_F22", com::sun::star::awt::Key::F22 );
SETCONST( pKey, "KEY_F23", com::sun::star::awt::Key::F23 );
SETCONST( pKey, "KEY_F24", com::sun::star::awt::Key::F24 );
SETCONST( pKey, "KEY_F25", com::sun::star::awt::Key::F25 );
SETCONST( pKey, "KEY_F26", com::sun::star::awt::Key::F26 );
SETCONST( pKey, "KEY_DOWN", com::sun::star::awt::Key::DOWN );
SETCONST( pKey, "KEY_UP", com::sun::star::awt::Key::UP );
SETCONST( pKey, "KEY_LEFT", com::sun::star::awt::Key::LEFT );
SETCONST( pKey, "KEY_RIGHT", com::sun::star::awt::Key::RIGHT );
SETCONST( pKey, "KEY_HOME", com::sun::star::awt::Key::HOME );
SETCONST( pKey, "KEY_END", com::sun::star::awt::Key::END );
SETCONST( pKey, "KEY_PAGEUP", com::sun::star::awt::Key::PAGEUP );
SETCONST( pKey, "KEY_PAGEDOWN", com::sun::star::awt::Key::PAGEDOWN );
SETCONST( pKey, "KEY_RETURN", com::sun::star::awt::Key::RETURN );
SETCONST( pKey, "KEY_ESCAPE", com::sun::star::awt::Key::ESCAPE );
SETCONST( pKey, "KEY_TAB", com::sun::star::awt::Key::TAB );
SETCONST( pKey, "KEY_BACKSPACE", com::sun::star::awt::Key::BACKSPACE );
SETCONST( pKey, "KEY_SPACE", com::sun::star::awt::Key::SPACE );
SETCONST( pKey, "KEY_INSERT", com::sun::star::awt::Key::INSERT );
SETCONST( pKey, "KEY_DELETE", com::sun::star::awt::Key::DELETE );
SETCONST( pKey, "KEY_ADD", com::sun::star::awt::Key::ADD );
SETCONST( pKey, "KEY_SUBTRACT", com::sun::star::awt::Key::SUBTRACT );
SETCONST( pKey, "KEY_MULTIPLY", com::sun::star::awt::Key::MULTIPLY );
SETCONST( pKey, "KEY_DIVIDE", com::sun::star::awt::Key::DIVIDE );
SETCONST( pKey, "KEY_POINT", com::sun::star::awt::Key::POINT );
SETCONST( pKey, "KEY_COMMA", com::sun::star::awt::Key::COMMA );
SETCONST( pKey, "KEY_LESS", com::sun::star::awt::Key::LESS );
SETCONST( pKey, "KEY_GREATER", com::sun::star::awt::Key::GREATER );
SETCONST( pKey, "KEY_EQUAL", com::sun::star::awt::Key::EQUAL );
SETCONST( pKey, "KEY_OPEN", com::sun::star::awt::Key::OPEN );
SETCONST( pKey, "KEY_CUT", com::sun::star::awt::Key::CUT );
SETCONST( pKey, "KEY_COPY", com::sun::star::awt::Key::COPY );
SETCONST( pKey, "KEY_PASTE", com::sun::star::awt::Key::PASTE );
SETCONST( pKey, "KEY_UNDO", com::sun::star::awt::Key::UNDO );
SETCONST( pKey, "KEY_REPEAT", com::sun::star::awt::Key::REPEAT );
SETCONST( pKey, "KEY_FIND", com::sun::star::awt::Key::FIND );
SETCONST( pKey, "KEY_PROPERTIES", com::sun::star::awt::Key::PROPERTIES );
SETCONST( pKey, "KEY_FRONT", com::sun::star::awt::Key::FRONT );
SETCONST( pKey, "KEY_CONTEXTMENU", com::sun::star::awt::Key::CONTEXTMENU );
SETCONST( pKey, "KEY_HELP", com::sun::star::awt::Key::HELP );
SETCONST( pKey, "KEY_HANGUL_HANJA", com::sun::star::awt::Key::HANGUL_HANJA );
SETCONST( pKey, "KEY_DECIMAL", com::sun::star::awt::Key::DECIMAL );
SETCONST( pKey, "KEY_TILDE", com::sun::star::awt::Key::TILDE );
SETCONST( pKey, "KEY_QUOTELEFT", com::sun::star::awt::Key::QUOTELEFT );
return pKey;
}
RscTupel * RscTypCont::InitStringLongTupel()
{
RscTop * pTupel;
......
rsc/source/parser/rscicpx.cxx
Dosyayı görüntüle @ 1fec8340
......@@ -115,96 +115,6 @@ RscTop * RscTypCont::InitClassImage( RscTop * pSuper, RscTop * pClassBitmap )
return pClassImage;
}
RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
{
Atom nId;
RscTop * pClassKeyCode;
// initialize class
nId = pHS->getID( "KeyCode" );
pClassKeyCode = new RscClass( nId, RSC_KEYCODE, pSuper );
aNmTb.Put( nId, CLASSNAME, pClassKeyCode );
// initialize variables
nId = aNmTb.Put( "Code", VARNAME );
pClassKeyCode->SetVariable( nId, pKey );
{
RscFlag * pFlag;
RscClient * pClient;
Atom nVarId, nShiftId, nMod1Id, nMod2Id;
aBaseLst.push_back( pFlag = new RscFlag( pHS->getID( "FlagKeyModifier" ), RSC_NOTYPE ) );
// set constants in table
nShiftId = pHS->getID( "KEY_SHIFT" );
SETCONST( pFlag, nShiftId, KEY_SHIFT );
nMod1Id = pHS->getID( "KEY_MOD1" );
SETCONST( pFlag, nMod1Id, KEY_MOD1 );
nMod2Id = pHS->getID( "KEY_MOD2" );
SETCONST( pFlag, nMod2Id, KEY_MOD2 );
// add variable
nVarId = aNmTb.Put( "_ModifierFlags", VARNAME );
pClassKeyCode->SetVariable( nVarId, pFlag, nullptr,
RSCVAR::Hidden | RSCVAR::NoEnum );
// add client variables
aBaseLst.push_back(
pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nShiftId )
);
nId = aNmTb.Put( "Shift", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, nullptr,
RSCVAR::NoDataInst, 0, nVarId );
aBaseLst.push_back(
pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod1Id )
);
nId = aNmTb.Put( "Modifier1", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, nullptr,
RSCVAR::NoDataInst, 0, nVarId );
aBaseLst.push_back(
pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, pFlag, nMod2Id )
);
nId = aNmTb.Put( "Modifier2", VARNAME );
pClassKeyCode->SetVariable( nId, pClient, nullptr,
RSCVAR::NoDataInst, 0, nVarId );
}
{
Atom nVarId;
RscEnum * pKeyFunc;
aBaseLst.push_back( pKeyFunc = new RscEnum( pHS->getID( "EnumKeyFunc" ), RSC_NOTYPE ) );
SETCONST( pKeyFunc, "KEYFUNC_DONTKNOW", KeyFuncType::DONTKNOW );
SETCONST( pKeyFunc, "KEYFUNC_NEW", KeyFuncType::NEW );
SETCONST( pKeyFunc, "KEYFUNC_OPEN", KeyFuncType::OPEN );
SETCONST( pKeyFunc, "KEYFUNC_SAVE", KeyFuncType::SAVE );
SETCONST( pKeyFunc, "KEYFUNC_SAVEAS", KeyFuncType::SAVEAS );
SETCONST( pKeyFunc, "KEYFUNC_PRINT", KeyFuncType::PRINT );
SETCONST( pKeyFunc, "KEYFUNC_CLOSE", KeyFuncType::CLOSE );
SETCONST( pKeyFunc, "KEYFUNC_QUIT", KeyFuncType::QUIT );
SETCONST( pKeyFunc, "KEYFUNC_CUT", KeyFuncType::CUT );
SETCONST( pKeyFunc, "KEYFUNC_COPY", KeyFuncType::COPY );
SETCONST( pKeyFunc, "KEYFUNC_PASTE", KeyFuncType::PASTE );
SETCONST( pKeyFunc, "KEYFUNC_UNDO", KeyFuncType::UNDO );
SETCONST( pKeyFunc, "KEYFUNC_REDO", KeyFuncType::REDO );
SETCONST( pKeyFunc, "KEYFUNC_DELETE", KeyFuncType::DELETE );
SETCONST( pKeyFunc, "KEYFUNC_REPEAT", KeyFuncType::REPEAT );
SETCONST( pKeyFunc, "KEYFUNC_FIND", KeyFuncType::FIND );
SETCONST( pKeyFunc, "KEYFUNC_PROPERTIES", KeyFuncType::PROPERTIES );
SETCONST( pKeyFunc, "KEYFUNC_FRONT", KeyFuncType::FRONT );
SETCONST( pKeyFunc, "KEYFUNC_FINDBACKWARD", KeyFuncType::FINDBACKWARD );
// add variable
nVarId = aNmTb.Put( "Function", VARNAME );
pClassKeyCode->SetVariable( nVarId, pKeyFunc );
}
return pClassKeyCode;
}
RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper )
{
Atom nId;
......
rsc/source/parser/rscinit.cxx
Dosyayı görüntüle @ 1fec8340
......@@ -40,7 +40,6 @@
void RscTypCont::Init()
{
RscEnum * pKey;
RscTupel * pStringLongTupel;
RscCont * pStringLongTupelList;
RscArray * pLangStringLongTupelList;
......@@ -50,7 +49,6 @@ void RscTypCont::Init()
RscTop * pClassStringArray;
RscTop * pClassBitmap;
RscTop * pClassImage;
RscTop * pClassKeyCode;
Atom nId;
......@@ -81,7 +79,6 @@ void RscTypCont::Init()
{
aLangType.Init( aNmTb );
aBaseLst.push_back( InitFieldUnitsType() );
aBaseLst.push_back( pKey = InitKey() );
aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() );
aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) );
......@@ -119,10 +116,6 @@ void RscTypCont::Init()
pClassImage = InitClassImage( pClassMgr, pClassBitmap );
pRoot->Insert( pClassImage );
}
{
pClassKeyCode = InitClassKeyCode( pClassMgr, pKey );
pRoot->Insert( pClassKeyCode );
}
{
RscTop* pClassMenuItem = InitClassMenuItem(pClassMgr);
pRoot->Insert( pClassMenuItem );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment