Resolves: #i122067# show correct state in paragraph property panel
i.e. the paragraph property panel's bullet and numbering popup control
(cherry picked from commit 167f05365100f6c9bcbd17045e4feeea3cd120d9)
Conflicts:
svx/source/sidebar/paragraph/ParaBulletsControl.cxx
svx/source/sidebar/paragraph/ParaNumberingControl.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Change-Id: Iacea3f063d1050f873cff443fb3e1df4b8983279
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
index 89ae29d..0ebc1db 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
@@ -31,32 +31,28 @@
namespace svx { namespace sidebar {
ParaBulletsControl::ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel)
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_BULLETS))
, maBulletsVS(this,SVX_RES(VS_VALUES))
, maFISep(this,SVX_RES(IMG_SEPERATOR_BULLET))
, maMoreButton(this,SVX_RES(CB_BULLET_MORE))
, mrParaPropertyPanel(rPanel)
, mpBindings(NULL)
ParaBulletsControl::ParaBulletsControl(
Window* pParent,
svx::sidebar::ParaPropertyPanel& rPanel )
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_BULLETS) )
, maBulletsVS( this,SVX_RES(VS_VALUES) )
, maMoreButton( this,SVX_RES(CB_BULLET_MORE) )
, mrParaPropertyPanel( rPanel )
, mpBindings( mrParaPropertyPanel.GetBindings() )
{
FreeResource();
mpBindings = mrParaPropertyPanel.GetBindings();
maBulletsVS.SetColCount(3);
maBulletsVS.SetLineCount(3);
maBulletsVS.SetStyle( maBulletsVS.GetStyle() | WB_ITEMBORDER |WB_NO_DIRECTSELECT);
maBulletsVS.SetExtraSpacing(BULLET_IMAGE_SPACING);
if(GetSettings().GetStyleSettings().GetHighContrastMode())
maBulletsVS.SetBackground(GetSettings().GetStyleSettings().GetMenuColor());
else
maBulletsVS.SetBackground(Color(244,245,249));
maBulletsVS.SetItemWidth(BULLET_IMAGE_WIDTH);
maBulletsVS.SetItemHeight(BULLET_IMAGE_HEIGHT);
maBulletsVS.InsertItem( DEFAULT_NONE );
for( sal_uInt16 nVSIdx = 1; nVSIdx <= DEFAULT_BULLET_TYPES; ++nVSIdx )
{
{
maBulletsVS.InsertItem( nVSIdx );
}
}
maBulletsVS.SetItemText( DEFAULT_NONE, SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE ));
NBOTypeMgrBase* pBullets = NBOutlineTypeMgrFact::CreateInstance(eNBOType::MIXBULLETS);
@@ -71,39 +67,29 @@ ParaBulletsControl::ParaBulletsControl(Window* pParent, svx::sidebar::ParaProper
maBulletsVS.Show();
maBulletsVS.SetSelectHdl(LINK(this, ParaBulletsControl, BulletSelectHdl_Impl));
/*maMoreButton.SetDefBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_DropDownBackground ));//Color(244,245,249)//for high contrast
maMoreButton.SetHoverBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );//Color( 93, 120, 163 )
maMoreButton.SetHoverTxtColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_PanelTitleFont ) );//Color( 255, 255, 255 )
maMoreButton.SetIcoPosX( 2);*/
maBulletsVS.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
maBulletsVS.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
maBulletsVS.SetColor( GetSettings().GetStyleSettings().GetHighContrastMode()
? GetSettings().GetStyleSettings().GetMenuColor()
: sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );
maBulletsVS.SetBackground( GetSettings().GetStyleSettings().GetHighContrastMode()
? GetSettings().GetStyleSettings().GetMenuColor()
: sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );
maMoreButton.SetClickHdl(LINK(this, ParaBulletsControl, MoreButtonClickHdl_Impl));
}
ParaBulletsControl::~ParaBulletsControl()
{
}
void ParaBulletsControl::UpdateValueSet()
{
maBulletsVS.StateChanged(STATE_CHANGE_STYLE);
maBulletsVS.StateChanged(STATE_CHANGE_INITSHOW);
}
void ParaBulletsControl::ToGetFocus()
{
sal_uInt16 nTypeIndex = (sal_uInt16)0xFFFF;
mrParaPropertyPanel.GetBulletTypeIndex();
const sal_uInt16 nTypeIndex = mrParaPropertyPanel.GetBulletTypeIndex();
if ( nTypeIndex != (sal_uInt16)0xFFFF )
maBulletsVS.SelectItem( nTypeIndex );
else
@@ -113,10 +99,11 @@ void ParaBulletsControl::ToGetFocus()
maMoreButton.GrabFocus();
}
IMPL_LINK(ParaBulletsControl, BulletSelectHdl_Impl, ValueSet*, EMPTYARG)
{
sal_uInt16 nIdx = maBulletsVS.GetSelectItemId();
SfxUInt16Item aItem(FN_SVX_SET_BULLET, nIdx);
const sal_uInt16 nIdx = maBulletsVS.GetSelectItemId();
SfxUInt16Item aItem( FN_SVX_SET_BULLET, nIdx );
if (mpBindings)
mpBindings->GetDispatcher()->Execute( FN_SVX_SET_BULLET, SFX_CALLMODE_RECORD, &aItem, 0L );
@@ -125,6 +112,7 @@ IMPL_LINK(ParaBulletsControl, BulletSelectHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
IMPL_LINK(ParaBulletsControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
{
if (mpBindings)
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
index 6b29a60..9018b21 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
@@ -36,11 +36,10 @@ namespace svx { namespace sidebar {
class ParaBulletsControl:public svx::sidebar::PopupControl
{
private:
SvxNumValueSet3 maBulletsVS;
FixedImage maFISep;
PushButton maMoreButton;
SvxNumValueSet3 maBulletsVS;
PushButton maMoreButton;
ParaPropertyPanel& mrParaPropertyPanel;
SfxBindings* mpBindings;
SfxBindings* mpBindings;
DECL_LINK(BulletSelectHdl_Impl, ValueSet*);
DECL_LINK(MoreButtonClickHdl_Impl, void*);
@@ -48,7 +47,6 @@ private:
public:
ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel);
~ParaBulletsControl();
void ToGetFocus();
void UpdateValueSet();
};
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
index 266cb7a..c41ea8c 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx
@@ -48,30 +48,23 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
Reference < XInterface > xI = xMSF->createInstance(
::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
// DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"")
return xRet;
}
ParaNumberingControl::ParaNumberingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel):
PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_NUMBERING)),
maNumberVS(this,SVX_RES(VS_NUMBERING)),
maFISep(this,SVX_RES(IMG_SEPERATOR_NUMBERING)),
maMoreButton(this,SVX_RES(CB_NUMBERING_MORE) ),
mrParaPropertyPanel(rPanel),
mpBindings(NULL)
ParaNumberingControl::ParaNumberingControl(
Window* pParent,
svx::sidebar::ParaPropertyPanel& rPanel )
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_NUMBERING) )
, maNumberVS( this,SVX_RES(VS_NUMBERING) )
, maMoreButton( this,SVX_RES(CB_NUMBERING_MORE) )
, mrParaPropertyPanel( rPanel )
, mpBindings( mrParaPropertyPanel.GetBindings() )
{
FreeResource();
mpBindings = mrParaPropertyPanel.GetBindings();
maNumberVS.SetStyle(maNumberVS.GetStyle() | WB_NO_DIRECTSELECT);
maNumberVS.SetExtraSpacing(NUM_IMAGE_SPACING);
//add by wj for sym2_7246 high contrast
if(GetSettings().GetStyleSettings().GetHighContrastMode())
maNumberVS.SetBackground(GetSettings().GetStyleSettings().GetMenuColor());
else
maNumberVS.SetBackground(Color(244,245,249));
maNumberVS.SetStyle( maNumberVS.GetStyle() | WB_NO_DIRECTSELECT );
maNumberVS.SetExtraSpacing( NUM_IMAGE_SPACING );
maNumberVS.SetItemWidth(NUM_IMAGE_WIDTH);
maNumberVS.SetItemHeight(NUM_IMAGE_HEIGHT);
@@ -82,8 +75,7 @@ ParaNumberingControl::ParaNumberingControl(Window* pParent, svx::sidebar::ParaPr
Locale aLocale = GetSettings().GetLanguageTag().getLocale();
try
{
aNumberings =
xDefNum->getDefaultContinuousNumberingLevels( aLocale );
aNumberings = xDefNum->getDefaultContinuousNumberingLevels( aLocale );
}
catch(Exception&)
{
@@ -93,27 +85,19 @@ ParaNumberingControl::ParaNumberingControl(Window* pParent, svx::sidebar::ParaPr
}
maNumberVS.Show();
maNumberVS.SetSelectHdl(LINK(this, ParaNumberingControl, NumSelectHdl_Impl));
maNumberVS.SetSelectHdl( LINK(this, ParaNumberingControl, NumSelectHdl_Impl) );
/*maMoreButton.SetDefBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_DropDownBackground ));//Color(244,245,249)//for high contrast
maMoreButton.SetHoverBkColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );//Color( 93, 120, 163 )
maMoreButton.SetHoverTxtColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_PanelTitleFont ) );//Color( 255, 255, 255 )
maMoreButton.SetIcoPosX( 2);*/
maNumberVS.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
maNumberVS.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
GetSettings().GetStyleSettings().GetMenuColor():
sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
maNumberVS.SetColor( GetSettings().GetStyleSettings().GetHighContrastMode()
? GetSettings().GetStyleSettings().GetMenuColor()
: sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );
maNumberVS.SetBackground( GetSettings().GetStyleSettings().GetHighContrastMode()
? GetSettings().GetStyleSettings().GetMenuColor()
: sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ) );
maMoreButton.SetClickHdl(LINK(this, ParaNumberingControl, MoreButtonClickHdl_Impl));
}
ParaNumberingControl::~ParaNumberingControl()
{
}
@@ -121,8 +105,8 @@ ParaNumberingControl::~ParaNumberingControl()
IMPL_LINK(ParaNumberingControl, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
{
sal_uInt16 nIdx = maNumberVS.GetSelectItemId();
SfxUInt16Item aItem(FN_SVX_SET_NUMBER, nIdx);
const sal_uInt16 nIdx = maNumberVS.GetSelectItemId();
SfxUInt16Item aItem( FN_SVX_SET_NUMBER, nIdx );
if (mpBindings)
mpBindings->GetDispatcher()->Execute( FN_SVX_SET_NUMBER, SFX_CALLMODE_RECORD, &aItem, 0L );
@@ -131,6 +115,7 @@ IMPL_LINK(ParaNumberingControl, NumSelectHdl_Impl, ValueSet*, EMPTYARG)
return 0;
}
IMPL_LINK(ParaNumberingControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
{
if (mpBindings)
@@ -141,15 +126,13 @@ IMPL_LINK(ParaNumberingControl, MoreButtonClickHdl_Impl, void*, EMPTYARG)
return 0;
}
void ParaNumberingControl::UpdateValueSet()
{
maNumberVS.StateChanged(STATE_CHANGE_STYLE);
maNumberVS.StateChanged(STATE_CHANGE_INITSHOW);
}
void ParaNumberingControl::ToGetFocus()
{
sal_uInt16 nTypeIndex = mrParaPropertyPanel.GetNumTypeIndex();
const sal_uInt16 nTypeIndex = mrParaPropertyPanel.GetNumTypeIndex();
if ( nTypeIndex != (sal_uInt16)0xFFFF )
maNumberVS.SelectItem( nTypeIndex );
else
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
index 89392bf..7096ab0 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
@@ -38,19 +38,18 @@ namespace svx { namespace sidebar {
class ParaNumberingControl:public svx::sidebar::PopupControl
{
private:
SvxNumValueSet2 maNumberVS;
FixedImage maFISep;
PushButton maMoreButton;
SvxNumValueSet2 maNumberVS;
PushButton maMoreButton;
ParaPropertyPanel& mrParaPropertyPanel;
SfxBindings* mpBindings;
SfxBindings* mpBindings;
DECL_LINK(NumSelectHdl_Impl, ValueSet*);
DECL_LINK(MoreButtonClickHdl_Impl, void*);
public:
ParaNumberingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel);
ParaNumberingControl( Window* pParent,
svx::sidebar::ParaPropertyPanel& rPanel);
~ParaNumberingControl();
void ToGetFocus();
void UpdateValueSet();
};
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 57833b3..e4d7141 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1403,14 +1403,6 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
else
maTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_False);
// if( !mbOutLineRight && !mbOutLineLeft )
// {
// maTbxProDemote->EnableItem(BT_TBX_INDENT_PROMOTE, sal_True);
// maTbxProDemote->EnableItem(BT_TBX_INDENT_DEMOTE, sal_True);
// maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_True);
// }
// else
// maTbxProDemote->EnableItem(SD_HANGING_INDENT, sal_False);
}
void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
@@ -1439,9 +1431,9 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt
// Add toggle state for numbering and bullet icons
void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if (nSID==FN_NUM_NUMBERING_ON)
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)) )
{
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)))
if (nSID==FN_NUM_NUMBERING_ON)
{
const SfxBoolItem* pItem= (const SfxBoolItem*)pState;
sal_Bool aBool = (sal_Bool)pItem->GetValue();
@@ -1451,10 +1443,7 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState
maTBxNumBullet->SetItemState(IID_NUMBER, STATE_NOCHECK);
}
}
}
if (nSID==FN_NUM_BULLET_ON)
{
if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem)))
else if (nSID==FN_NUM_BULLET_ON)
{
const SfxBoolItem* pItem= (const SfxBoolItem*)pState;
sal_Bool aBool = (sal_Bool)pItem->GetValue();
@@ -1466,25 +1455,31 @@ void ParaPropertyPanel::StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState
}
}
}
//Modified for Numbering&Bullets Dialog UX Enh(Story 992) by chengjh,2011.7.5
//Handing the transferred the num rule index data of the current selection
void ParaPropertyPanel::StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pState )
void ParaPropertyPanel::StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
const SfxUInt16Item* pIt = (const SfxUInt16Item*)pState;
sal_uInt16 nValue = (sal_uInt16)0xFFFF;
if ( pIt )
nValue = pIt->GetValue();
if ( nSID == FN_BUL_NUM_RULE_INDEX )
if ( eState >= SFX_ITEM_DEFAULT && pState->ISA(SfxUInt16Item) )
{
mnBulletTypeIndex = nValue;
}else if ( nSID == FN_NUM_NUM_RULE_INDEX )
{
mnNumTypeIndex = nValue;
sal_uInt16 nValue = (sal_uInt16)0xFFFF;
{
const SfxUInt16Item* pIt = (const SfxUInt16Item*)pState;
if ( pIt )
nValue = pIt->GetValue();
}
if ( nSID == FN_BUL_NUM_RULE_INDEX )
{
mnBulletTypeIndex = nValue;
}
else if ( nSID == FN_NUM_NUM_RULE_INDEX )
{
mnNumTypeIndex = nValue;
}
}
}
//End
FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState )
{
FieldUnit eUnit = FUNIT_NONE;
@@ -1515,7 +1510,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI
return eUnit;
}
//new FixedText(this, SVX_RES(FT_COLOR))
PopupControl* ParaPropertyPanel::CreateLineSpacingControl (PopupContainer* pParent)
{
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 317ce5e..fcbe00b 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -103,12 +103,10 @@
#define IL_BULLET_BITMAPS 2
#define CB_BULLET_MORE 4
#define BMP_BULLET_MORE 5
#define IMG_SEPERATOR_BULLET 7
#define VS_NUMBERING 10
#define CB_NUMBERING_MORE 12
#define BMP_NUMERING_MORE 13
#define IMG_SEPERATOR_NUMBERING 15
#define VS_FONT_COLOR 1
#define STR_NOFILL 2
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 6a5aaa9..7bf9380 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -250,8 +250,6 @@ private:
void StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
// Add toggle state for numbering and bullet icons
void StateChangeBulletNumImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
//Modified for Numbering&Bullets Dialog UX Enh
//Handing the transferred the num rule index data of the current selection
void StateChangeBulletNumRuleImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
void initial();
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 8be2606..3489a53 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -398,16 +398,6 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
//===============================================================================================
static const long aOffsetX[] =
{
-1,//1,
3,//4,
4,//5,
-3,//0,
-1,//0,
3
};
SvxNumValueSet3::SvxNumValueSet3( Window* pParent, const ResId& rResId) :
ValueSet( pParent, rResId )
{
