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

Rename GetSelectEntryData -> GetSelectedEntryData

Browse Source 
Change-Id: Ia6402f6d2c978cbd5557052a43e9728ca9e11173
Reviewed-on: https://gerrit.libreoffice.org/42285
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt 2017-09-14 17:09:01 +02:00
parent 83de03e077
commit b9a8ac48d7
40 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/basicbox.cxx
View File

@ -448,7 +448,7 @@ void LanguageBox::ClearBox()
void LanguageBox::SetLanguage() void LanguageBox::SetLanguage()
{ {
LanguageEntry* pEntry = static_cast<LanguageEntry*>(GetSelectEntryData()); LanguageEntry* pEntry = static_cast<LanguageEntry*>(GetSelectedEntryData());
if ( pEntry ) if ( pEntry )
GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale ); GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale );
} }

2
cui/source/customize/CommandCategoryListBox.cxx
View File

@ -198,7 +198,7 @@ OUString CommandCategoryListBox::MapCommand2UIName(const OUString& sCommand)
void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionListBox>& pFunctionListBox, void CommandCategoryListBox::categorySelected( const VclPtr<SfxConfigFunctionListBox>& pFunctionListBox,
const OUString& filterTerm ) const OUString& filterTerm )
{ {
SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(GetSelectEntryData()); SfxGroupInfo_Impl *pInfo = static_cast<SfxGroupInfo_Impl*>(GetSelectedEntryData());
pFunctionListBox->SetUpdateMode(false); pFunctionListBox->SetUpdateMode(false);
pFunctionListBox->ClearAll(); pFunctionListBox->ClearAll();

2
cui/source/dialogs/pastedlg.cxx
View File

@ -198,7 +198,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
if( Dialog::Execute() == RET_OK ) if( Dialog::Execute() == RET_OK )
{ {
nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData())); nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectedEntryData()));
} }
return nSelFormat; return nSelFormat;

4
cui/source/options/optgdlg.cxx
View File

@ -1329,7 +1329,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
// handle settings for UI Language // handle settings for UI Language
// a change of setting needs to bring up a warning message // a change of setting needs to bring up a warning message
OUString aLangString; OUString aLangString;
sal_Int32 d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetSelectEntryData()); sal_Int32 d = (sal_Int32)reinterpret_cast<sal_IntPtr>(m_pUserInterfaceLB->GetSelectedEntryData());
if( d > 0 && seqInstalledLanguages.getLength() > d-1) if( d > 0 && seqInstalledLanguages.getLength() > d-1)
aLangString = seqInstalledLanguages[d-1]; aLangString = seqInstalledLanguages[d-1];
@ -1408,7 +1408,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
// Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default. // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString(); OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
const NfCurrencyEntry* pCurr = static_cast<const NfCurrencyEntry*>(m_pCurrencyLB->GetSelectEntryData()); const NfCurrencyEntry* pCurr = static_cast<const NfCurrencyEntry*>(m_pCurrencyLB->GetSelectedEntryData());
OUString sNewCurr; OUString sNewCurr;
if ( pCurr ) if ( pCurr )
sNewCurr = SvtSysLocaleOptions::CreateCurrencyConfigString( sNewCurr = SvtSysLocaleOptions::CreateCurrencyConfigString(

6
cui/source/options/optsave.cxx
View File

@ -260,7 +260,7 @@ bool SvxSaveTabPage::FillItemSet( SfxItemSet* rSet )
if ( aODFVersionLB->IsValueChangedFromSaved() ) if ( aODFVersionLB->IsValueChangedFromSaved() )
{ {
sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() ); sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectedEntryData() );
aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) ); aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
} }
@ -631,7 +631,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void) IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
{ {
sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectEntryData() ); sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetSelectedEntryData() );
bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST; bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
if ( bShown ) if ( bShown )
{ {
@ -647,7 +647,7 @@ IMPL_LINK_NOARG(SvxSaveTabPage, ODFVersionHdl_Impl, ListBox&, void)
} }
bShown = !bHasODFFormat bShown = !bHasODFFormat
|| ( aSaveAsLB->GetSelectEntryData() != nullptr ); || ( aSaveAsLB->GetSelectedEntryData() != nullptr );
} }
aODFWarningFI->Show( bShown ); aODFWarningFI->Show( bShown );

2
cui/source/tabpages/backgrnd.cxx
View File

@ -101,7 +101,7 @@ struct SvxBackgroundPage_Impl
/// Returns the fill style of the currently selected entry. /// Returns the fill style of the currently selected entry.
static drawing::FillStyle lcl_getFillStyle(ListBox const * pLbSelect) static drawing::FillStyle lcl_getFillStyle(ListBox const * pLbSelect)
{ {
return (drawing::FillStyle)reinterpret_cast<sal_uLong>(pLbSelect->GetSelectEntryData()); return (drawing::FillStyle)reinterpret_cast<sal_uLong>(pLbSelect->GetSelectedEntryData());
} }
// Selects the entry matching the specified fill style. // Selects the entry matching the specified fill style.

2
cui/source/tabpages/numpages.cxx
View File

@ -1781,7 +1781,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox&, rBox, void
{ {
SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
// PAGEDESC does not exist // PAGEDESC does not exist
SvxNumType nNumType = (SvxNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); SvxNumType nNumType = (SvxNumType)reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData());
aNumFmt.SetNumberingType(nNumType); aNumFmt.SetNumberingType(nNumType);
sal_uInt16 nNumberingType = aNumFmt.GetNumberingType(); sal_uInt16 nNumberingType = aNumFmt.GetNumberingType();
if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN))) if(SVX_NUM_BITMAP == (nNumberingType&(~LINK_TOKEN)))

4
cui/source/tabpages/swpossizetabpage.cxx
View File

@ -1304,7 +1304,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void )
{ {
if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation; nRel = static_cast<RelationMap *>(pRelLB->GetSelectedEntryData())->nRelation;
FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT); FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT);
} }
@ -1421,7 +1421,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo
{ {
if (rRelationLB.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) if (rRelationLB.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
{ {
LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectEntryData())->nLBRelation; LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectedEntryData())->nLBRelation;
std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap); std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap);
SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;

2
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
View File

@ -1115,7 +1115,7 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler, SvTreeListBox*, void)
{ {
OUStringBuffer b; OUStringBuffer b;
UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(
m_pUpdates->GetSelectEntryData()); m_pUpdates->GetSelectedEntryData());
clearDescription(); clearDescription();
if ( p != nullptr ) if ( p != nullptr )

2
extensions/source/dbpilots/commonpagesdbp.cxx
View File

@ -182,7 +182,7 @@ namespace dbp
rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) ); rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) );
} }
OUString sCommand = m_pTable->GetSelectedEntry(); OUString sCommand = m_pTable->GetSelectedEntry();
sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_pTable->GetSelectEntryData() ); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_pTable->GetSelectedEntryData() );
rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) ); rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) );
rContext.xForm->setPropertyValue("CommandType", makeAny( nCommandType ) ); rContext.xForm->setPropertyValue("CommandType", makeAny( nCommandType ) );

2
filter/source/pdf/impdialog.cxx
View File

@ -1682,7 +1682,7 @@ void ImplErrorDialog::dispose()
IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, ListBox&, void) IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, ListBox&, void)
{ {
OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectEntryData()); OUString* pStr = static_cast<OUString*>(m_pErrors->GetSelectedEntryData());
m_pExplanation->SetText( pStr ? *pStr : OUString() ); m_pExplanation->SetText( pStr ? *pStr : OUString() );
} }

2
fpicker/source/office/iodlgimp.hxx
View File

@ -228,7 +228,7 @@ inline void SvtExpFileDlg_Impl::SetNoFilterListSelection( )
inline SvtFileDialogFilter_Impl* SvtExpFileDlg_Impl::GetSelectedFilterEntry( OUString& _rDisplayName ) const inline SvtFileDialogFilter_Impl* SvtExpFileDlg_Impl::GetSelectedFilterEntry( OUString& _rDisplayName ) const
{ {
_rDisplayName = _pLbFilter->GetSelectedEntry(); _rDisplayName = _pLbFilter->GetSelectedEntry();
return static_cast< SvtFileDialogFilter_Impl* >( _pLbFilter->GetSelectEntryData () ); return static_cast< SvtFileDialogFilter_Impl* >( _pLbFilter->GetSelectedEntryData () );
} }
inline bool SvtExpFileDlg_Impl::IsFilterListTravelSelect() const inline bool SvtExpFileDlg_Impl::IsFilterListTravelSelect() const

2
include/svx/checklbx.hxx
View File

@ -65,7 +65,7 @@ public:
void SelectEntryPos ( sal_uLong nPos ); void SelectEntryPos ( sal_uLong nPos );
sal_uLong GetSelectedEntryPos () const; sal_uLong GetSelectedEntryPos () const;
void* GetSelectEntryData () const { return GetEntryData(GetSelectedEntryPos()); } void* GetSelectedEntryData () const { return GetEntryData(GetSelectedEntryPos()); }
OUString GetText ( sal_uLong nPos ) const; OUString GetText ( sal_uLong nPos ) const;
sal_uLong GetCheckedEntryCount() const; sal_uLong GetCheckedEntryCount() const;

2
include/vcl/lstbox.hxx
View File

@ -174,7 +174,7 @@ public:
void SetEntryData( sal_Int32 nPos, void* pNewData ); void SetEntryData( sal_Int32 nPos, void* pNewData );
void* GetEntryData( sal_Int32 nPos ) const; void* GetEntryData( sal_Int32 nPos ) const;
void* GetSelectEntryData() const { return GetEntryData(GetSelectedEntryPos()); } void* GetSelectedEntryData() const { return GetEntryData(GetSelectedEntryPos()); }
/** this methods stores a combination of flags from the /** this methods stores a combination of flags from the
ListBoxEntryFlags::* defines at the given entry. ListBoxEntryFlags::* defines at the given entry.

4
reportdesign/source/ui/dlg/DateTime.cxx
View File

@ -224,11 +224,11 @@ sal_Int32 ODateTimeDialog::getFormatKey(bool _bDate) const
sal_Int32 nFormatKey; sal_Int32 nFormatKey;
if ( _bDate ) if ( _bDate )
{ {
nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_pDateListBox->GetSelectEntryData())); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_pDateListBox->GetSelectedEntryData()));
} }
else else
{ {
nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_pTimeListBox->GetSelectEntryData())); nFormatKey = static_cast<sal_Int32>(reinterpret_cast<sal_IntPtr>(m_pTimeListBox->GetSelectedEntryData()));
} }
return nFormatKey; return nFormatKey;
} }

2
reportdesign/source/ui/dlg/GroupsSorting.cxx
View File

@ -925,7 +925,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectedEntryPos() ); xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectedEntryPos() );
if ( m_pGroupOnLst->IsValueChangedFromSaved() ) if ( m_pGroupOnLst->IsValueChangedFromSaved() )
{ {
sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_pGroupOnLst->GetSelectEntryData())); sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_pGroupOnLst->GetSelectedEntryData()));
xGroup->setGroupOn( nGroupOn ); xGroup->setGroupOn( nGroupOn );
} }
if ( m_pGroupIntervalEd->IsValueChangedFromSaved() ) if ( m_pGroupIntervalEd->IsValueChangedFromSaved() )

4
sd/source/ui/animations/CustomAnimationPane.cxx
View File

@ -1820,7 +1820,7 @@ void CustomAnimationPane::onAdd()
return; return;
mpLBAnimation->SelectEntryPos(nFirstEffect); mpLBAnimation->SelectEntryPos(nFirstEffect);
void* pEntryData = mpLBAnimation->GetSelectEntryData(); void* pEntryData = mpLBAnimation->GetSelectedEntryData();
if( pEntryData ) if( pEntryData )
pDescriptor = *static_cast< CustomAnimationPresetPtr* >( pEntryData ); pDescriptor = *static_cast< CustomAnimationPresetPtr* >( pEntryData );
@ -2112,7 +2112,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
{ {
if( maListSelection.size() == 1 ) if( maListSelection.size() == 1 )
{ {
CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectEntryData()); CustomAnimationPresetPtr* pPreset = static_cast< CustomAnimationPresetPtr* >(mpLBAnimation->GetSelectedEntryData());
PathKind ePathKind = getCreatePathKind(); PathKind ePathKind = getCreatePathKind();
// tdf#99137, the selected entry may also be a subcategory title, so not an effect // tdf#99137, the selected entry may also be a subcategory title, so not an effect

4
sd/source/ui/dlg/PhotoAlbumDialog.cxx
View File

@ -575,7 +575,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
{ {
OUString sActEntry( pImagesLst->GetSelectedEntry() ); OUString sActEntry( pImagesLst->GetSelectedEntry() );
OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData()); OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectedEntryData());
OUString sAct(*pActData); OUString sAct(*pActData);
OUString sDownEntry( pImagesLst->GetEntry(nActPos + 1) ); OUString sDownEntry( pImagesLst->GetEntry(nActPos + 1) );
@ -607,7 +607,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void) IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
{ {
OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData()); OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectedEntryData());
OUString sImgUrl = pData ? *pData : ""; OUString sImgUrl = pData ? *pData : "";
if (sImgUrl != SdResId(STR_PHOTO_ALBUM_TEXTBOX)) if (sImgUrl != SdResId(STR_PHOTO_ALBUM_TEXTBOX))

6
sfx2/source/appl/newhelp.cxx
View File

@ -1083,7 +1083,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink )
OUString SearchTabPage_Impl::GetSelectedEntry() const OUString SearchTabPage_Impl::GetSelectedEntry() const
{ {
OUString aRet; OUString aRet;
OUString* pData = static_cast<OUString*>(m_pResultsLB->GetSelectEntryData()); OUString* pData = static_cast<OUString*>(m_pResultsLB->GetSelectedEntryData());
if ( pData ) if ( pData )
aRet = *pData; aRet = *pData;
return aRet; return aRet;
@ -1329,7 +1329,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink
OUString BookmarksTabPage_Impl::GetSelectedEntry() const OUString BookmarksTabPage_Impl::GetSelectedEntry() const
{ {
OUString aRet; OUString aRet;
OUString* pData = static_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData()); OUString* pData = static_cast<OUString*>(m_pBookmarksBox->GetSelectedEntryData());
if ( pData ) if ( pData )
aRet = *pData; aRet = *pData;
return aRet; return aRet;
@ -1569,7 +1569,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl, Timer *, void)
IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, void) IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl, Timer *, void)
{ {
OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectEntryData()); OUString* pFactory = static_cast<OUString*>(m_pActiveLB->GetSelectedEntryData());
if ( pFactory ) if ( pFactory )
{ {
SetFactory( pFactory->toAsciiLowerCase(), false ); SetFactory( pFactory->toAsciiLowerCase(), false );

6
sfx2/source/dialog/dinfdlg.cxx
View File

@ -1554,7 +1554,7 @@ void CustomPropertiesWindow::dispose()
IMPL_LINK(CustomPropertiesWindow, TypeHdl, ListBox&, rListBox, void) IMPL_LINK(CustomPropertiesWindow, TypeHdl, ListBox&, rListBox, void)
{ {
CustomPropertiesTypeBox* pBox = static_cast<CustomPropertiesTypeBox*>(&rListBox); CustomPropertiesTypeBox* pBox = static_cast<CustomPropertiesTypeBox*>(&rListBox);
long nType = reinterpret_cast<long>( pBox->GetSelectEntryData() ); long nType = reinterpret_cast<long>( pBox->GetSelectedEntryData() );
CustomPropertyLine* pLine = pBox->GetLine(); CustomPropertyLine* pLine = pBox->GetLine();
pLine->m_aValueEdit->Show( (CUSTOM_TYPE_TEXT == nType) || (CUSTOM_TYPE_NUMBER == nType) ); pLine->m_aValueEdit->Show( (CUSTOM_TYPE_TEXT == nType) || (CUSTOM_TYPE_NUMBER == nType) );
pLine->m_aDateField->Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME == nType) ); pLine->m_aDateField->Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME == nType) );
@ -1626,7 +1626,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const
bool bIsValid = true; bool bIsValid = true;
pLine->m_bTypeLostFocus = false; pLine->m_bTypeLostFocus = false;
long nType = reinterpret_cast<long>( long nType = reinterpret_cast<long>(
pLine->m_aTypeBox->GetSelectEntryData() ); pLine->m_aTypeBox->GetSelectedEntryData() );
OUString sValue = pLine->m_aValueEdit->GetText(); OUString sValue = pLine->m_aValueEdit->GetText();
if ( sValue.isEmpty() ) if ( sValue.isEmpty() )
return true; return true;
@ -1889,7 +1889,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c
{ {
aPropertiesSeq[i].Name = sPropertyName; aPropertiesSeq[i].Name = sPropertyName;
long nType = reinterpret_cast<long>( long nType = reinterpret_cast<long>(
pLine->m_aTypeBox->GetSelectEntryData() ); pLine->m_aTypeBox->GetSelectedEntryData() );
if ( CUSTOM_TYPE_NUMBER == nType ) if ( CUSTOM_TYPE_NUMBER == nType )
{ {
double nValue = 0; double nValue = 0;

2
svx/source/dialog/rubydialog.cxx
View File

@ -630,7 +630,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void)
AssertOneEntry(); AssertOneEntry();
OUString sStyleName; OUString sStyleName;
if (LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectedEntryPos()) if (LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectedEntryPos())
sStyleName = *static_cast<OUString*>(m_pCharStyleLB->GetSelectEntryData()); sStyleName = *static_cast<OUString*>(m_pCharStyleLB->GetSelectedEntryData());
Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues();
for (PropertyValues & rProps : aRubyValues) for (PropertyValues & rProps : aRubyValues)
{ {

2
sw/source/ui/config/optload.cxx
View File

@ -817,7 +817,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry const * pEntry)
pOpt->SetCategory(""); pOpt->SetCategory("");
else else
pOpt->SetCategory(comphelper::string::strip(aName, ' ')); pOpt->SetCategory(comphelper::string::strip(aName, ' '));
pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectEntryData())); pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectedEntryData()));
pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString() ); pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString() );
pOpt->SetPos(m_pPosBox->GetSelectedEntryPos()); pOpt->SetPos(m_pPosBox->GetSelectedEntryPos());
sal_Int32 nPos = m_pLbLevel->GetSelectedEntryPos(); sal_Int32 nPos = m_pLbLevel->GetSelectedEntryPos();

8
sw/source/ui/dbui/mmresultdialogs.cxx
View File

@ -435,7 +435,7 @@ void SwMMResultEmailDialog::FillInEmailSettings()
if (m_pAttachmentED->GetText().isEmpty()) if (m_pAttachmentED->GetText().isEmpty())
{ {
OUString sAttach = "." + lcl_GetExtensionForDocType( OUString sAttach = "." + lcl_GetExtensionForDocType(
reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData())); reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectedEntryData()));
m_pAttachmentED->SetText(sAttach); m_pAttachmentED->SetText(sAttach);
} }
@ -860,7 +860,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrinterSetupHdl_Impl, Button*, pButton, void)
IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void) IMPL_LINK(SwMMResultEmailDialog, SendTypeHdl_Impl, ListBox&, rBox, void)
{ {
sal_uLong nDocType = reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); sal_uLong nDocType = reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData());
bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType; bool bEnable = MM_DOCTYPE_HTML != nDocType && MM_DOCTYPE_TEXT != nDocType;
m_pSendAsPB->Enable( bEnable ); m_pSendAsPB->Enable( bEnable );
m_pAttachmentGroup->Enable( bEnable ); m_pAttachmentGroup->Enable( bEnable );
@ -941,7 +941,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding(); rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding();
SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer(); SfxFilterContainer* pFilterContainer = SwDocShell::Factory().GetFilterContainer();
std::shared_ptr<const SfxFilter> pSfxFlt; std::shared_ptr<const SfxFilter> pSfxFlt;
sal_uLong nDocType = reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData()); sal_uLong nDocType = reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectedEntryData());
OUString sExtension = lcl_GetExtensionForDocType(nDocType); OUString sExtension = lcl_GetExtensionForDocType(nDocType);
switch( nDocType ) switch( nDocType )
{ {
@ -1034,7 +1034,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
++nTokenCount; ++nTokenCount;
} }
sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType( sAttach = comphelper::string::setToken(sAttach, nTokenCount - 1, '.', lcl_GetExtensionForDocType(
reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectEntryData()))); reinterpret_cast<sal_uLong>(m_pSendAsLB->GetSelectedEntryData())));
m_pAttachmentED->SetText(sAttach); m_pAttachmentED->SetText(sAttach);
} }
else else

2
sw/source/ui/envelp/envlop1.cxx
View File

@ -270,7 +270,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, Button*, void)
{ {
OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." + OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." +
m_pTableLB->GetSelectedEntry() + "." + m_pTableLB->GetSelectedEntry() + "." +
OUString(m_pTableLB->GetSelectEntryData() == nullptr ? '0' : '1') + "." + OUString(m_pTableLB->GetSelectedEntryData() == nullptr ? '0' : '1') + "." +
m_pDBFieldLB->GetSelectedEntry() + ">"); m_pDBFieldLB->GetSelectedEntry() + ">");
m_pAddrEdit->ReplaceSelected(aStr); m_pAddrEdit->ReplaceSelected(aStr);
Selection aSel = m_pAddrEdit->GetSelection(); Selection aSel = m_pAddrEdit->GetSelection();

4
sw/source/ui/envelp/label1.cxx
View File

@ -349,7 +349,7 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void)
{ {
OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." + OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." +
m_pTableLB->GetSelectedEntry() + "." + m_pTableLB->GetSelectedEntry() + "." +
(m_pTableLB->GetSelectEntryData() == nullptr ? OUString("0") : OUString("1")) + "." + (m_pTableLB->GetSelectedEntryData() == nullptr ? OUString("0") : OUString("1")) + "." +
m_pDBFieldLB->GetSelectedEntry() + ">"); m_pDBFieldLB->GetSelectedEntry() + ">");
m_pWritingEdit->ReplaceSelected(aStr); m_pWritingEdit->ReplaceSelected(aStr);
Selection aSel = m_pWritingEdit->GetSelection(); Selection aSel = m_pWritingEdit->GetSelection();
@ -640,7 +640,7 @@ DeactivateRC SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet)
bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet) bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet)
{ {
const OUString* pGroup = static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData()); const OUString* pGroup = static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectedEntryData());
OSL_ENSURE(pGroup, "no group selected?"); OSL_ENSURE(pGroup, "no group selected?");
if (pGroup) if (pGroup)

6
sw/source/ui/envelp/labelexp.cxx
View File

@ -79,7 +79,7 @@ void SwVisitingCardPage::InitFrameControl()
if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectedEntryPos()) if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectedEntryPos())
m_pAutoTextGroupLB->SelectEntryPos(0); m_pAutoTextGroupLB->SelectEntryPos(0);
const OUString *pCurGroupName( const OUString *pCurGroupName(
static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData())); static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectedEntryData()));
if(m_xAutoText->hasByName(*pCurGroupName)) if(m_xAutoText->hasByName(*pCurGroupName))
{ {
uno::Any aGroup = m_xAutoText->getByName(*pCurGroupName); uno::Any aGroup = m_xAutoText->getByName(*pCurGroupName);
@ -112,7 +112,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFram
if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectedEntryPos()) if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectedEntryPos())
{ {
const OUString *pGroup( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData()) ); const OUString *pGroup( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectedEntryData()) );
uno::Any aGroup = m_xAutoText->getByName(*pGroup); uno::Any aGroup = m_xAutoText->getByName(*pGroup);
uno::Reference< text::XAutoTextGroup > xGroup; uno::Reference< text::XAutoTextGroup > xGroup;
aGroup >>= xGroup; aGroup >>= xGroup;
@ -143,7 +143,7 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, ListBox&, rBox, void )
{ {
if (m_pAutoTextGroupLB == &rBox) if (m_pAutoTextGroupLB == &rBox)
{ {
const OUString *pGroup( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData())); const OUString *pGroup( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectedEntryData()));
uno::Any aGroup = m_xAutoText->getByName(*pGroup); uno::Any aGroup = m_xAutoText->getByName(*pGroup);
uno::Reference< text::XAutoTextGroup > xGroup; uno::Reference< text::XAutoTextGroup > xGroup;
aGroup >>= xGroup; aGroup >>= xGroup;

2
sw/source/ui/envelp/mailmrge.cxx
View File

@ -515,7 +515,7 @@ bool SwMailMergeDlg::ExecQryShell()
if (!AskUserFilename()) { if (!AskUserFilename()) {
pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry()); pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry());
if( m_pFilterLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) if( m_pFilterLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectEntryData()); m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectedEntryData());
m_sFilename = OUString(); m_sFilename = OUString();
} else { } else {
//#i97667# reset column name - otherwise it's remembered from the last run //#i97667# reset column name - otherwise it's remembered from the last run

2
sw/source/ui/frmdlg/column.cxx
View File

@ -243,7 +243,7 @@ void SwColumnDlg::ObjectHdl(ListBox const * pBox)
{ {
pTabPage->FillItemSet(pSet); pTabPage->FillItemSet(pSet);
} }
nOldSelection = reinterpret_cast<sal_IntPtr>(m_pApplyToLB->GetSelectEntryData()); nOldSelection = reinterpret_cast<sal_IntPtr>(m_pApplyToLB->GetSelectedEntryData());
long nWidth = nSelectionWidth; long nWidth = nSelectionWidth;
switch(nOldSelection) switch(nOldSelection)
{ {

4
sw/source/ui/frmdlg/cption.cxx
View File

@ -266,7 +266,7 @@ void SwCaptionDialog::Apply()
aOpt.SetCategory(comphelper::string::strip(aName, ' ')); aOpt.SetCategory(comphelper::string::strip(aName, ' '));
aOpt.SetNumSeparator( m_pNumberingSeparatorED->GetText() ); aOpt.SetNumSeparator( m_pNumberingSeparatorED->GetText() );
} }
aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData()) ); aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData()) );
aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() ); aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() );
aOpt.SetCaption( m_pTextEdit->GetText() ); aOpt.SetCaption( m_pTextEdit->GetText() );
aOpt.SetPos( m_pPosBox->GetSelectedEntryPos() ); aOpt.SetPos( m_pPosBox->GetSelectedEntryPos() );
@ -347,7 +347,7 @@ void SwCaptionDialog::DrawSample()
bool bNone = sFieldTypeName == m_sNone; bool bNone = sFieldTypeName == m_sNone;
if( !bNone ) if( !bNone )
{ {
const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData()); const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectedEntryData());
if( SVX_NUM_NUMBER_NONE != nNumFormat ) if( SVX_NUM_NUMBER_NONE != nNumFormat )
{ {
// category // category

4
sw/source/ui/frmdlg/frmpage.cxx
View File

@ -1661,7 +1661,7 @@ sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos,
return 0; return 0;
const RelationMap *const pRelationMap = static_cast<const RelationMap *>( const RelationMap *const pRelationMap = static_cast<const RelationMap *>(
rRelationLB.GetSelectEntryData()); rRelationLB.GetSelectedEntryData());
const LB nRel = pRelationMap->nLBRelation; const LB nRel = pRelationMap->nLBRelation;
const SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; const SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;
@ -1979,7 +1979,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void )
{ {
if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND)
nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation; nRel = static_cast<RelationMap *>(pRelLB->GetSelectedEntryData())->nRelation;
FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT); FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT);
} }

16
sw/source/ui/index/cnttab.cxx
View File

@ -1241,7 +1241,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
rDesc.SetStyleNames(aStyleArr[i], i); rDesc.SetStyleNames(aStyleArr[i], i);
rDesc.SetLanguage(m_pLanguageLB->GetSelectLanguage()); rDesc.SetLanguage(m_pLanguageLB->GetSelectLanguage());
const OUString* pEntryData = static_cast<const OUString*>(m_pSortAlgorithmLB->GetSelectEntryData()); const OUString* pEntryData = static_cast<const OUString*>(m_pSortAlgorithmLB->GetSelectedEntryData());
OSL_ENSURE(pEntryData, "no entry data available"); OSL_ENSURE(pEntryData, "no entry data available");
if(pEntryData) if(pEntryData)
rDesc.SetSortAlgorithm(*pEntryData); rDesc.SetSortAlgorithm(*pEntryData);
@ -1295,7 +1295,7 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
{ {
if(_pSet) if(_pSet)
_pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE, _pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE,
(sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectEntryData()))); (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pTypeLB->GetSelectedEntryData())));
FillTOXDescription(); FillTOXDescription();
return DeactivateRC::LeavePage; return DeactivateRC::LeavePage;
} }
@ -1309,7 +1309,7 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void)
{ {
SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog()); SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetTabDialog());
const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >( const sal_uInt16 nType = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(
rBox.GetSelectEntryData())); rBox.GetSelectedEntryData()));
CurTOXType eCurType = lcl_UserData2TOXTypes(nType); CurTOXType eCurType = lcl_UserData2TOXTypes(nType);
pTOXDlg->SetCurrentTOXType(eCurType); pTOXDlg->SetCurrentTOXType(eCurType);
@ -1438,7 +1438,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox const * pBox )
OUString sOldString; OUString sOldString;
void* pUserData; void* pUserData;
if( nullptr != (pUserData = m_pSortAlgorithmLB->GetSelectEntryData()) ) if( nullptr != (pUserData = m_pSortAlgorithmLB->GetSelectedEntryData()) )
sOldString = *static_cast<OUString*>(pUserData); sOldString = *static_cast<OUString*>(pUserData);
sal_Int32 nEnd = m_pSortAlgorithmLB->GetEntryCount(); sal_Int32 nEnd = m_pSortAlgorithmLB->GetEntryCount();
for( sal_Int32 n = 0; n < nEnd; ++n ) for( sal_Int32 n = 0; n < nEnd; ++n )
@ -2217,11 +2217,11 @@ void SwTOXEntryTabPage::UpdateDescriptor()
{ {
rDesc.SetSortByDocument(m_pSortDocPosRB->IsChecked()); rDesc.SetSortByDocument(m_pSortDocPosRB->IsChecked());
SwTOXSortKey aKey1, aKey2, aKey3; SwTOXSortKey aKey1, aKey2, aKey3;
aKey1.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pFirstKeyLB->GetSelectEntryData()); aKey1.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pFirstKeyLB->GetSelectedEntryData());
aKey1.bSortAscending = m_pFirstSortUpRB->IsChecked(); aKey1.bSortAscending = m_pFirstSortUpRB->IsChecked();
aKey2.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pSecondKeyLB->GetSelectEntryData()); aKey2.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pSecondKeyLB->GetSelectedEntryData());
aKey2.bSortAscending = m_pSecondSortUpRB->IsChecked(); aKey2.bSortAscending = m_pSecondSortUpRB->IsChecked();
aKey3.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pThirdKeyLB->GetSelectEntryData()); aKey3.eField = (ToxAuthorityField)reinterpret_cast<sal_uIntPtr>(m_pThirdKeyLB->GetSelectedEntryData());
aKey3.bSortAscending = m_pThirdSortUpRB->IsChecked(); aKey3.bSortAscending = m_pThirdSortUpRB->IsChecked();
rDesc.SetSortKeys(aKey1, aKey2, aKey3); rDesc.SetSortKeys(aKey1, aKey2, aKey3);
@ -2565,7 +2565,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void)
IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void)
{ {
OUString sEntry = rBox.GetSelectedEntry(); OUString sEntry = rBox.GetSelectedEntry();
const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectEntryData()); const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectedEntryData());
const bool bEqualsNoCharStyle = sEntry == sNoCharStyle; const bool bEqualsNoCharStyle = sEntry == sNoCharStyle;
m_pEditStylePB->Enable(!bEqualsNoCharStyle); m_pEditStylePB->Enable(!bEqualsNoCharStyle);
if (bEqualsNoCharStyle) if (bEqualsNoCharStyle)

2
sw/source/ui/misc/glosbib.cxx
View File

@ -336,7 +336,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl, Edit&, void)
bool bEnableNew = true; bool bEnableNew = true;
bool bEnableDel = false; bool bEnableDel = false;
sal_uLong nCaseReadonly = sal_uLong nCaseReadonly =
reinterpret_cast<sal_uLong>(m_pPathLB->GetSelectEntryData()); reinterpret_cast<sal_uLong>(m_pPathLB->GetSelectedEntryData());
bool bDirReadonly = 0 != (nCaseReadonly&PATH_READONLY); bool bDirReadonly = 0 != (nCaseReadonly&PATH_READONLY);
if(sEntry.isEmpty() || bDirReadonly) if(sEntry.isEmpty() || bDirReadonly)

8
sw/source/ui/misc/srtdlg.cxx
View File

@ -314,7 +314,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB1->GetSelectedEntry() ); OUString sEntry( m_pTypDLB1->GetSelectedEntry() );
if( sEntry == aNumericText ) if( sEntry == aNumericText )
sEntry.clear(); sEntry.clear();
else if( nullptr != (pUserData = m_pTypDLB1->GetSelectEntryData()) ) else if( nullptr != (pUserData = m_pTypDLB1->GetSelectedEntryData()) )
sEntry = *static_cast<OUString*>(pUserData); sEntry = *static_cast<OUString*>(pUserData);
SwSortKey *pKey = new SwSortKey( nCol1, sEntry, SwSortKey *pKey = new SwSortKey( nCol1, sEntry,
@ -327,7 +327,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB2->GetSelectedEntry() ); OUString sEntry( m_pTypDLB2->GetSelectedEntry() );
if( sEntry == aNumericText ) if( sEntry == aNumericText )
sEntry.clear(); sEntry.clear();
else if( nullptr != (pUserData = m_pTypDLB2->GetSelectEntryData()) ) else if( nullptr != (pUserData = m_pTypDLB2->GetSelectedEntryData()) )
sEntry = *static_cast<OUString*>(pUserData); sEntry = *static_cast<OUString*>(pUserData);
SwSortKey *pKey = new SwSortKey( nCol2, sEntry, SwSortKey *pKey = new SwSortKey( nCol2, sEntry,
@ -340,7 +340,7 @@ void SwSortDlg::Apply()
OUString sEntry( m_pTypDLB3->GetSelectedEntry() ); OUString sEntry( m_pTypDLB3->GetSelectedEntry() );
if( sEntry == aNumericText ) if( sEntry == aNumericText )
sEntry.clear(); sEntry.clear();
else if( nullptr != (pUserData = m_pTypDLB3->GetSelectEntryData()) ) else if( nullptr != (pUserData = m_pTypDLB3->GetSelectedEntryData()) )
sEntry = *static_cast<OUString*>(pUserData); sEntry = *static_cast<OUString*>(pUserData);
SwSortKey *pKey = new SwSortKey( nCol3, sEntry, SwSortKey *pKey = new SwSortKey( nCol3, sEntry,
@ -444,7 +444,7 @@ void SwSortDlg::LanguageHdl(ListBox const * pLBox)
for( int n = 0; n < nLstBoxCnt; ++n ) for( int n = 0; n < nLstBoxCnt; ++n )
{ {
ListBox* pL = aLstArr[ n ]; ListBox* pL = aLstArr[ n ];
void* pUserData = pL->GetSelectEntryData(); void* pUserData = pL->GetSelectedEntryData();
if (pUserData) if (pUserData)
aOldStrArr[ n ] = *static_cast<OUString*>(pUserData); aOldStrArr[ n ] = *static_cast<OUString*>(pUserData);
::lcl_ClearLstBoxAndDelUserData( *pL ); ::lcl_ClearLstBoxAndDelUserData( *pL );

2
sw/source/ui/table/tabledlg.cxx
View File

@ -1410,7 +1410,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
{ {
bModified |= nullptr != rSet->Put( bModified |= nullptr != rSet->Put(
SvxFrameDirectionItem( static_cast<SvxFrameDirection>( SvxFrameDirectionItem( static_cast<SvxFrameDirection>(
reinterpret_cast<sal_IntPtr>(m_pTextDirectionLB->GetSelectEntryData())) reinterpret_cast<sal_IntPtr>(m_pTextDirectionLB->GetSelectedEntryData()))
, FN_TABLE_BOX_TEXTORIENTATION)); , FN_TABLE_BOX_TEXTORIENTATION));
} }

4
sw/source/uibase/sidebar/PageFooterPanel.cxx
View File

@ -230,7 +230,7 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, Button*, void )
IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void ) IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void )
{ {
sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectEntryData()); sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterMarginPresetLB->GetSelectedEntryData());
mpFooterLRMarginItem->SetLeft(nVal); mpFooterLRMarginItem->SetLeft(nVal);
mpFooterLRMarginItem->SetRight(nVal); mpFooterLRMarginItem->SetRight(nVal);
GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_LRMARGIN, GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_LRMARGIN,
@ -239,7 +239,7 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterLRMarginHdl, ListBox&, void )
IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void )
{ {
sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectEntryData()); sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpFooterSpacingLB->GetSelectedEntryData());
mpFooterSpacingItem->SetUpper(nVal); mpFooterSpacingItem->SetUpper(nVal);
GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_SPACING, GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_SPACING,
SfxCallMode::RECORD, { mpFooterSpacingItem.get() } ); SfxCallMode::RECORD, { mpFooterSpacingItem.get() } );

4
sw/source/uibase/sidebar/PageHeaderPanel.cxx
View File

@ -233,7 +233,7 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, Button*, void )
IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void ) IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void )
{ {
sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectEntryData()); sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderMarginPresetLB->GetSelectedEntryData());
mpHeaderLRMarginItem->SetLeft(nVal); mpHeaderLRMarginItem->SetLeft(nVal);
mpHeaderLRMarginItem->SetRight(nVal); mpHeaderLRMarginItem->SetRight(nVal);
GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_LRMARGIN, GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_LRMARGIN,
@ -242,7 +242,7 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderLRMarginHdl, ListBox&, void )
IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void )
{ {
sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectEntryData()); sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(mpHeaderSpacingLB->GetSelectedEntryData());
mpHeaderSpacingItem->SetLower(nVal); mpHeaderSpacingItem->SetLower(nVal);
GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_SPACING, GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_SPACING,
SfxCallMode::RECORD, { mpHeaderSpacingItem.get() } ); SfxCallMode::RECORD, { mpHeaderSpacingItem.get() } );

2
sw/source/uibase/sidebar/WrapPropertyPanel.cxx
View File

@ -214,7 +214,7 @@ IMPL_LINK_NOARG(WrapPropertyPanel, EnableContourHdl, Button*, void)
IMPL_LINK(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void) IMPL_LINK(WrapPropertyPanel, SpacingLBHdl, ListBox&, rBox, void)
{ {
sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(rBox.GetSelectEntryData()); sal_uInt16 nVal = (sal_uInt16)reinterpret_cast<sal_uLong>(rBox.GetSelectedEntryData());
SvxLRSpaceItem aLRItem(nVal, nVal, 0, 0, RES_LR_SPACE); SvxLRSpaceItem aLRItem(nVal, nVal, 0, 0, RES_LR_SPACE);
SvxULSpaceItem aULItem(nVal, nVal, RES_UL_SPACE); SvxULSpaceItem aULItem(nVal, nVal, RES_UL_SPACE);

2
vcl/source/window/printdlg.cxx
View File

@ -1364,7 +1364,7 @@ Size const & PrintDialog::getJobPageSize()
void PrintDialog::updateNupFromPages() void PrintDialog::updateNupFromPages()
{ {
sal_IntPtr nPages = sal_IntPtr(maNUpPage.mpNupPagesBox->GetSelectEntryData()); sal_IntPtr nPages = sal_IntPtr(maNUpPage.mpNupPagesBox->GetSelectedEntryData());
int nRows = int(maNUpPage.mpNupRowsEdt->GetValue()); int nRows = int(maNUpPage.mpNupRowsEdt->GetValue());
int nCols = int(maNUpPage.mpNupColEdt->GetValue()); int nCols = int(maNUpPage.mpNupColEdt->GetValue());
long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize(maNUpPage.mpPageMarginEdt->GetValue( FUNIT_100TH_MM )); long nPageMargin = maNUpPage.mpPageMarginEdt->Denormalize(maNUpPage.mpPageMarginEdt->GetValue( FUNIT_100TH_MM ));

12
vcl/unx/generic/print/prtsetup.cxx
View File

@ -286,7 +286,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void )
} }
if( pKey ) if( pKey )
{ {
PPDValue* pValue = static_cast<PPDValue*>(rBox.GetSelectEntryData()); PPDValue* pValue = static_cast<PPDValue*>(rBox.GetSelectedEntryData());
m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue ); m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue );
update(); update();
} }
@ -432,7 +432,7 @@ sal_uLong RTSDevicePage::getColorDevice()
sal_uLong RTSDevicePage::getLevel() sal_uLong RTSDevicePage::getLevel()
{ {
sal_uLong nLevel = reinterpret_cast<sal_uLong>(m_pLevelBox->GetSelectEntryData()); sal_uLong nLevel = reinterpret_cast<sal_uLong>(m_pLevelBox->GetSelectedEntryData());
if (nLevel == 0) if (nLevel == 0)
return 0; //automatic return 0; //automatic
return nLevel < 10 ? nLevel-1 : 0; return nLevel < 10 ? nLevel-1 : 0;
@ -440,7 +440,7 @@ sal_uLong RTSDevicePage::getLevel()
sal_uLong RTSDevicePage::getPDFDevice() sal_uLong RTSDevicePage::getPDFDevice()
{ {
sal_uLong nLevel = reinterpret_cast<sal_uLong>(m_pLevelBox->GetSelectEntryData()); sal_uLong nLevel = reinterpret_cast<sal_uLong>(m_pLevelBox->GetSelectedEntryData());
if (nLevel > 9) if (nLevel > 9)
return 2; //explicitly PDF return 2; //explicitly PDF
else if (nLevel == 0) else if (nLevel == 0)
@ -460,13 +460,13 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox&, rBox, void )
{ {
if( &rBox == m_pPPDKeyBox ) if( &rBox == m_pPPDKeyBox )
{ {
const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectEntryData()); const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectedEntryData());
FillValueBox( pKey ); FillValueBox( pKey );
} }
else if( &rBox == m_pPPDValueBox ) else if( &rBox == m_pPPDValueBox )
{ {
const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectEntryData()); const PPDKey* pKey = static_cast<PPDKey*>(m_pPPDKeyBox->GetSelectedEntryData());
const PPDValue* pValue = static_cast<PPDValue*>(m_pPPDValueBox->GetSelectEntryData()); const PPDValue* pValue = static_cast<PPDValue*>(m_pPPDValueBox->GetSelectedEntryData());
if (pKey && pValue) if (pKey && pValue)
{ {
m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue ); m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue );

2
writerperfect/source/common/WPFTEncodingDialog.cxx
View File

@ -104,7 +104,7 @@ void selectEncoding(ListBox *box, const OUString &encoding)
OUString getEncoding(ListBox const *box) OUString getEncoding(ListBox const *box)
{ {
sal_uIntPtr pos = reinterpret_cast<sal_uIntPtr>(box->GetSelectEntryData()); sal_uIntPtr pos = reinterpret_cast<sal_uIntPtr>(box->GetSelectedEntryData());
if (pos>=numEncodings) if (pos>=numEncodings)
return OUString(); return OUString();
return s_encodings[pos].first; return s_encodings[pos].first;