summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/config/optload.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx8
-rw-r--r--sw/source/ui/envelp/envlop1.cxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx5
-rw-r--r--sw/source/ui/envelp/labelexp.cxx8
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
-rw-r--r--sw/source/ui/frmdlg/cption.cxx5
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx20
-rw-r--r--sw/source/ui/misc/glosbib.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx11
-rw-r--r--sw/source/ui/table/tabledlg.cxx2
13 files changed, 31 insertions, 42 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index b665e824ff5d..7915bc90efb2 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -760,7 +760,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry)
pOpt->SetCategory("");
else
pOpt->SetCategory(comphelper::string::strip(aName, ' '));
- pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData(m_pFormatBox->GetSelectEntryPos())));
+ pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectEntryData()));
pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString() );
pOpt->SetPos(m_pPosBox->GetSelectEntryPos());
sal_Int32 nPos = m_pLbLevel->GetSelectEntryPos();
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 4f20503a5105..691ada28fdc6 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -445,7 +445,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton)
OUString sAttach( m_sDefaultAttachmentST );
sAttach += ".";
sAttach += lcl_GetExtensionForDocType(
- reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos())));
+ reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData()));
m_pAttachmentED->SetText( sAttach );
}
@@ -890,7 +890,7 @@ IMPL_LINK(SwMailMergeOutputPage, PrinterSetupHdl_Impl, PushButton*, pButton)
IMPL_LINK(SwMailMergeOutputPage, SendTypeHdl_Impl, ListBox*, pBox)
{
- sal_uLong nDocType = reinterpret_cast<sal_uLong>(pBox->GetEntryData(pBox->GetSelectEntryPos()));
+ sal_uLong nDocType = reinterpret_cast<sal_uLong>(pBox->GetSelectEntryData());
bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType;
m_pSendAsPB->Enable( bEnable );
m_pAttachmentGroup->Enable( bEnable );
@@ -970,7 +970,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding();
SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer();
const SfxFilter *pSfxFlt = 0;
- sal_uLong nDocType = reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos()));
+ sal_uLong nDocType = reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData());
OUString sExtension = lcl_GetExtensionForDocType(nDocType);
switch( nDocType )
{
@@ -1060,7 +1060,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
++nTokenCount;
}
sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType(
- reinterpret_cast<sal_uLong>(m_pSendAsLB->GetEntryData(m_pSendAsLB->GetSelectEntryPos()))));
+ reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData())));
m_pAttachmentED->SetText(sAttach);
}
else
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 6747f745cfe8..9369b79660b1 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl)
{
OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." +
m_pTableLB->GetSelectEntry() + "." +
- OUString(m_pTableLB->GetEntryData(m_pTableLB->GetSelectEntryPos()) == 0 ? '0' : '1') + "." +
+ OUString(m_pTableLB->GetSelectEntryData() == 0 ? '0' : '1') + "." +
m_pDBFieldLB->GetSelectEntry() + ">");
m_pAddrEdit->ReplaceSelected(aStr);
Selection aSel = m_pAddrEdit->GetSelection();
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index f217acdb2d6d..98bdf99e7757 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -326,7 +326,7 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl)
{
OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." +
m_pTableLB->GetSelectEntry() + "." +
- (m_pTableLB->GetEntryData(m_pTableLB->GetSelectEntryPos()) == 0 ? OUString("0") : OUString("1")) + "." +
+ (m_pTableLB->GetSelectEntryData() == 0 ? OUString("0") : OUString("1")) + "." +
m_pDBFieldLB->GetSelectEntry() + ">");
m_pWritingEdit->ReplaceSelected(aStr);
Selection aSel = m_pWritingEdit->GetSelection();
@@ -614,8 +614,7 @@ int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet)
bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet)
{
- const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData(
- m_pAutoTextGroupLB->GetSelectEntryPos());
+ const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData();
OSL_ENSURE(pGroup, "no group selected?");
if (pGroup)
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index ba14f0e17ae6..0babacb2b69c 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -79,7 +79,7 @@ void SwVisitingCardPage::InitFrameControl()
if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectEntryPos())
m_pAutoTextGroupLB->SelectEntryPos(0);
const OUString *pCurGroupName(
- (const OUString*)m_pAutoTextGroupLB->GetEntryData(m_pAutoTextGroupLB->GetSelectEntryPos()));
+ (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData());
if(m_xAutoText->hasByName(*pCurGroupName))
{
uno::Any aGroup = m_xAutoText->getByName(*pCurGroupName);
@@ -112,8 +112,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl)
if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectEntryPos())
{
- const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetEntryData(
- m_pAutoTextGroupLB->GetSelectEntryPos() ) );
+ const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData() );
uno::Any aGroup = m_xAutoText->getByName(*pGroup);
uno::Reference< text::XAutoTextGroup > xGroup;
aGroup >>= xGroup;
@@ -140,8 +139,7 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox )
{
if (m_pAutoTextGroupLB == pBox)
{
- const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetEntryData(
- m_pAutoTextGroupLB->GetSelectEntryPos()));
+ const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData());
uno::Any aGroup = m_xAutoText->getByName(*pGroup);
uno::Reference< text::XAutoTextGroup > xGroup;
aGroup >>= xGroup;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 9adfbb84a758..aa5918d3f446 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -518,7 +518,7 @@ bool SwMailMergeDlg::ExecQryShell()
pMgr->SetEMailColumn(m_pColumnLB->GetSelectEntry());
pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectEntry());
if( m_pFilterLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetEntryData( m_pFilterLB->GetSelectEntryPos() ));
+ m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectEntryData());
}
else
{
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 5a94ba40d538..661227bb543b 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -249,7 +249,7 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox)
{
pTabPage->FillItemSet(pSet);
}
- nOldSelection = reinterpret_cast<sal_IntPtr>(m_pApplyToLB->GetEntryData(m_pApplyToLB->GetSelectEntryPos()));
+ nOldSelection = reinterpret_cast<sal_IntPtr>(m_pApplyToLB->GetSelectEntryData());
long nWidth = nSelectionWidth;
switch(nOldSelection)
{
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ff754b6af4d9..22709debcdce 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -268,7 +268,7 @@ void SwCaptionDialog::Apply()
aOpt.SetCategory(comphelper::string::strip(aName, ' '));
aOpt.SetNumSeparator( m_pNumberingSeparatorED->GetText() );
}
- aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetEntryData( m_pFormatBox->GetSelectEntryPos() )) );
+ aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData()) );
aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() );
aOpt.SetCaption( m_pTextEdit->GetText() );
aOpt.SetPos( m_pPosBox->GetSelectEntryPos() );
@@ -354,8 +354,7 @@ void SwCaptionDialog::DrawSample()
bool bNone = sFldTypeName == m_sNone;
if( !bNone )
{
- const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetEntryData(
- m_pFormatBox->GetSelectEntryPos() ));
+ const sal_uInt16 nNumFmt = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData());
if( SVX_NUM_NUMBER_NONE != nNumFmt )
{
// category
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index f989dc8b1398..6ad97d55d97a 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -1619,7 +1619,7 @@ sal_Int16 SwFrmPage::GetAlignment(FrmMap *pMap, sal_Int32 nMapPos,
return 0;
const RelationMap *const pRelationMap = (const RelationMap *const )
- rRelationLB.GetEntryData(rRelationLB.GetSelectEntryPos());
+ rRelationLB.GetSelectEntryData();
const sal_uLong nRel = pRelationMap->nLBRelation;
const SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;
@@ -1937,7 +1937,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
{
if (pRelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
- nRel = ((RelationMap *)pRelLB->GetEntryData(pRelLB->GetSelectEntryPos()))->nRelation;
+ nRel = ((RelationMap *)pRelLB->GetSelectEntryData())->nRelation;
FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT);
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index b1db99a296c8..6675da9ccd6f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1184,8 +1184,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
rDesc.SetStyleNames(aStyleArr[i], i);
rDesc.SetLanguage(m_pLanguageLB->GetSelectLanguage());
- const OUString* pEntryData = (const OUString*)m_pSortAlgorithmLB->GetEntryData(
- m_pSortAlgorithmLB->GetSelectEntryPos() );
+ const OUString* pEntryData = (const OUString*)m_pSortAlgorithmLB->GetSelectEntryData();
OSL_ENSURE(pEntryData, "no entry data available");
if(pEntryData)
rDesc.SetSortAlgorithm(*pEntryData);
@@ -1241,7 +1240,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
_pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE,
- (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetEntryData( m_pTypeLB->GetSelectEntryPos() ))));
+ (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectEntryData())));
FillTOXDescription();
return LEAVE_PAGE;
}
@@ -1255,7 +1254,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox*, pBox)
{
SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(
- pBox->GetEntryData( pBox->GetSelectEntryPos() )));
+ pBox->GetSelectEntryData()));
CurTOXType eCurType = lcl_UserData2TOXTypes(nType);
pTOXDlg->SetCurrentTOXType(eCurType);
@@ -1379,7 +1378,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
OUString sOldString;
void* pUserData;
- if( 0 != (pUserData = m_pSortAlgorithmLB->GetEntryData( m_pSortAlgorithmLB->GetSelectEntryPos())) )
+ if( 0 != (pUserData = m_pSortAlgorithmLB->GetSelectEntryData()) )
sOldString = *(OUString*)pUserData;
sal_Int32 nEnd = m_pSortAlgorithmLB->GetEntryCount();
for( sal_Int32 n = 0; n < nEnd; ++n )
@@ -2051,14 +2050,11 @@ void SwTOXEntryTabPage::UpdateDescriptor()
{
rDesc.SetSortByDocument(m_pSortDocPosRB->IsChecked());
SwTOXSortKey aKey1, aKey2, aKey3;
- aKey1.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pFirstKeyLB->GetEntryData(
- m_pFirstKeyLB->GetSelectEntryPos()));
+ aKey1.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pFirstKeyLB->GetSelectEntryData());
aKey1.bSortAscending = m_pFirstSortUpRB->IsChecked();
- aKey2.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pSecondKeyLB->GetEntryData(
- m_pSecondKeyLB->GetSelectEntryPos()));
+ aKey2.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pSecondKeyLB->GetSelectEntryData());
aKey2.bSortAscending = m_pSecondSortUpRB->IsChecked();
- aKey3.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pThirdKeyLB->GetEntryData(
- m_pThirdKeyLB->GetSelectEntryPos()));
+ aKey3.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pThirdKeyLB->GetSelectEntryData());
aKey3.bSortAscending = m_pThirdSortUpRB->IsChecked();
rDesc.SetSortKeys(aKey1, aKey2, aKey3);
@@ -2413,7 +2409,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox*, pBox)
{
OUString sEntry = pBox->GetSelectEntry();
- const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(pBox->GetEntryData(pBox->GetSelectEntryPos()));
+ const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(pBox->GetSelectEntryData());
const bool bEqualsNoCharStyle = sEntry == sNoCharStyle;
m_pEditStylePB->Enable(!bEqualsNoCharStyle);
if (bEqualsNoCharStyle)
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index ca1eff0631ad..385ce257cfeb 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -318,7 +318,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
bool bEnableNew = true;
bool bEnableDel = false;
sal_uLong nCaseReadonly =
- reinterpret_cast<sal_uLong>(m_pPathLB->GetEntryData(m_pPathLB->GetSelectEntryPos()));
+ reinterpret_cast<sal_uLong>(m_pPathLB->GetSelectEntryData());
bool bDirReadonly = 0 != (nCaseReadonly&PATH_READONLY);
if(sEntry.isEmpty() || bDirReadonly)
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 4adaec9a62e9..093faac1f791 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -299,8 +299,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB1->GetSelectEntry() );
if( sEntry == aNumericTxt )
sEntry.clear();
- else if( 0 != (pUserData = m_pTypDLB1->GetEntryData(
- m_pTypDLB1->GetSelectEntryPos())) )
+ else if( 0 != (pUserData = m_pTypDLB1->GetSelectEntryData()) )
sEntry = *(OUString*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol1, sEntry,
@@ -313,8 +312,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB2->GetSelectEntry() );
if( sEntry == aNumericTxt )
sEntry.clear();
- else if( 0 != (pUserData = m_pTypDLB2->GetEntryData(
- m_pTypDLB2->GetSelectEntryPos())) )
+ else if( 0 != (pUserData = m_pTypDLB2->GetSelectEntryData()) )
sEntry = *(OUString*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol2, sEntry,
@@ -327,8 +325,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB3->GetSelectEntry() );
if( sEntry == aNumericTxt )
sEntry.clear();
- else if( 0 != (pUserData = m_pTypDLB3->GetEntryData(
- m_pTypDLB3->GetSelectEntryPos())) )
+ else if( 0 != (pUserData = m_pTypDLB3->GetSelectEntryData()) )
sEntry = *(OUString*)pUserData;
SwSortKey *pKey = new SwSortKey( nCol3, sEntry,
@@ -429,7 +426,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
for( int n = 0; n < nLstBoxCnt; ++n )
{
ListBox* pL = aLstArr[ n ];
- void* pUserData = pL->GetEntryData( pL->GetSelectEntryPos() );
+ void* pUserData = pL->GetSelectEntryData();
if (pUserData)
aOldStrArr[ n ] = *(OUString*)pUserData;
::lcl_ClearLstBoxAndDelUserData( *pL );
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 0fa0a4dfa491..0a0bd7e9c64d 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -1414,7 +1414,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
{
bModified |= 0 != rSet->Put(
SvxFrameDirectionItem(
- (SvxFrameDirection)reinterpret_cast<sal_uLong>(m_pTextDirectionLB->GetEntryData(m_pTextDirectionLB->GetSelectEntryPos()))
+ (SvxFrameDirection)reinterpret_cast<sal_uLong>(m_pTextDirectionLB->GetSelectEntryData())
, FN_TABLE_BOX_TEXTORIENTATION));
}
generated by cgit (git 2.34.1) at 2024-07-11 16:07:28 +0000