summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-28 21:07:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-29 09:33:44 +0100
commitc50612d51619fb92393f32c6832628ffbbdcb920 (patch)
tree0f3c7976073cf1eb1dc47545647b91e4d8462097
parent42fe8b9f11da41530a6d914397b6301a72db3800 (diff)
callcatcher: unused code
-rw-r--r--basic/inc/basic/sbmeth.hxx1
-rw-r--r--basic/source/classes/sbxmod.cxx8
-rw-r--r--editeng/inc/editeng/outliner.hxx20
-rw-r--r--editeng/source/outliner/outlvw.cxx174
-rw-r--r--svx/source/dialog/_bmpmask.cxx11
-rw-r--r--toolkit/source/awt/vclxwindow.cxx1
-rw-r--r--unusedcode.easy5
-rw-r--r--vcl/inc/vcl/event.hxx3
-rw-r--r--vcl/source/window/mouseevent.cxx27
-rw-r--r--xmloff/inc/MultiPropertySetHelper.hxx2
-rw-r--r--xmloff/source/style/MultiPropertySetHelper.cxx20
11 files changed, 6 insertions, 266 deletions
diff --git a/basic/inc/basic/sbmeth.hxx b/basic/inc/basic/sbmeth.hxx
index 03de66f68d46..8268b60159ad 100644
--- a/basic/inc/basic/sbmeth.hxx
+++ b/basic/inc/basic/sbmeth.hxx
@@ -65,7 +65,6 @@ public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2);
TYPEINFO();
virtual SbxInfo* GetInfo();
- SbxArray* GetLocals();
SbxArray* GetStatics();
void ClearStatics();
SbModule* GetModule() { return pMod; }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 2fd6fbf0fc7e..3c2f1f2a2116 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2063,14 +2063,6 @@ SbMethod::~SbMethod()
{
}
-SbxArray* SbMethod::GetLocals()
-{
- if( pINST )
- return pINST->GetLocals( this );
- else
- return NULL;
-}
-
void SbMethod::ClearStatics()
{
refStatics = new SbxArray;
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 9a6872712623..23dfe65181da 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -238,14 +238,11 @@ private:
EDITENG_DLLPRIVATE void ImpHideDDCursor();
EDITENG_DLLPRIVATE void ImpPaintDDCursor();
- EDITENG_DLLPRIVATE void ImpDragScroll( const Point& rPosPix );
EDITENG_DLLPRIVATE void ImpScrollLeft();
EDITENG_DLLPRIVATE void ImpScrollRight();
EDITENG_DLLPRIVATE void ImpScrollUp();
EDITENG_DLLPRIVATE void ImpScrollDown();
- EDITENG_DLLPRIVATE sal_uLong ImpGetInsertionPara( const Point& rPosPixel );
- EDITENG_DLLPRIVATE Point ImpGetDocPos( const Point& rPosPixel );
EDITENG_DLLPRIVATE Pointer ImpGetMousePointer( MouseTarget eTarget );
EDITENG_DLLPRIVATE sal_uInt16 ImpInitPaste( sal_uLong& rStart );
EDITENG_DLLPRIVATE void ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize);
@@ -271,7 +268,6 @@ public:
void ShowCursor( sal_Bool bGotoCursor = sal_True );
void HideCursor();
- void SetOutliner( Outliner* pOutliner );
Outliner* GetOutliner() const { return pOwner; }
void SetWindow( Window* pWindow );
@@ -299,10 +295,6 @@ public:
void AdjustDepth( short nDX ); // Later replace with Indent!
sal_Bool AdjustHeight( long nDY );
- void AdjustDepth( Paragraph* pPara, short nDX,
- sal_Bool bWithChilds = sal_False );
- void AdjustHeight( Paragraph* pPara, long nDY,
- sal_Bool bWithChilds=sal_False );
sal_uLong Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL );
@@ -310,8 +302,6 @@ public:
void InsertText( const OutlinerParaObject& rParaObj );
void Expand();
void Collapse();
- void Expand( Paragraph* );
- void Collapse( Paragraph* );
void ExpandAll();
void CollapseAll();
@@ -324,12 +314,7 @@ public:
void Copy();
void Paste();
void PasteSpecial();
- void EnablePaste( sal_Bool bEnable );
- void Undo();
- void Redo();
-
- void SetStyleSheet( SfxStyleSheet* );
SfxStyleSheet* GetStyleSheet() const;
void SetControlWord( sal_uLong nWord );
@@ -340,9 +325,6 @@ public:
Pointer GetPointer( const Point& rPosPixel );
void Command( const CommandEvent& rCEvt );
- void RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich = 0 );
-
- void CompleteAutoCorrect();
EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False );
EESpellState StartThesaurus();
@@ -366,7 +348,6 @@ public:
void InsertField( const SvxFieldItem& rFld );
const SvxFieldItem* GetFieldUnderMousePointer() const;
- const SvxFieldItem* GetFieldUnderMousePointer( sal_uInt16& nPara, xub_StrLen& nPos ) const;
const SvxFieldItem* GetFieldAtSelection() const;
/** enables numbering for the selected paragraphs if the numbering of the first paragraph is off
@@ -381,7 +362,6 @@ public:
sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
- void SpellIgnoreWord();
void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
void SetInvalidateMore( sal_uInt16 nPixel );
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index f8fe488adb9d..2c87222b5675 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -458,34 +458,6 @@ void OutlinerView::ImpPaintDDCursor()
pWindow->SetRasterOp( eOldOp );
}
-// Calculates above which paragraph must it must be inserted
-
-sal_uLong OutlinerView::ImpGetInsertionPara( const Point& rPosPixel )
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nCurPara = pEditView->GetParagraph( rPosPixel );
- ParagraphList* pParaList = pOwner->pParaList;
-
- if ( nCurPara == EE_PARA_NOT_FOUND )
- nCurPara = LIST_APPEND;
- else
- {
- Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPixel );
- Point aParaPosWin = pEditView->GetWindowPosTopLeft((sal_uInt16)nCurPara);
- long nHeightRef = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nCurPara);
- long nParaYOffs = aPosWin.Y() - aParaPosWin.Y();
-
- if ( nParaYOffs > nHeightRef / 2 )
- {
- Paragraph* p = pParaList->GetParagraph( nCurPara );
- p = pParaList->NextVisible( p );
- nCurPara = p ? pParaList->GetAbsPos( p ) : LIST_APPEND;
- }
- }
- return nCurPara;
-}
-
-
void OutlinerView::ImpToggleExpand( Paragraph* pPara )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -496,16 +468,6 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
pEditView->ShowCursor();
}
-
-void OutlinerView::SetOutliner( Outliner* pOutliner )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner = pOutliner;
- pEditView->SetEditEngine( pOutliner->pEditEngine );
-}
-
-
-
sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
sal_Bool bWithChilds )
{
@@ -725,66 +687,12 @@ sal_Bool OutlinerView::AdjustHeight( long nDY )
return sal_True; // remove return value...
}
-void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, sal_Bool bWithChilds)
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- sal_uLong nEndPara = nStartPara;
- if ( bWithChilds )
- nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel((sal_uInt16)nStartPara, 0,(sal_uInt16)nEndPara, 0xffff );
- pEditView->SetSelection( aSel );
- AdjustDepth( nDX );
-}
-
-void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, sal_Bool bWithChilds )
-{
- DBG_CHKTHIS(OutlinerView,0);
- sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- sal_uLong nEndPara = nStartPara;
- if ( bWithChilds )
- nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel( (sal_uInt16)nStartPara, 0, (sal_uInt16)nEndPara, 0xffff );
- pEditView->SetSelection( aSel );
- AdjustHeight( nDY );
-}
-
-
Rectangle OutlinerView::GetVisArea() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetVisArea();
}
-
-Point OutlinerView::ImpGetDocPos( const Point& rPosPixel )
-{
- DBG_CHKTHIS(OutlinerView,0);
- Rectangle aOutArWin = GetOutputArea();
- // Calculate position in the OutputArea
- Point aCurPosDoc( rPosPixel );
- aCurPosDoc = pEditView->GetWindow()->PixelToLogic( aCurPosDoc );
- aCurPosDoc -= aOutArWin.TopLeft();
- aCurPosDoc += pEditView->GetVisArea().TopLeft();
- return aCurPosDoc;
-}
-
-void OutlinerView::ImpDragScroll( const Point& rPosPix )
-{
- DBG_CHKTHIS(OutlinerView,0);
- Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
- Rectangle aOutputArWin = pEditView->GetOutputArea();
- if ( aPosWin.X() <= aOutputArWin.Left() + nDDScrollLRBorderWidthWin)
- ImpScrollLeft();
- else if( aPosWin.X() >= aOutputArWin.Right()- nDDScrollLRBorderWidthWin)
- ImpScrollRight();
- else if( aPosWin.Y() <= aOutputArWin.Top() + nDDScrollTBBorderWidthWin)
- ImpScrollUp();
- else if(aPosWin.Y() >= aOutputArWin.Bottom() - nDDScrollTBBorderWidthWin)
- ImpScrollDown();
-}
-
-
void OutlinerView::ImpScrollLeft()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -943,20 +851,6 @@ void OutlinerView::ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPa
}
}
-
-void OutlinerView::Expand( Paragraph* pPara)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner->Expand( pPara );
-}
-
-
-void OutlinerView::Collapse( Paragraph* pPara)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pOwner->Collapse( pPara );
-}
-
void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
{
// Like Paste, only EditView::Insert, instead of EditView::Paste.
@@ -1047,19 +941,6 @@ SfxStyleSheet* OutlinerView::GetStyleSheet() const
return pEditView->GetStyleSheet();
}
-void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->SetStyleSheet( pStyle );
-
- ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
- for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
- {
- pOwner->ImplCheckNumBulletItem( nPara );
- pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
- }
-}
-
Pointer OutlinerView::GetPointer( const Point& rPosPixel )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1375,28 +1256,12 @@ XubString OutlinerView::GetSelected() const
return pEditView->GetSelected();
}
-
-void OutlinerView::RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich)
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->RemoveCharAttribs( (sal_uInt16)nPara, nWhich);
-}
-
-
-void OutlinerView::CompleteAutoCorrect()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->CompleteAutoCorrect();
-}
-
-
EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->StartSpeller( bMultiDoc );
}
-
EESpellState OutlinerView::StartThesaurus()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1479,28 +1344,6 @@ EVAnchorMode OutlinerView::GetAnchorMode() const
return pEditView->GetAnchorMode();
}
-
-void OutlinerView::Undo()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->Undo();
-}
-
-
-void OutlinerView::Redo()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->Redo();
-}
-
-
-void OutlinerView::EnablePaste( sal_Bool bEnable )
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->EnablePaste( bEnable );
-}
-
-
void OutlinerView::Copy()
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1514,21 +1357,12 @@ void OutlinerView::InsertField( const SvxFieldItem& rFld )
pEditView->InsertField( rFld );
}
-
const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetFieldUnderMousePointer();
}
-
-const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
-{
- DBG_CHKTHIS(OutlinerView,0);
- return pEditView->GetFieldUnderMousePointer( nPara, nPos );
-}
-
-
const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
{
DBG_CHKTHIS(OutlinerView,0);
@@ -1562,14 +1396,6 @@ sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool
return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
}
-
-void OutlinerView::SpellIgnoreWord()
-{
- DBG_CHKTHIS(OutlinerView,0);
- pEditView->SpellIgnoreWord();
-}
-
-
void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
{
DBG_CHKTHIS(OutlinerView,0);
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index d85cbaf1cb00..cc392c78180f 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -105,8 +105,7 @@ class MaskSet : public ValueSet
public:
- MaskSet( SvxBmpMask* pParent, WinBits nWinStyle );
- MaskSet( SvxBmpMask* pParent, const ResId& rId );
+ MaskSet( SvxBmpMask* pParent, const ResId& rId );
virtual void Select();
virtual void KeyInput( const KeyEvent& rKEvt );
@@ -117,14 +116,6 @@ public:
//-------------------------------------------------------------------------
-MaskSet::MaskSet( SvxBmpMask* pParent, WinBits nWinStyle ) :
- ValueSet ( pParent, nWinStyle ),
- pSvxBmpMask ( pParent )
-{
-}
-
-//-------------------------------------------------------------------------
-
MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) :
ValueSet ( pParent, rId ),
pSvxBmpMask ( pParent )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index def82b41ee9b..0b5f23609fa9 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1490,6 +1490,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com::
case MouseWheelBehavior::SCROLL_FOCUS_ONLY: nVclBehavior = MOUSE_WHEEL_FOCUS_ONLY; break;
case MouseWheelBehavior::SCROLL_ALWAYS: nVclBehavior = MOUSE_WHEEL_ALWAYS; break;
default:
+ fprintf(stderr, "nVclBehavior is %d\n", nWheelBehavior);
OSL_FAIL( "VCLXWindow::setProperty( 'MouseWheelBehavior' ): illegal property value!" );
}
diff --git a/unusedcode.easy b/unusedcode.easy
index fb29748c55a7..3eb0e3b4aacc 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1385,6 +1385,10 @@ WP42SubDocument::WP42SubDocument(unsigned char*, unsigned int)
WP6SubDocument::WP6SubDocument(WPXInputStream*, WPXEncryption*, unsigned int)
WPGTextDataHandler::endSubDocument()
WPS8Parser::readText(WPXInputStream*, WPS8ContentListener*)
+WPSContentListener::closeEndnote()
+WPSContentListener::closeFootnote()
+WPSContentListener::openEndnote()
+WPSContentListener::openFootnote()
WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
@@ -1980,7 +1984,6 @@ binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortionArr const*,
binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const&, unsigned short&)
binfilter::SwXRedlinePortionArr::Insert(binfilter::SwXRedlinePortion_Impl* const*, unsigned short)
binfilter::SwXRedlinePortionArr::Remove(binfilter::SwXRedlinePortion_Impl* const&, unsigned short)
-binfilter::SwXTextCursor::SwXTextCursor(com::sun::star::uno::Reference<com::sun::star::text::XText>, binfilter::SwUnoCrsr*, binfilter::CursorType)
binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
binfilter::SwpHtEnd::Insert(binfilter::SwTxtAttr const**, unsigned short)
binfilter::SwpHtEnd::Insert(binfilter::SwpHtEnd const*, unsigned short, unsigned short)
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 9e8666ea7c78..2fe32e7c9d55 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.hxx
@@ -143,9 +143,6 @@ public:
/** inits this vcl KeyEvent with all settings from the given awt event **/
MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent );
- /** fills out the given awt KeyEvent with all settings from this vcl event **/
- void InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) const;
-
sal_uInt16 GetClicks() const { return mnClicks; }
sal_Bool IsEnterWindow() const
diff --git a/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index 2e76750e1cf5..220bad75496f 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.cxx
@@ -65,31 +65,4 @@ MouseEvent::MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent )
}
}
-/** fills out the given awt KeyEvent with all settings from this vcl event **/
-void MouseEvent::InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) const
-{
- rEvent.Modifiers = 0;
- if ( IsShift() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::SHIFT;
- if ( IsMod1() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD1;
- if ( IsMod2() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD2;
- if ( IsMod3() )
- rEvent.Modifiers |= ::com::sun::star::awt::KeyModifier::MOD3;
-
- rEvent.Buttons = 0;
- if ( IsLeft() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::LEFT;
- if ( IsRight() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::RIGHT;
- if ( IsMiddle() )
- rEvent.Buttons |= ::com::sun::star::awt::MouseButton::MIDDLE;
-
- rEvent.X = GetPosPixel().X();
- rEvent.Y = GetPosPixel().Y();
- rEvent.ClickCount = GetClicks();
- rEvent.PopupTrigger = sal_False;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index a64e8c8524dd..2c7d7abf7f96 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -90,8 +90,6 @@ public:
MultiPropertySetHelper( const sal_Char** pNames );
- MultiPropertySetHelper( const ::rtl::OUString* pNames );
-
~MultiPropertySetHelper();
diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx
index dc5e2eee6cc7..ae3f9636435d 100644
--- a/xmloff/source/style/MultiPropertySetHelper.cxx
+++ b/xmloff/source/style/MultiPropertySetHelper.cxx
@@ -72,25 +72,6 @@ MultiPropertySetHelper::MultiPropertySetHelper(
pPropertyNames[i] = OUString::createFromAscii( pNames[i] );
}
-MultiPropertySetHelper::MultiPropertySetHelper(
- const OUString* pNames ) :
- pPropertyNames( NULL ),
- nLength( 0 ),
- aPropertySequence(),
- pSequenceIndex( NULL ),
- aValues(),
- pValues( NULL )
-{
- // count elements
- for( const OUString* pPtr = pNames; pPtr != NULL; pPtr++ )
- nLength++;
-
- // allocate array and assign strings
- pPropertyNames = new OUString[nLength];
- for( sal_Int16 i = 0; i < nLength; i++ )
- pPropertyNames[i] = pNames[i];
-}
-
MultiPropertySetHelper::~MultiPropertySetHelper()
{
@@ -101,7 +82,6 @@ MultiPropertySetHelper::~MultiPropertySetHelper()
}
-
void MultiPropertySetHelper::hasProperties(
const Reference<XPropertySetInfo> & rInfo )
{