mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SfxSlotInfo is unused

Browse Source 
Change-Id: I8d5438ca338868c77dcf489609a4e007cfe925fd
Reviewed-on: https://gerrit.libreoffice.org/30290
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2016-10-26 12:08:20 +01:00
parent a324099538
commit 0d3e45608a
8 changed files with 0 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/rsc/rscsfx.hxx
View File

@@ -19,8 +19,6 @@
#ifndef INCLUDED_RSC_RSCSFX_HXX #ifndef INCLUDED_RSC_RSCSFX_HXX
#define INCLUDED_RSC_RSCSFX_HXX #define INCLUDED_RSC_RSCSFX_HXX
#define RSC_SFX_SLOT_INFO (0x100 + 0x203)
//========== S F X ======================================= //========== S F X =======================================
// This is used as a flags enum in sw/, but only there, // This is used as a flags enum in sw/, but only there,
// so I don't pull in o3tl::typed_flags here // so I don't pull in o3tl::typed_flags here
@@ -36,12 +34,6 @@ enum class SfxStyleFamily {
All = 0x7fff All = 0x7fff
}; };
// SfxSlotInfo
enum class SfxSlotInfo {
SlotName = 0x1,
HelpText = 0x2
};
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
rsc/inc/rscclass.hxx
View File

@@ -62,10 +62,6 @@ public:
virtual RSCCLASS_TYPE GetClassType() const override; virtual RSCCLASS_TYPE GetClassType() const override;
void Pre_dtor() override; void Pre_dtor() override;
ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt,
RSCVAR nVarType, SfxSlotInfo nMask,
Atom nDataBaseName = InvalidAtom ) override;
ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt = nullptr, RSCINST * pDflt = nullptr,
RSCVAR nVarType = 0, sal_uInt32 nMask = 0, RSCVAR nVarType = 0, sal_uInt32 nMask = 0,

2
rsc/inc/rscdb.hxx
View File

@@ -109,8 +109,6 @@ class RscTypCont
RscTop * InitClassMenuItem( RscTop * pSuper ); RscTop * InitClassMenuItem( RscTop * pSuper );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem ); RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
RscTop * InitClassSfxSlotInfo( RscTop * pSuper );
public: public:
RscBool aBool; RscBool aBool;
RscRange aShort; RscRange aShort;

5
rsc/inc/rsctop.hxx
View File

@@ -81,11 +81,6 @@ public:
virtual ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); virtual ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId );
// sets the variable // sets the variable
virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt,
RSCVAR nVarType, SfxSlotInfo nMask,
Atom nDataBaseName = InvalidAtom );
virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, virtual ERRTYPE SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt = nullptr, RSCINST * pDflt = nullptr,
RSCVAR nVarType = 0, sal_uInt32 nMask = 0, RSCVAR nVarType = 0, sal_uInt32 nMask = 0,

20
rsc/source/parser/rscicpx.cxx
View File

@@ -364,24 +364,4 @@ RscTop * RscTypCont::InitClassMenu( RscTop * pSuper,
return pClassMenu; return pClassMenu;
} }
RscTop * RscTypCont::InitClassSfxSlotInfo( RscTop * pSuper )
{
Atom nId;
RscTop * pClassSfxSlotInfo;
// initialize class
nId = pHS->getID( "SfxSlotInfo" );
pClassSfxSlotInfo = new RscClass( nId, RSC_SFX_SLOT_INFO, pSuper );
aNmTb.Put( nId, CLASSNAME, pClassSfxSlotInfo );
nId = aNmTb.Put( "SlotName", VARNAME );
pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0,
SfxSlotInfo::SlotName );
nId = aNmTb.Put( "HelpText", VARNAME );
pClassSfxSlotInfo->SetVariable( nId, &aLangString, nullptr, 0,
SfxSlotInfo::HelpText );
return pClassSfxSlotInfo;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
rsc/source/parser/rscinit.cxx
View File

@@ -167,10 +167,6 @@ void RscTypCont::Init()
pClassMenuItem->SetVariable( nId, pClassMenu, nullptr, VAR_SVDYNAMIC, pClassMenuItem->SetVariable( nId, pClassMenu, nullptr, VAR_SVDYNAMIC,
(sal_uInt32)RscMenuItem::Menu ); (sal_uInt32)RscMenuItem::Menu );
} }
{
RscTop* pClassSfxSlotInfo = InitClassSfxSlotInfo( pClassMgr );
pRoot->Insert( pClassSfxSlotInfo );
}
aNmTb.SetSort(); aNmTb.SetSort();
} }

10
rsc/source/res/rscclass.cxx
View File

@@ -277,16 +277,6 @@ ERRTYPE RscClass::SetVariable( Atom nVarName,
return ERR_OK; return ERR_OK;
} }
ERRTYPE RscClass::SetVariable( Atom nVarName,
RscTop * pClass,
RSCINST * pDflt,
RSCVAR nVarType,
SfxSlotInfo nMask,
Atom nDataBaseName)
{
return SetVariable(nVarName, pClass, pDflt, nVarType, (sal_uInt32)nMask, nDataBaseName);
}
void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc ) void RscClass::EnumVariables( void * pData, VarEnumCallbackProc pProc )
{ {
sal_uInt32 i; sal_uInt32 i;

11
rsc/source/res/rsctop.cxx
View File

@@ -102,17 +102,6 @@ ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
return ERR_UNKNOWN_METHOD; return ERR_UNKNOWN_METHOD;
} }
ERRTYPE RscTop::SetVariable( Atom nVarName, RscTop * pClass,
RSCINST * pDflt, RSCVAR nVarType, SfxSlotInfo nMask,
Atom nDataBaseName )
{
if( pSuperClass )
return pSuperClass->SetVariable( nVarName, pClass, pDflt,
nVarType, nMask, nDataBaseName );
else
return ERR_UNKNOWN_METHOD;
}
void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc ) void RscTop::EnumVariables( void * pData, VarEnumCallbackProc pProc )
{ {
if( pSuperClass ) if( pSuperClass )