Kaydet (Commit) 74713b34 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

loplugin:unusedmethods

Change-Id: Ib36bc0e87d00abb638cbfec511cd13b6179eabda
Reviewed-on: https://gerrit.libreoffice.org/25431Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 132f7b2a
......@@ -1143,35 +1143,6 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
return GetGraphicStream( GetEmbeddedObjectName( xObj ), pMediaType );
}
uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetObjectStream( const OUString& aName, OUString* pMediaType )
{
uno::Reference < io::XInputStream > xInputStream;
SAL_WARN_IF( aName.isEmpty(), "comphelper.container", "Retrieving stream for unknown object!" );
if ( !aName.isEmpty() )
{
try
{
uno::Reference < io::XStream > xStream = pImpl->mxStorage->cloneStreamElement( aName ); //get a readonly clone
xInputStream = xStream->getInputStream();
if ( pMediaType )
{
uno::Reference < beans::XPropertySet > xSet( xInputStream, uno::UNO_QUERY );
if ( xSet.is() )
{
uno::Any aAny = xSet->getPropertyValue("MediaType");
aAny >>= *pMediaType;
}
}
}
catch (const uno::Exception&)
{
}
}
return xInputStream;
}
bool EmbeddedObjectContainer::InsertGraphicStream( const css::uno::Reference < css::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
{
try
......
......@@ -105,13 +105,10 @@ IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl)
IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl)
IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl)
IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl);
IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl);
IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractScriptSelectorDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractURLDlg_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl);
......@@ -124,7 +121,6 @@ IMPL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxObjectTitleDescDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxMultiPathDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxPathSelectDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl);
......@@ -409,16 +405,6 @@ SfxBindings& AbstractSpellDialog_Impl::GetBindings()
return pDlg->GetBindings();
}
void AbstractSearchProgress_Impl::Update()
{
pDlg->Update();
}
void AbstractTakeProgress_Impl::Update()
{
pDlg->Update();
}
OUString AbstractTitleDialog_Impl::GetTitle() const
{
return pDlg->GetTitle();
......
......@@ -201,22 +201,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
virtual SfxBindings& GetBindings() override;
};
class SearchProgress;
class AbstractSearchProgress_Impl : public AbstractSearchProgress
{
DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress)
virtual void Update() override ;
};
class TakeProgress;
class AbstractTakeProgress_Impl : public AbstractTakeProgress
{
DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress)
virtual void Update() override ;
};
class TitleDialog;
class AbstractTitleDialog_Impl : public AbstractTitleDialog
{
......@@ -255,13 +239,6 @@ class AbstractURLDlg_Impl :public AbstractURLDlg
virtual OUString GetName() const override;
};
class SvxHlinkDlgMarkWnd;
class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
};
class SvxSearchSimilarityDialog;
class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
{
......@@ -356,12 +333,6 @@ class AbstractSvxObjectTitleDescDialog_Impl :public AbstractSvxObjectTitleDescDi
virtual void GetDescription(OUString& rName) override;
};
class SvxMessDialog;
class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog
{
DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog)
};
class SvxMultiPathDialog;
class AbstractSvxMultiPathDialog_Impl : public AbstractSvxMultiPathDialog
{
......
......@@ -263,7 +263,6 @@ private:
DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void );
void ModifyStepCountHdl_Impl(void*);
//UUUU
DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void );
......
......@@ -42,7 +42,6 @@ struct ReleaseNote
OUString URL2;
ReleaseNote(sal_uInt8 pos, const OUString& aURL) : Pos(pos), URL(aURL), Pos2(0), URL2() {};
ReleaseNote(sal_uInt8 pos, const OUString& aURL, sal_uInt8 pos2, const OUString& aURL2) : Pos(pos), URL(aURL), Pos2(pos2), URL2(aURL2) {};
ReleaseNote(const ReleaseNote& rn) :Pos(rn.Pos), URL(rn.URL), Pos2(rn.Pos2), URL2(rn.URL2) {};
ReleaseNote & operator=( const ReleaseNote& rn) { Pos=rn.Pos; URL=rn.URL; Pos2=rn.Pos2; URL2=rn.URL2; return *this; };
......
......@@ -65,9 +65,6 @@ bool PlainTextFilterDetect_supportsService(const OUString& ServiceName);
css::uno::Sequence<OUString> PlainTextFilterDetect_getSupportedServiceNames();
css::uno::Reference<css::uno::XInterface>
PlainTextFilterDetect_createInstance(const css::uno::Reference<css::uno::XComponentContext>& rCxt);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -779,57 +779,6 @@ FormulaTokenArray& FormulaTokenArray::operator=( const FormulaTokenArray& rArr )
return *this;
}
FormulaTokenArray* FormulaTokenArray::Clone() const
{
FormulaTokenArray* p = new FormulaTokenArray;
p->nLen = nLen;
p->nRPN = nRPN;
p->nMode = nMode;
p->nError = nError;
p->bHyperLink = bHyperLink;
p->mbFromRangeName = mbFromRangeName;
FormulaToken** pp;
if( nLen )
{
pp = p->pCode = new FormulaToken*[ nLen ];
memcpy( pp, pCode, nLen * sizeof( FormulaToken* ) );
for( sal_uInt16 i = 0; i < nLen; i++, pp++ )
{
*pp = (*pp)->Clone();
(*pp)->IncRef();
}
}
if( nRPN )
{
pp = p->pRPN = new FormulaToken*[ nRPN ];
memcpy( pp, pRPN, nRPN * sizeof( FormulaToken* ) );
for( sal_uInt16 i = 0; i < nRPN; i++, pp++ )
{
FormulaToken* t = *pp;
if( t->GetRef() > 1 )
{
FormulaToken** p2 = pCode;
sal_uInt16 nIdx = 0xFFFF;
for( sal_uInt16 j = 0; j < nLen; j++, p2++ )
{
if( *p2 == t )
{
nIdx = j; break;
}
}
if( nIdx == 0xFFFF )
*pp = t->Clone();
else
*pp = p->pCode[ nIdx ];
}
else
*pp = t->Clone();
(*pp)->IncRef();
}
}
return p;
}
void FormulaTokenArray::Clear()
{
if( nRPN ) DelRPN();
......
......@@ -143,9 +143,6 @@ public:
// move an embedded object to another container (keep the persistent name)
bool MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
// get the stored representation for the object
css::uno::Reference < css::io::XInputStream > GetObjectStream( const OUString& aName, OUString* pMediaType );
// get the stored graphical representation for the object
css::uno::Reference < css::io::XInputStream > GetGraphicStream( const css::uno::Reference < css::embed::XEmbeddedObject >&, OUString* pMediaType=nullptr );
......
......@@ -159,7 +159,6 @@ public:
/// Assignment with references to FormulaToken entries (not copied!)
FormulaTokenArray( const FormulaTokenArray& );
virtual ~FormulaTokenArray();
FormulaTokenArray* Clone() const; /// True copy!
void SetFromRangeName( bool b ) { mbFromRangeName = b; }
bool IsFromRangeName() const { return mbFromRangeName; }
......
......@@ -117,10 +117,6 @@ private:
| +- EditWrapper [1]
| +- ColorListBoxWrapper [1]
| |
| +- NumericFieldWrapper< ValueT > [1]
| | |
| | +- [ValueType]NumericFieldWrapper [1] [2]
| |
| +- MetricFieldWrapper< ValueT > [1]
| | |
| | +- [ValueType]MetricFieldWrapper [1] [2]
......@@ -265,22 +261,6 @@ public:
};
/** A wrapper for the VCL NumericField. */
template< typename ValueT >
class NumericFieldWrapper : public SingleControlWrapper< NumericField, ValueT >
{
public:
inline explicit NumericFieldWrapper( NumericField& rField ) :
SingleControlWrapper< NumericField, ValueT >( rField ) {}
virtual bool IsControlDontKnow() const SAL_OVERRIDE;
virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE;
virtual ValueT GetControlValue() const SAL_OVERRIDE;
virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE;
};
/** A wrapper for the VCL MetricField.
Adds support for field units during accessing the control value. The
......@@ -498,32 +478,6 @@ inline void SingleControlWrapper< ControlT, ValueT >::ModifyControl( TriState eE
}
template< typename ValueT >
bool NumericFieldWrapper< ValueT >::IsControlDontKnow() const
{
return this->GetControl().GetText().Len() == 0;
}
template< typename ValueT >
void NumericFieldWrapper< ValueT >::SetControlDontKnow( bool bSet )
{
if( bSet )
this->GetControl().SetText( OUString() );
}
template< typename ValueT >
ValueT NumericFieldWrapper< ValueT >::GetControlValue() const
{
return static_cast< ValueT >( this->GetControl().Denormalize( this->GetControl().GetValue() ) );
}
template< typename ValueT >
void NumericFieldWrapper< ValueT >::SetControlValue( ValueT nValue )
{
this->GetControl().SetValue( this->GetControl().Normalize( static_cast< sal_Int64 >( nValue ) ) );
}
template< typename ValueT >
bool MetricFieldWrapper< ValueT >::IsControlDontKnow() const
{
......
......@@ -69,15 +69,11 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
INetURLObject aActualURL;
OUString aName;
Size aMargin;
long nWidth;
ScrollingMode eScroll;
SizeSelector eSizeSelector;
bool bHasBorder;
bool bHasBorderSet;
sal_uInt16 nItemId;
bool bResizeHorizontal;
bool bResizeVertical;
bool bHasUI;
bool bReadOnly;
std::unique_ptr< SfxFrameDescriptor_Impl > pImpl;
......@@ -130,9 +126,6 @@ public:
{ return bHasBorderSet; }
void ResetBorder()
{ bHasBorder = false; bHasBorderSet = false; }
// Copy for example for Views
SfxFrameDescriptor* Clone() const;
};
#endif // INCLUDED_SFX2_FRMDESCR_HXX
......
......@@ -95,9 +95,6 @@ public:
const OUString& getCurRegionName () const { return maCurRegionName;}
// Check if the root region is visible or not.
bool isNonRootRegionVisible () const { return mnCurRegionId > 0;}
void setOpenRegionHdl(const Link<void*,void> &rLink);
void setRightClickHdl(const Link<ThumbnailViewItem*,void> &rLink);
......
......@@ -99,10 +99,6 @@ private:
void OnCategoryNew ();
void OnCategoryDelete();
void OnRegionState (const ThumbnailViewItem *pItem);
void OnRepositoryDelete ();
void createRepositoryMenu ();
void createDefaultTemplateMenu ();
......
......@@ -51,8 +51,6 @@ public:
DECL_LINK_TYPED(ContextMenuSelectHdl, Menu*, bool);
sal_uInt16 getCurRegionItemId () const;
TemplateContainerItem* getRegion(OUString const & sStr);
sal_uInt16 getRegionId (size_t pos) const;
......@@ -81,9 +79,6 @@ public:
bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath);
// Import a template to the current region
bool copyFrom (const OUString &rPath);
bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath);
bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName);
......
......@@ -228,9 +228,6 @@ public:
void filterItems (const std::function<bool (const ThumbnailViewItem*) > &func);
void sortItems (const std::function<bool (const ThumbnailViewItem*,
const ThumbnailViewItem*) > &func);
void setItemStateHdl (const Link<const ThumbnailViewItem*,void> &aLink) { maItemStateHdl = aLink; }
virtual void Resize() override;
......
......@@ -231,9 +231,6 @@ public:
NfCurrencyEntry( const css::i18n::Currency & rCurr,
const LocaleDataWrapper& rLocaleData,
LanguageType eLang );
inline NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol,
LanguageType eLang, sal_uInt16 nPositiveFmt,
sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero);
~NfCurrencyEntry() {}
/// Symbols and language identical
......@@ -282,19 +279,6 @@ public:
static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
};
/**
* Necessary for ptr_vector on Windows. Please don't remove these, or at
* least check it on Windows before attempting to remove them.
*/
NfCurrencyEntry::NfCurrencyEntry(const OUString& rSymbol, const OUString& rBankSymbol,
LanguageType eLang, sal_uInt16 nPositiveFmt,
sal_uInt16 nNegativeFmt, sal_uInt16 nDig, sal_Unicode cZero)
: aSymbol(rSymbol), aBankSymbol(rBankSymbol), eLanguage(eLang)
, nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt)
, nDigits(nDig), cZeroChar(cZero)
{
}
typedef std::vector< OUString > NfWSStringsDtor;
class SvNumberFormatterRegistry_Impl;
......
......@@ -104,7 +104,6 @@ public:
// instead of the automatic color
ColorConfigValue GetColorValue(ColorConfigEntry eEntry, bool bSmart = true) const;
static Color GetDefaultColor(ColorConfigEntry eEntry);
void Reload();
};
class SVT_DLLPUBLIC EditableColorConfig
......
......@@ -55,7 +55,6 @@ public:
protected:
bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const;
bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const;
private:
......
......@@ -139,7 +139,6 @@ public:
bool IsCompletelyDisabled() const { return mbCompleteDisable; }
void DoCompletelyDisable(bool bNew);
void SetCS(CTL_STYLE eNew);
};
/*************************************************************************
......
......@@ -102,7 +102,6 @@ private:
public:
// Construction/Destruction
CursorWrapper() { }
CursorWrapper(const css::uno::Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false);
SVX_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false);
// if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement)
......
......@@ -32,7 +32,6 @@ private:
Point maEnd;
public:
Line() {};
Line( const Point& rStartPt, const Point& rEndPt ) : maStart( rStartPt ), maEnd( rEndPt ) {}
void SetStart( const Point& rStartPt ) { maStart = rStartPt; }
......
......@@ -83,7 +83,6 @@ class TOOLS_DLLPUBLIC StringRangeEnumerator
sal_Int32 nFirst;
sal_Int32 nLast;
Range() : nFirst( -1 ), nLast( -1 ) {}
Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {}
};
std::vector< StringRangeEnumerator::Range > maSequence;
......
......@@ -138,21 +138,6 @@ public:
typedef tools::SvRef<SvLockBytes> SvLockBytesRef;
// SvOpenLockBytes
class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes
{
public:
SvOpenLockBytes() : SvLockBytes(nullptr, false) {}
SvOpenLockBytes(SvStream * pStream, bool bOwner):
SvLockBytes(pStream, bOwner) {}
virtual ErrCode FillAppend(const void * pBuffer, sal_Size nCount,
sal_Size * pWritten) = 0;
};
// SvStream
class TOOLS_DLLPUBLIC SvStream
......
......@@ -80,10 +80,6 @@ private:
class VBAHELPER_DLLPUBLIC SimpleEnumerationBase : public EnumerationHelper_BASE
{
public:
explicit SimpleEnumerationBase(
const css::uno::Reference< css::container::XEnumeration >& rxEnumeration ) throw (css::uno::RuntimeException) :
mxEnumeration( rxEnumeration ) {}
explicit SimpleEnumerationBase(
const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) :
mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {}
......
......@@ -58,8 +58,6 @@ protected:
css::uno::WeakReference< ov::XHelperInterface > mxParent;
css::uno::Reference< css::uno::XComponentContext > mxContext;
public:
InheritedHelperInterfaceImpl() {}
InheritedHelperInterfaceImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxContext( xContext ) {}
InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
virtual OUString getServiceImplName() = 0;
virtual css::uno::Sequence<OUString> getServiceNames() = 0;
......@@ -102,8 +100,6 @@ class SAL_DLLPUBLIC_TEMPLATE InheritedHelperInterfaceWeakImpl : public Inherited
{
typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > > Base;
public:
InheritedHelperInterfaceWeakImpl< Ifc... >() {}
InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xContext ) {}
InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
};
......
......@@ -51,24 +51,6 @@ namespace ooo
ReturnInteger( sal_Int32 nValue ) : ReturnInteger_BASE( nValue ){}
};
typedef DefaultReturnHelper< sal_Bool, ov::msforms::XReturnBoolean > ReturnBoolean_BASE;
class ReturnBoolean : public ReturnBoolean_BASE
{
public:
ReturnBoolean( bool bValue ) : ReturnBoolean_BASE( bValue ){}
};
typedef DefaultReturnHelper< float, ov::msforms::XReturnSingle > ReturnSingle_BASE;
class ReturnSingle : public ReturnSingle_BASE
{
public:
ReturnSingle( float nValue ) : ReturnSingle_BASE( nValue ){}
};
typedef DefaultReturnHelper< short, ov::msforms::XReturnEffect > ReturnEffect_BASE;
class ReturnEffect : public ReturnEffect_BASE
{
public:
ReturnEffect( short nValue ) : ReturnEffect_BASE( nValue ){}
};
} // vba
} // ooo
......
......@@ -37,12 +37,6 @@ struct XMLNumberFormat
sal_Int32 nNumberFormat;
sal_Int16 nType;
bool bIsStandard : 1;
XMLNumberFormat()
: nNumberFormat(0)
, nType(0)
, bIsStandard(false)
{
}
XMLNumberFormat(const OUString& sTempCurrency, sal_Int32 nTempFormat)
: sCurrency(sTempCurrency)
......
......@@ -238,12 +238,6 @@ protected:
::xmloff::token::XMLTokenEnum eGroupName;
css::uno::Sequence< css::beans::PropertyValue > aSettings;
SettingsGroup()
:eGroupName( ::xmloff::token::XML_TOKEN_INVALID )
,aSettings()
{
}
SettingsGroup(
const ::xmloff::token::XMLTokenEnum _eGroupName,
const css::uno::Sequence< css::beans::PropertyValue >& _rSettings )
......
......@@ -117,7 +117,6 @@ private:
protected:
XMLParentNode( XMLParentNode *pPar )
: XMLChildNode( pPar ) {}
XMLParentNode() {}
XMLParentNode( const XMLParentNode& );
......
......@@ -39,8 +39,6 @@ struct LangSvcEntries
bool bAlreadyWarned;
bool bDoWarnAgain;
LangSvcEntries() : nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false) {}
explicit LangSvcEntries( const css::uno::Sequence< OUString > &rSvcImplNames ) :
aSvcImplNames(rSvcImplNames),
nLastTriedSvcIndex(-1), bAlreadyWarned(false), bDoWarnAgain(false)
......
......@@ -194,7 +194,6 @@ class RscTypCont
RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
RscTop * InitClassRadioButton( RscTop * pSuper );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
RscTop * InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem );
RscTop * InitClassMenuItem( RscTop * pSuper, RscTop * pClassBitmap );
RscTop * InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
......
......@@ -145,7 +145,6 @@ public:
sal_uLong GetFileKey() const { return lFileKey; }
void Evaluate();
sal_Int32 GetNumber() const { return lId; }
OString GetMacro();
};
typedef ::std::vector< RscDefine* > RscSubDefList;
......
......@@ -643,34 +643,6 @@ RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
return pClassKeyCode;
}
RscTop * RscTypCont::InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem )
{
Atom nId;
RscTop * pClassAccel;
// initialize class
nId = pHS->getID( "Accelerator" );
pClassAccel = new RscClass( nId, RSC_ACCEL, pSuper );
pClassAccel->SetCallPar( *pStdPar1, *pStdPar2, *pStdParType );
aNmTb.Put( nId, CLASSNAME, pClassAccel );
// initialize variables
nId = aNmTb.Put( "HelpText", VARNAME );
pClassAccel->SetVariable( nId, &aLangString );
{
RscCont * pCont;
aBaseLst.push_back(
pCont = new RscCont( pHS->getID( "ContAcceleratorKey" ), RSC_NOTYPE )
);
pCont->SetTypeClass( pClassAccelItem );
nId = aNmTb.Put( "ItemList", VARNAME );
pClassAccel->SetVariable( nId, pCont );
}
return pClassAccel;
}
RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper,
RscTop * pClassBitmap )
{
......
......@@ -173,13 +173,6 @@ RscDefine * RscDefine::Search( const char * pStr )
return static_cast<RscDefine *>(StringNode::Search( pStr ));
}
OString RscDefine::GetMacro()
{
if( pExp )
return pExp->GetMacro();
return OString::number(lId);
}
RscDefine * RscDefineList::New( sal_uLong lFileKey, const OString& rDefName,
sal_Int32 lDefId, size_t lPos )
{
......
......@@ -59,7 +59,6 @@ public:
void GetVars( sal_Int32& nColP, sal_Int32& nRowP, sal_Int32& nTabP ) const
{ nColP = nCol; nRowP = nRow; nTabP = nTab; }
inline void PutInOrder( ScBigAddress& r );
bool IsValid( const ScDocument* pDoc ) const;
inline ScAddress MakeAddress() const;
......@@ -73,29 +72,6 @@ public:
{ return !operator==( r ); }
};
inline void ScBigAddress::PutInOrder( ScBigAddress& r )
{
sal_Int32 nTmp;
if ( r.nCol < nCol )
{
nTmp = r.nCol;
r.nCol = nCol;
nCol = nTmp;
}
if ( r.nRow < nRow )
{
nTmp = r.nRow;
r.nRow = nRow;
nRow = nTmp;
}
if ( r.nTab < nTab )