Rename GetSelectEntry -> GetSelectedEntry
Change-Id: Ibb7d8c59c0e61b0e87455bd78f241d8691dd9dce Reviewed-on: https://gerrit.libreoffice.org/42282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
parent
06ce312f79
commit
b649e5bf1d
@ -55,7 +55,7 @@ OUString VCLXAccessibleTextField::implGetText()
|
|||||||
OUString aText;
|
OUString aText;
|
||||||
VclPtr< ListBox > pListBox = GetAs< ListBox >();
|
VclPtr< ListBox > pListBox = GetAs< ListBox >();
|
||||||
if (pListBox && !pListBox->IsInDropDown())
|
if (pListBox && !pListBox->IsInDropDown())
|
||||||
aText = pListBox->GetSelectEntry();
|
aText = pListBox->GetSelectedEntry();
|
||||||
|
|
||||||
return aText;
|
return aText;
|
||||||
}
|
}
|
||||||
|
@ -167,7 +167,7 @@ void LibBox::Update( const SfxStringItem* pItem )
|
|||||||
aCurText = IDEResId(RID_STR_ALL);
|
aCurText = IDEResId(RID_STR_ALL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( GetSelectEntry() != aCurText )
|
if ( GetSelectedEntry() != aCurText )
|
||||||
SelectEntry( aCurText );
|
SelectEntry( aCurText );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,7 +191,7 @@ void LibBox::FillBox()
|
|||||||
SetUpdateMode(false);
|
SetUpdateMode(false);
|
||||||
bIgnoreSelect = true;
|
bIgnoreSelect = true;
|
||||||
|
|
||||||
aCurText = GetSelectEntry();
|
aCurText = GetSelectedEntry();
|
||||||
|
|
||||||
SelectEntryPos( 0 );
|
SelectEntryPos( 0 );
|
||||||
ClearBox();
|
ClearBox();
|
||||||
@ -217,7 +217,7 @@ void LibBox::FillBox()
|
|||||||
if ( !GetSelectEntryCount() )
|
if ( !GetSelectEntryCount() )
|
||||||
{
|
{
|
||||||
SelectEntryPos( GetEntryCount() );
|
SelectEntryPos( GetEntryCount() );
|
||||||
aCurText = GetSelectEntry();
|
aCurText = GetSelectedEntry();
|
||||||
}
|
}
|
||||||
bIgnoreSelect = false;
|
bIgnoreSelect = false;
|
||||||
}
|
}
|
||||||
@ -387,7 +387,7 @@ void LanguageBox::FillBox()
|
|||||||
{
|
{
|
||||||
SetUpdateMode(false);
|
SetUpdateMode(false);
|
||||||
m_bIgnoreSelect = true;
|
m_bIgnoreSelect = true;
|
||||||
m_sCurrentText = GetSelectEntry();
|
m_sCurrentText = GetSelectedEntry();
|
||||||
ClearBox();
|
ClearBox();
|
||||||
|
|
||||||
std::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr());
|
std::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr());
|
||||||
@ -421,7 +421,7 @@ void LanguageBox::FillBox()
|
|||||||
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
|
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
|
||||||
{
|
{
|
||||||
SelectEntryPos( nSelPos );
|
SelectEntryPos( nSelPos );
|
||||||
m_sCurrentText = GetSelectEntry();
|
m_sCurrentText = GetSelectedEntry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -501,7 +501,7 @@ void LanguageBox::Update( const SfxStringItem* pItem )
|
|||||||
if ( pItem && !pItem->GetValue().isEmpty() )
|
if ( pItem && !pItem->GetValue().isEmpty() )
|
||||||
{
|
{
|
||||||
m_sCurrentText = pItem->GetValue();
|
m_sCurrentText = pItem->GetValue();
|
||||||
if ( GetSelectEntry() != m_sCurrentText )
|
if ( GetSelectedEntry() != m_sCurrentText )
|
||||||
SelectEntry( m_sCurrentText );
|
SelectEntry( m_sCurrentText );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2628,16 +2628,16 @@ void CodeCompleteListBox::InsertSelectedEntry()
|
|||||||
GetParentEditView()->SetSelection( pCodeCompleteWindow->pParent->GetLastHighlightPortionTextSelection() );
|
GetParentEditView()->SetSelection( pCodeCompleteWindow->pParent->GetLastHighlightPortionTextSelection() );
|
||||||
GetParentEditView()->DeleteSelected();
|
GetParentEditView()->DeleteSelected();
|
||||||
|
|
||||||
if( !GetSelectEntry().isEmpty() )
|
if( !GetSelectedEntry().isEmpty() )
|
||||||
{//if the user selected something
|
{//if the user selected something
|
||||||
GetParentEditView()->InsertText( GetSelectEntry() );
|
GetParentEditView()->InsertText( GetSelectedEntry() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( !GetSelectEntry().isEmpty() )
|
if( !GetSelectedEntry().isEmpty() )
|
||||||
{//if the user selected something
|
{//if the user selected something
|
||||||
GetParentEditView()->InsertText( GetSelectEntry() );
|
GetParentEditView()->InsertText( GetSelectedEntry() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
HideAndRestoreFocus();
|
HideAndRestoreFocus();
|
||||||
@ -2718,7 +2718,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& rKeyEvt )
|
|||||||
|
|
||||||
GetParentEditView()->SetSelection( aTextSelection );
|
GetParentEditView()->SetSelection( aTextSelection );
|
||||||
GetParentEditView()->DeleteSelected();
|
GetParentEditView()->DeleteSelected();
|
||||||
GetParentEditView()->InsertText( GetSelectEntry() );
|
GetParentEditView()->InsertText( GetSelectedEntry() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -2867,7 +2867,7 @@ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:45
|
|||||||
int nStyle
|
int nStyle
|
||||||
0
|
0
|
||||||
vcl/inc/listbox.hxx:133
|
vcl/inc/listbox.hxx:133
|
||||||
class rtl::OUString ImplEntryList::GetSelectEntry(int) const
|
class rtl::OUString ImplEntryList::GetSelectedEntry(int) const
|
||||||
int nIndex
|
int nIndex
|
||||||
0
|
0
|
||||||
vcl/inc/listbox.hxx:309
|
vcl/inc/listbox.hxx:309
|
||||||
|
@ -466,9 +466,9 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void )
|
|||||||
//if it's not the 'no suggestions' entry
|
//if it's not the 'no suggestions' entry
|
||||||
if(sWrong == sCurrentErrorText &&
|
if(sWrong == sCurrentErrorText &&
|
||||||
m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 &&
|
m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 &&
|
||||||
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
|
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry())
|
||||||
{
|
{
|
||||||
sCurrentErrorText = m_pSuggestionLB->GetSelectEntry();
|
sCurrentErrorText = m_pSuggestionLB->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
if(sWrong != sCurrentErrorText)
|
if(sWrong != sCurrentErrorText)
|
||||||
{
|
{
|
||||||
@ -530,8 +530,8 @@ OUString SpellDialog::getReplacementString() const
|
|||||||
|
|
||||||
if(m_pSuggestionLB->IsEnabled() &&
|
if(m_pSuggestionLB->IsEnabled() &&
|
||||||
m_pSuggestionLB->GetSelectEntryCount()>0 &&
|
m_pSuggestionLB->GetSelectEntryCount()>0 &&
|
||||||
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry())
|
m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry())
|
||||||
sReplacement = m_pSuggestionLB->GetSelectEntry();
|
sReplacement = m_pSuggestionLB->GetSelectedEntry();
|
||||||
|
|
||||||
return getDotReplacementString(sOrigString, sReplacement);
|
return getDotReplacementString(sOrigString, sReplacement);
|
||||||
}
|
}
|
||||||
|
@ -421,7 +421,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void)
|
|||||||
|
|
||||||
sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos();
|
sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos();
|
||||||
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
|
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
|
||||||
m_arrContextFields[nCurrentContext] = m_plbField->GetSelectEntry();
|
m_arrContextFields[nCurrentContext] = m_plbField->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
|
IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void)
|
||||||
@ -850,7 +850,7 @@ void FmSearchDialog::SaveParams() const
|
|||||||
for (sal_Int32 i=0; i<m_pcmbSearchText->GetEntryCount(); ++i, ++pHistory)
|
for (sal_Int32 i=0; i<m_pcmbSearchText->GetEntryCount(); ++i, ++pHistory)
|
||||||
*pHistory = m_pcmbSearchText->GetEntry(i);
|
*pHistory = m_pcmbSearchText->GetEntry(i);
|
||||||
|
|
||||||
aCurrentSettings.sSingleSearchField = m_plbField->GetSelectEntry();
|
aCurrentSettings.sSingleSearchField = m_plbField->GetSelectedEntry();
|
||||||
aCurrentSettings.bAllFields = m_prbAllFields->IsChecked();
|
aCurrentSettings.bAllFields = m_prbAllFields->IsChecked();
|
||||||
aCurrentSettings.nPosition = m_pSearchEngine->GetPosition();
|
aCurrentSettings.nPosition = m_pSearchEngine->GetPosition();
|
||||||
aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing();
|
aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing();
|
||||||
|
@ -1052,7 +1052,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
|
|||||||
|
|
||||||
void TPGalleryThemeProperties::DoPreview()
|
void TPGalleryThemeProperties::DoPreview()
|
||||||
{
|
{
|
||||||
OUString aString( m_pLbxFound->GetSelectEntry() );
|
OUString aString( m_pLbxFound->GetSelectedEntry() );
|
||||||
|
|
||||||
if( aString != aPreviewString )
|
if( aString != aPreviewString )
|
||||||
{
|
{
|
||||||
|
@ -532,9 +532,9 @@ namespace svx
|
|||||||
{
|
{
|
||||||
return m_aListBox->GetEntry( nPos );
|
return m_aListBox->GetEntry( nPos );
|
||||||
}
|
}
|
||||||
OUString SuggestionDisplay::GetSelectEntry() const
|
OUString SuggestionDisplay::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
return m_aListBox->GetSelectEntry();
|
return m_aListBox->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
void SuggestionDisplay::SetHelpIds()
|
void SuggestionDisplay::SetHelpIds()
|
||||||
{
|
{
|
||||||
@ -711,7 +711,7 @@ namespace svx
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void )
|
IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void )
|
||||||
{
|
{
|
||||||
m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() );
|
m_pWordInput->SetText( m_pSuggestions->GetSelectedEntry() );
|
||||||
OnSuggestionModified( *m_pWordInput );
|
OnSuggestionModified( *m_pWordInput );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -208,7 +208,7 @@ short SvInsertOleDlg::Execute()
|
|||||||
if ( bCreateNew )
|
if ( bCreateNew )
|
||||||
{
|
{
|
||||||
// create and insert new embedded object
|
// create and insert new embedded object
|
||||||
OUString aServerName = m_pLbObjecttype->GetSelectEntry();
|
OUString aServerName = m_pLbObjecttype->GetSelectedEntry();
|
||||||
const SvObjectServer* pS = m_pServers->Get( aServerName );
|
const SvObjectServer* pS = m_pServers->Get( aServerName );
|
||||||
if ( pS )
|
if ( pS )
|
||||||
{
|
{
|
||||||
|
@ -348,7 +348,7 @@ IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void )
|
|||||||
|
|
||||||
IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void )
|
IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void )
|
||||||
{
|
{
|
||||||
OUString aLangText( rLB.GetSelectEntry() );
|
OUString aLangText( rLB.GetSelectedEntry() );
|
||||||
LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText );
|
LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText );
|
||||||
DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" );
|
DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" );
|
||||||
if (xThesaurus->hasLocale( LanguageTag::convertToLocale( nLang ) ))
|
if (xThesaurus->hasLocale( LanguageTag::convertToLocale( nLang ) ))
|
||||||
|
@ -67,7 +67,7 @@ namespace svx
|
|||||||
sal_uInt16 GetEntryCount() const;
|
sal_uInt16 GetEntryCount() const;
|
||||||
|
|
||||||
OUString GetEntry( sal_uInt16 nPos ) const;
|
OUString GetEntry( sal_uInt16 nPos ) const;
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
|
|
||||||
virtual void StateChanged( StateChangedType nStateChange ) override;
|
virtual void StateChanged( StateChangedType nStateChange ) override;
|
||||||
|
|
||||||
|
@ -188,7 +188,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
|
|||||||
comphelper::ConfigurationChanges::create());
|
comphelper::ConfigurationChanges::create());
|
||||||
if(m_pFontHeightLB->IsValueChangedFromSaved())
|
if(m_pFontHeightLB->IsValueChangedFromSaved())
|
||||||
officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
|
officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
|
||||||
static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectEntry().toInt32()),
|
static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectedEntry().toInt32()),
|
||||||
batch);
|
batch);
|
||||||
if(m_pNonPropFontsOnlyCB->IsValueChangedFromSaved())
|
if(m_pNonPropFontsOnlyCB->IsValueChangedFromSaved())
|
||||||
officecfg::Office::Common::Font::SourceViewFont::
|
officecfg::Office::Common::Font::SourceViewFont::
|
||||||
@ -197,7 +197,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
|
|||||||
//font name changes cannot be detected by saved values
|
//font name changes cannot be detected by saved values
|
||||||
OUString sFontName;
|
OUString sFontName;
|
||||||
if(m_pFontNameLB->GetSelectEntryPos())
|
if(m_pFontNameLB->GetSelectEntryPos())
|
||||||
sFontName = m_pFontNameLB->GetSelectEntry();
|
sFontName = m_pFontNameLB->GetSelectedEntry();
|
||||||
officecfg::Office::Common::Font::SourceViewFont::FontName::set(
|
officecfg::Office::Common::Font::SourceViewFont::FontName::set(
|
||||||
boost::optional< OUString >(sFontName), batch);
|
boost::optional< OUString >(sFontName), batch);
|
||||||
batch->commit();
|
batch->commit();
|
||||||
@ -345,7 +345,7 @@ void SvxFontSubstTabPage::SelectHdl(vcl::Window const * pWin)
|
|||||||
|
|
||||||
IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void)
|
IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void)
|
||||||
{
|
{
|
||||||
OUString sFontName = m_pFontNameLB->GetSelectEntry();
|
OUString sFontName = m_pFontNameLB->GetSelectedEntry();
|
||||||
bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked();
|
bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked();
|
||||||
m_pFontNameLB->Clear();
|
m_pFontNameLB->Clear();
|
||||||
FontList aFntLst( Application::GetDefaultDevice() );
|
FontList aFntLst( Application::GetDefaultDevice() );
|
||||||
|
@ -334,7 +334,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void)
|
|||||||
sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos();
|
sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos();
|
||||||
if( nIdx != LISTBOX_ENTRY_NOTFOUND )
|
if( nIdx != LISTBOX_ENTRY_NOTFOUND )
|
||||||
{
|
{
|
||||||
const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectEntry() );
|
const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectedEntry() );
|
||||||
|
|
||||||
ModifyColorEntry(aEntry, nIdx);
|
ModifyColorEntry(aEntry, nIdx);
|
||||||
pColorConfig->ReplaceColorByIndex( nIdx, aEntry );
|
pColorConfig->ReplaceColorByIndex( nIdx, aEntry );
|
||||||
|
@ -1097,8 +1097,8 @@ void SvxColorOptionsTabPage::UpdateColorConfig()
|
|||||||
|
|
||||||
IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void)
|
IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void)
|
||||||
{
|
{
|
||||||
pColorConfig->LoadScheme(rBox.GetSelectEntry());
|
pColorConfig->LoadScheme(rBox.GetSelectedEntry());
|
||||||
pExtColorConfig->LoadScheme(rBox.GetSelectEntry());
|
pExtColorConfig->LoadScheme(rBox.GetSelectedEntry());
|
||||||
UpdateColorConfig();
|
UpdateColorConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1134,7 +1134,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void )
|
|||||||
aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE));
|
aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE));
|
||||||
if(RET_YES == aQuery->Execute())
|
if(RET_YES == aQuery->Execute())
|
||||||
{
|
{
|
||||||
OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry());
|
OUString sDeleteScheme(m_pColorSchemeLB->GetSelectedEntry());
|
||||||
m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos());
|
m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos());
|
||||||
m_pColorSchemeLB->SelectEntryPos(0);
|
m_pColorSchemeLB->SelectEntryPos(0);
|
||||||
m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB);
|
m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB);
|
||||||
|
@ -451,7 +451,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void)
|
|||||||
{
|
{
|
||||||
ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo);
|
ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo);
|
||||||
OUString sTxt(aBox->get_primary_text());
|
OUString sTxt(aBox->get_primary_text());
|
||||||
sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() );
|
sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectedEntry() );
|
||||||
aBox->set_primary_text(sTxt);
|
aBox->set_primary_text(sTxt);
|
||||||
|
|
||||||
if ( aBox->Execute() == RET_YES )
|
if ( aBox->Execute() == RET_YES )
|
||||||
|
@ -809,7 +809,7 @@ void SvxJavaParameterDlg::EditParameter()
|
|||||||
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
|
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
|
||||||
{
|
{
|
||||||
ScopedVclPtrInstance< InputDialog > pParamEditDlg(CuiResId(RID_SVXSTR_JAVA_START_PARAM), this);
|
ScopedVclPtrInstance< InputDialog > pParamEditDlg(CuiResId(RID_SVXSTR_JAVA_START_PARAM), this);
|
||||||
OUString editableClassPath = m_pAssignedList->GetSelectEntry();
|
OUString editableClassPath = m_pAssignedList->GetSelectedEntry();
|
||||||
pParamEditDlg->SetEntryText( editableClassPath );
|
pParamEditDlg->SetEntryText( editableClassPath );
|
||||||
pParamEditDlg->HideHelpBtn();
|
pParamEditDlg->HideHelpBtn();
|
||||||
|
|
||||||
@ -914,7 +914,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
|
|||||||
OUString sFolder;
|
OUString sFolder;
|
||||||
if ( m_pPathList->GetSelectEntryCount() > 0 )
|
if ( m_pPathList->GetSelectEntryCount() > 0 )
|
||||||
{
|
{
|
||||||
INetURLObject aObj( m_pPathList->GetSelectEntry(), FSysStyle::Detect );
|
INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect );
|
||||||
sFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
sFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void)
|
|||||||
OUString sOldFolder;
|
OUString sOldFolder;
|
||||||
if ( m_pPathList->GetSelectEntryCount() > 0 )
|
if ( m_pPathList->GetSelectEntryCount() > 0 )
|
||||||
{
|
{
|
||||||
INetURLObject aObj( m_pPathList->GetSelectEntry(), FSysStyle::Detect );
|
INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect );
|
||||||
sOldFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
sOldFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -612,7 +612,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
OUString sSelect = rBox.GetSelectEntry();
|
OUString sSelect = rBox.GetSelectedEntry();
|
||||||
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray();
|
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray();
|
||||||
OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
|
OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray();
|
||||||
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
|
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
|
||||||
|
@ -1701,13 +1701,13 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void)
|
|||||||
{
|
{
|
||||||
if (&rBox == m_pAbbrevLB)
|
if (&rBox == m_pAbbrevLB)
|
||||||
{
|
{
|
||||||
m_pAbbrevED->SetText(rBox.GetSelectEntry());
|
m_pAbbrevED->SetText(rBox.GetSelectedEntry());
|
||||||
m_pNewAbbrevPB->Enable(false);
|
m_pNewAbbrevPB->Enable(false);
|
||||||
m_pDelAbbrevPB->Enable();
|
m_pDelAbbrevPB->Enable();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_pDoubleCapsED->SetText(rBox.GetSelectEntry());
|
m_pDoubleCapsED->SetText(rBox.GetSelectedEntry());
|
||||||
m_pNewDoublePB->Enable(false);
|
m_pNewDoublePB->Enable(false);
|
||||||
m_pDelDoublePB->Enable();
|
m_pDelDoublePB->Enable();
|
||||||
}
|
}
|
||||||
@ -1715,22 +1715,22 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void)
|
|||||||
|
|
||||||
IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void)
|
IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void)
|
||||||
{
|
{
|
||||||
// sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry();
|
// sal_Bool bSame = pEdt->GetText() == ->GetSelectedEntry();
|
||||||
const OUString& sEntry = rEdt.GetText();
|
const OUString& sEntry = rEdt.GetText();
|
||||||
bool bEntryLen = !sEntry.isEmpty();
|
bool bEntryLen = !sEntry.isEmpty();
|
||||||
if(&rEdt == m_pAbbrevED)
|
if(&rEdt == m_pAbbrevED)
|
||||||
{
|
{
|
||||||
bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass);
|
bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass);
|
||||||
if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry())
|
if(bSame && sEntry != m_pAbbrevLB->GetSelectedEntry())
|
||||||
rEdt.SetText(m_pAbbrevLB->GetSelectEntry());
|
rEdt.SetText(m_pAbbrevLB->GetSelectedEntry());
|
||||||
m_pNewAbbrevPB->Enable(!bSame && bEntryLen);
|
m_pNewAbbrevPB->Enable(!bSame && bEntryLen);
|
||||||
m_pDelAbbrevPB->Enable(bSame && bEntryLen);
|
m_pDelAbbrevPB->Enable(bSame && bEntryLen);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass);
|
bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass);
|
||||||
if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry())
|
if(bSame && sEntry != m_pDoubleCapsLB->GetSelectedEntry())
|
||||||
rEdt.SetText(m_pDoubleCapsLB->GetSelectEntry());
|
rEdt.SetText(m_pDoubleCapsLB->GetSelectedEntry());
|
||||||
m_pNewDoublePB->Enable(!bSame && bEntryLen);
|
m_pNewDoublePB->Enable(!bSame && bEntryLen);
|
||||||
m_pDelDoublePB->Enable(bSame && bEntryLen);
|
m_pDelDoublePB->Enable(bSame && bEntryLen);
|
||||||
}
|
}
|
||||||
@ -2395,7 +2395,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
|
|||||||
|
|
||||||
for( sal_Int32 n = 0; n < nSelCnt; ++n )
|
for( sal_Int32 n = 0; n < nSelCnt; ++n )
|
||||||
{
|
{
|
||||||
sData.append(OUStringToOString(m_pLBEntries->GetSelectEntry(n),
|
sData.append(OUStringToOString(m_pLBEntries->GetSelectedEntry(n),
|
||||||
nEncode));
|
nEncode));
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
sData.append("\015\012");
|
sData.append("\015\012");
|
||||||
|
@ -3340,9 +3340,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet )
|
|||||||
const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES );
|
const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES );
|
||||||
bool bOn = m_pTwoLinesBtn->IsChecked();
|
bool bOn = m_pTwoLinesBtn->IsChecked();
|
||||||
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
|
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
|
||||||
? m_pStartBracketLB->GetSelectEntry()[0] : 0;
|
? m_pStartBracketLB->GetSelectedEntry()[0] : 0;
|
||||||
sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
|
sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
|
||||||
? m_pEndBracketLB->GetSelectEntry()[0] : 0;
|
? m_pEndBracketLB->GetSelectedEntry()[0] : 0;
|
||||||
|
|
||||||
if ( pOld )
|
if ( pOld )
|
||||||
{
|
{
|
||||||
@ -3366,9 +3366,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet )
|
|||||||
void SvxCharTwoLinesPage::UpdatePreview_Impl()
|
void SvxCharTwoLinesPage::UpdatePreview_Impl()
|
||||||
{
|
{
|
||||||
sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0
|
sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0
|
||||||
? m_pStartBracketLB->GetSelectEntry()[0] : 0;
|
? m_pStartBracketLB->GetSelectedEntry()[0] : 0;
|
||||||
sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0
|
sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0
|
||||||
? m_pEndBracketLB->GetSelectEntry()[0] : 0;
|
? m_pEndBracketLB->GetSelectedEntry()[0] : 0;
|
||||||
m_pPreviewWin->SetBrackets(cStart, cEnd);
|
m_pPreviewWin->SetBrackets(cStart, cEnd);
|
||||||
m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
|
m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
|
||||||
m_pPreviewWin->Invalidate();
|
m_pPreviewWin->Invalidate();
|
||||||
|
@ -807,7 +807,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
|
|||||||
if(m_pLbLanguage->IsVisible() &&
|
if(m_pLbLanguage->IsVisible() &&
|
||||||
LISTBOX_ENTRY_NOTFOUND != m_pLbLanguage->GetEntryPos(sAutomaticEntry))
|
LISTBOX_ENTRY_NOTFOUND != m_pLbLanguage->GetEntryPos(sAutomaticEntry))
|
||||||
rCoreAttrs->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO,
|
rCoreAttrs->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO,
|
||||||
m_pLbLanguage->GetSelectEntry() == sAutomaticEntry));
|
m_pLbLanguage->GetSelectedEntry() == sAutomaticEntry));
|
||||||
}
|
}
|
||||||
|
|
||||||
return bDataChanged;
|
return bDataChanged;
|
||||||
|
@ -2213,7 +2213,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void)
|
|||||||
{
|
{
|
||||||
bAutomaticCharStyles = false;
|
bAutomaticCharStyles = false;
|
||||||
sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos();
|
sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos();
|
||||||
OUString sEntry = m_pCharFmtLB->GetSelectEntry();
|
OUString sEntry = m_pCharFmtLB->GetSelectedEntry();
|
||||||
sal_uInt16 nMask = 1;
|
sal_uInt16 nMask = 1;
|
||||||
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
|
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
|
||||||
{
|
{
|
||||||
|
@ -850,7 +850,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
|
|||||||
{
|
{
|
||||||
bModified = true;
|
bModified = true;
|
||||||
rSet->Put(SfxStringItem(SID_SWREGISTER_COLLECTION,
|
rSet->Put(SfxStringItem(SID_SWREGISTER_COLLECTION,
|
||||||
m_pRegisterLB->GetSelectEntry()));
|
m_pRegisterLB->GetSelectedEntry()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -894,7 +894,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void)
|
|||||||
// already filled
|
// already filled
|
||||||
return;
|
return;
|
||||||
|
|
||||||
OUString aOldName = m_pPaperTrayBox->GetSelectEntry();
|
OUString aOldName = m_pPaperTrayBox->GetSelectedEntry();
|
||||||
m_pPaperTrayBox->SetUpdateMode( false );
|
m_pPaperTrayBox->SetUpdateMode( false );
|
||||||
m_pPaperTrayBox->Clear();
|
m_pPaperTrayBox->Clear();
|
||||||
sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry(
|
sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry(
|
||||||
|
@ -1427,7 +1427,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
|
|||||||
{
|
{
|
||||||
if ( eState == TRISTATE_TRUE )
|
if ( eState == TRISTATE_TRUE )
|
||||||
{
|
{
|
||||||
sPage = m_pApplyCollBox->GetSelectEntry();
|
sPage = m_pApplyCollBox->GetSelectedEntry();
|
||||||
bIsPageModel = !sPage.isEmpty();
|
bIsPageModel = !sPage.isEmpty();
|
||||||
}
|
}
|
||||||
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_MODEL );
|
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_MODEL );
|
||||||
|
@ -1455,7 +1455,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox const &rAlignLB)
|
|||||||
if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap)
|
if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap)
|
||||||
{
|
{
|
||||||
std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap);
|
std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap);
|
||||||
OUString sSelEntry(rAlignLB.GetSelectEntry());
|
OUString sSelEntry(rAlignLB.GetSelectedEntry());
|
||||||
|
|
||||||
for (std::size_t i = 0; i < nMapCount; i++)
|
for (std::size_t i = 0; i < nMapCount; i++)
|
||||||
{
|
{
|
||||||
@ -1672,7 +1672,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
|
|||||||
{
|
{
|
||||||
if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap)
|
if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap)
|
||||||
{
|
{
|
||||||
OUString sOldEntry(rLB.GetSelectEntry());
|
OUString sOldEntry(rLB.GetSelectedEntry());
|
||||||
SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;
|
SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId;
|
||||||
|
|
||||||
for (std::size_t _nMapPos = 0; _nMapPos < nMapCount; _nMapPos++)
|
for (std::size_t _nMapPos = 0; _nMapPos < nMapCount; _nMapPos++)
|
||||||
@ -1806,7 +1806,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
|
|||||||
ListBox &_rLB)
|
ListBox &_rLB)
|
||||||
{
|
{
|
||||||
OUString sSelEntry, sOldEntry;
|
OUString sSelEntry, sOldEntry;
|
||||||
sOldEntry = _rLB.GetSelectEntry();
|
sOldEntry = _rLB.GetSelectedEntry();
|
||||||
|
|
||||||
_rLB.Clear();
|
_rLB.Clear();
|
||||||
|
|
||||||
|
@ -271,7 +271,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
|
|||||||
rSet->Put( XFillBackgroundItem( m_pCbBackgroundColor->IsChecked() ) );
|
rSet->Put( XFillBackgroundItem( m_pCbBackgroundColor->IsChecked() ) );
|
||||||
if (m_pCbBackgroundColor->IsChecked())
|
if (m_pCbBackgroundColor->IsChecked())
|
||||||
{
|
{
|
||||||
NamedColor aColor = m_pLbBackgroundColor->GetSelectEntry();
|
NamedColor aColor = m_pLbBackgroundColor->GetSelectedEntry();
|
||||||
rSet->Put(XFillColorItem(aColor.second, aColor.first));
|
rSet->Put(XFillColorItem(aColor.second, aColor.first));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -701,7 +701,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
|
|||||||
// For added security
|
// For added security
|
||||||
if( m_pDashList->Count() > (long) ( nPos - 2 ) )
|
if( m_pDashList->Count() > (long) ( nPos - 2 ) )
|
||||||
{
|
{
|
||||||
XLineDashItem aDashItem( m_pLbLineStyle->GetSelectEntry(),
|
XLineDashItem aDashItem( m_pLbLineStyle->GetSelectedEntry(),
|
||||||
m_pDashList->GetDash( nPos - 2 )->GetDash() );
|
m_pDashList->GetDash( nPos - 2 )->GetDash() );
|
||||||
pOld = GetOldItem( *rAttrs, XATTR_LINEDASH );
|
pOld = GetOldItem( *rAttrs, XATTR_LINEDASH );
|
||||||
if ( !pOld || !( *static_cast<const XLineDashItem*>(pOld) == aDashItem ) )
|
if ( !pOld || !( *static_cast<const XLineDashItem*>(pOld) == aDashItem ) )
|
||||||
@ -756,7 +756,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
|
|||||||
|
|
||||||
// Line color
|
// Line color
|
||||||
{
|
{
|
||||||
NamedColor aColor = m_pLbColor->GetSelectEntry();
|
NamedColor aColor = m_pLbColor->GetSelectedEntry();
|
||||||
XLineColorItem aItem(aColor.second, aColor.first);
|
XLineColorItem aItem(aColor.second, aColor.first);
|
||||||
pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR );
|
pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR );
|
||||||
if ( !pOld || !( *static_cast<const XLineColorItem*>(pOld) == aItem ) )
|
if ( !pOld || !( *static_cast<const XLineColorItem*>(pOld) == aItem ) )
|
||||||
@ -776,7 +776,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
|
|||||||
if( nPos == 0 )
|
if( nPos == 0 )
|
||||||
pItem.reset(new XLineStartItem());
|
pItem.reset(new XLineStartItem());
|
||||||
else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
|
else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
|
||||||
pItem.reset(new XLineStartItem( m_pLbStartStyle->GetSelectEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
|
pItem.reset(new XLineStartItem( m_pLbStartStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
|
||||||
pOld = GetOldItem( *rAttrs, XATTR_LINESTART );
|
pOld = GetOldItem( *rAttrs, XATTR_LINESTART );
|
||||||
if( pItem && ( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) )
|
if( pItem && ( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) )
|
||||||
{
|
{
|
||||||
@ -792,7 +792,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
|
|||||||
if( nPos == 0 )
|
if( nPos == 0 )
|
||||||
pItem.reset(new XLineEndItem());
|
pItem.reset(new XLineEndItem());
|
||||||
else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
|
else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) )
|
||||||
pItem.reset(new XLineEndItem( m_pLbEndStyle->GetSelectEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
|
pItem.reset(new XLineEndItem( m_pLbEndStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ));
|
||||||
pOld = GetOldItem( *rAttrs, XATTR_LINEEND );
|
pOld = GetOldItem( *rAttrs, XATTR_LINEEND );
|
||||||
if( pItem &&
|
if( pItem &&
|
||||||
( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) )
|
( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) )
|
||||||
@ -978,7 +978,7 @@ void SvxLineTabPage::FillXLSet_Impl()
|
|||||||
nPos = m_pLbLineStyle->GetSelectEntryPos();
|
nPos = m_pLbLineStyle->GetSelectEntryPos();
|
||||||
if( nPos != LISTBOX_ENTRY_NOTFOUND )
|
if( nPos != LISTBOX_ENTRY_NOTFOUND )
|
||||||
{
|
{
|
||||||
m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectEntry(),
|
m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectedEntry(),
|
||||||
m_pDashList->GetDash( nPos - 2 )->GetDash() ) );
|
m_pDashList->GetDash( nPos - 2 )->GetDash() ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -989,7 +989,7 @@ void SvxLineTabPage::FillXLSet_Impl()
|
|||||||
if( nPos == 0 )
|
if( nPos == 0 )
|
||||||
m_rXLSet.Put( XLineStartItem() );
|
m_rXLSet.Put( XLineStartItem() );
|
||||||
else
|
else
|
||||||
m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectEntry(),
|
m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectedEntry(),
|
||||||
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
|
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
|
||||||
}
|
}
|
||||||
nPos = m_pLbEndStyle->GetSelectEntryPos();
|
nPos = m_pLbEndStyle->GetSelectEntryPos();
|
||||||
@ -998,7 +998,7 @@ void SvxLineTabPage::FillXLSet_Impl()
|
|||||||
if( nPos == 0 )
|
if( nPos == 0 )
|
||||||
m_rXLSet.Put( XLineEndItem() );
|
m_rXLSet.Put( XLineEndItem() );
|
||||||
else
|
else
|
||||||
m_rXLSet.Put( XLineEndItem( m_pLbEndStyle->GetSelectEntry(),
|
m_rXLSet.Put( XLineEndItem( m_pLbEndStyle->GetSelectedEntry(),
|
||||||
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
|
m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1058,7 +1058,7 @@ void SvxLineTabPage::FillXLSet_Impl()
|
|||||||
m_rXLSet.Put( XLineEndWidthItem( GetCoreValue( *m_pMtrEndWidth, m_ePoolUnit ) ) );
|
m_rXLSet.Put( XLineEndWidthItem( GetCoreValue( *m_pMtrEndWidth, m_ePoolUnit ) ) );
|
||||||
|
|
||||||
m_rXLSet.Put( XLineWidthItem( GetCoreValue( *m_pMtrLineWidth, m_ePoolUnit ) ) );
|
m_rXLSet.Put( XLineWidthItem( GetCoreValue( *m_pMtrLineWidth, m_ePoolUnit ) ) );
|
||||||
NamedColor aColor = m_pLbColor->GetSelectEntry();
|
NamedColor aColor = m_pLbColor->GetSelectedEntry();
|
||||||
m_rXLSet.Put(XLineColorItem(aColor.second, aColor.first));
|
m_rXLSet.Put(XLineColorItem(aColor.second, aColor.first));
|
||||||
|
|
||||||
// Centered line end
|
// Centered line end
|
||||||
|
@ -286,7 +286,7 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs )
|
|||||||
{
|
{
|
||||||
FillDash_Impl();
|
FillDash_Impl();
|
||||||
|
|
||||||
OUString aString( m_pLbLineStyles->GetSelectEntry() );
|
OUString aString( m_pLbLineStyles->GetSelectedEntry() );
|
||||||
rAttrs->Put( XLineStyleItem( drawing::LineStyle_DASH ) );
|
rAttrs->Put( XLineStyleItem( drawing::LineStyle_DASH ) );
|
||||||
rAttrs->Put( XLineDashItem( aString, aDash ) );
|
rAttrs->Put( XLineDashItem( aString, aDash ) );
|
||||||
}
|
}
|
||||||
|
@ -199,7 +199,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
|
|||||||
{
|
{
|
||||||
OUString aString = m_pEdtName->GetText();
|
OUString aString = m_pEdtName->GetText();
|
||||||
|
|
||||||
if( aString != m_pLbLineEnds->GetSelectEntry() )
|
if( aString != m_pLbLineEnds->GetSelectedEntry() )
|
||||||
{
|
{
|
||||||
ScopedVclPtrInstance<MessageDialog> aQueryBox( GetParentDialog()
|
ScopedVclPtrInstance<MessageDialog> aQueryBox( GetParentDialog()
|
||||||
,"AskChangeLineEndDialog"
|
,"AskChangeLineEndDialog"
|
||||||
@ -245,7 +245,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
|
|||||||
|
|
||||||
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
|
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
|
||||||
|
|
||||||
m_pEdtName->SetText( m_pLbLineEnds->GetSelectEntry() );
|
m_pEdtName->SetText( m_pLbLineEnds->GetSelectedEntry() );
|
||||||
|
|
||||||
rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
|
rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
|
||||||
rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
|
rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
|
||||||
@ -286,7 +286,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void)
|
|||||||
|
|
||||||
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
|
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
|
||||||
|
|
||||||
m_pEdtName->SetText( m_pLbLineEnds->GetSelectEntry() );
|
m_pEdtName->SetText( m_pLbLineEnds->GetSelectedEntry() );
|
||||||
|
|
||||||
rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
|
rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) );
|
||||||
rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
|
rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) );
|
||||||
|
@ -457,7 +457,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
|
|||||||
case FIELD_PROPERTY_BOOL_DEFAULT:
|
case FIELD_PROPERTY_BOOL_DEFAULT:
|
||||||
if (pBoolDefault)
|
if (pBoolDefault)
|
||||||
{
|
{
|
||||||
OUString sOld = pBoolDefault->GetSelectEntry();
|
OUString sOld = pBoolDefault->GetSelectedEntry();
|
||||||
pBoolDefault->SelectEntry(rText);
|
pBoolDefault->SelectEntry(rText);
|
||||||
if (sOld != rText)
|
if (sOld != rText)
|
||||||
LINK(this, OFieldDescControl, ChangeHdl).Call(*pBoolDefault);
|
LINK(this, OFieldDescControl, ChangeHdl).Call(*pBoolDefault);
|
||||||
@ -489,7 +489,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r
|
|||||||
case FIELD_PROPERTY_AUTOINC:
|
case FIELD_PROPERTY_AUTOINC:
|
||||||
if (pAutoIncrement)
|
if (pAutoIncrement)
|
||||||
{
|
{
|
||||||
OUString sOld = pAutoIncrement->GetSelectEntry();
|
OUString sOld = pAutoIncrement->GetSelectedEntry();
|
||||||
pAutoIncrement->SelectEntry(rText);
|
pAutoIncrement->SelectEntry(rText);
|
||||||
if (sOld != rText)
|
if (sOld != rText)
|
||||||
LINK(this, OFieldDescControl, ChangeHdl).Call(*pAutoIncrement);
|
LINK(this, OFieldDescControl, ChangeHdl).Call(*pAutoIncrement);
|
||||||
@ -1302,7 +1302,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
|
|||||||
else
|
else
|
||||||
pBoolDefault->SelectEntry(sDef);
|
pBoolDefault->SelectEntry(sDef);
|
||||||
|
|
||||||
pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectEntry())));
|
pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectedEntry())));
|
||||||
}
|
}
|
||||||
else if(pBoolDefault->GetEntryCount() < 3)
|
else if(pBoolDefault->GetEntryCount() < 3)
|
||||||
{
|
{
|
||||||
@ -1467,7 +1467,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
|
|||||||
}
|
}
|
||||||
else if (pBoolDefault)
|
else if (pBoolDefault)
|
||||||
{
|
{
|
||||||
sDefault = BoolStringPersistent(pBoolDefault->GetSelectEntry());
|
sDefault = BoolStringPersistent(pBoolDefault->GetSelectedEntry());
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !sDefault.isEmpty() )
|
if ( !sDefault.isEmpty() )
|
||||||
|
@ -224,7 +224,7 @@ namespace dbaui
|
|||||||
long nRow = GetCurRow();
|
long nRow = GetCurRow();
|
||||||
if ( nRow != BROWSER_ENDOFSELECTION )
|
if ( nRow != BROWSER_ENDOFSELECTION )
|
||||||
{
|
{
|
||||||
OUString sFieldName(m_pListCell->GetSelectEntry());
|
OUString sFieldName(m_pListCell->GetSelectedEntry());
|
||||||
OConnectionLineDataVec& rLines = m_pConnData->GetConnLineDataList();
|
OConnectionLineDataVec& rLines = m_pConnData->GetConnLineDataList();
|
||||||
if ( rLines.size() <= static_cast<OConnectionLineDataVec::size_type>(nRow) )
|
if ( rLines.size() <= static_cast<OConnectionLineDataVec::size_type>(nRow) )
|
||||||
{
|
{
|
||||||
@ -313,7 +313,7 @@ namespace dbaui
|
|||||||
fillListBox(xDef);
|
fillListBox(xDef);
|
||||||
OUString sName = GetCellText( nRow, nColumnId );
|
OUString sName = GetCellText( nRow, nColumnId );
|
||||||
m_pListCell->SelectEntry( sName );
|
m_pListCell->SelectEntry( sName );
|
||||||
if ( m_pListCell->GetSelectEntry() != sName )
|
if ( m_pListCell->GetSelectedEntry() != sName )
|
||||||
{
|
{
|
||||||
m_pListCell->InsertEntry( sName );
|
m_pListCell->InsertEntry( sName );
|
||||||
m_pListCell->SelectEntry( sName );
|
m_pListCell->SelectEntry( sName );
|
||||||
@ -515,7 +515,7 @@ namespace dbaui
|
|||||||
|
|
||||||
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void )
|
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void )
|
||||||
{
|
{
|
||||||
OUString strSelected(rListBox.GetSelectEntry());
|
OUString strSelected(rListBox.GetSelectedEntry());
|
||||||
OTableWindow* pLeft = nullptr;
|
OTableWindow* pLeft = nullptr;
|
||||||
OTableWindow* pRight = nullptr;
|
OTableWindow* pRight = nullptr;
|
||||||
|
|
||||||
@ -534,7 +534,7 @@ namespace dbaui
|
|||||||
++aIter;
|
++aIter;
|
||||||
OTableWindow* pSecond = aIter->second;
|
OTableWindow* pSecond = aIter->second;
|
||||||
|
|
||||||
if ( m_pLeftTable->GetSelectEntry() == pFirst->GetName() )
|
if ( m_pLeftTable->GetSelectedEntry() == pFirst->GetName() )
|
||||||
{
|
{
|
||||||
pLeft = pFirst;
|
pLeft = pFirst;
|
||||||
pRight = pSecond;
|
pRight = pSecond;
|
||||||
@ -564,7 +564,7 @@ namespace dbaui
|
|||||||
|
|
||||||
pLeft = pLoop;
|
pLeft = pLoop;
|
||||||
|
|
||||||
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectEntry());
|
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectedEntry());
|
||||||
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
|
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
|
||||||
if ( aIter != m_pTableMap->end() )
|
if ( aIter != m_pTableMap->end() )
|
||||||
pRight = aIter->second;
|
pRight = aIter->second;
|
||||||
@ -580,7 +580,7 @@ namespace dbaui
|
|||||||
m_strCurrentRight = strSelected;
|
m_strCurrentRight = strSelected;
|
||||||
|
|
||||||
pRight = pLoop;
|
pRight = pLoop;
|
||||||
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectEntry());
|
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectedEntry());
|
||||||
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
|
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
|
||||||
if ( aIter != m_pTableMap->end() )
|
if ( aIter != m_pTableMap->end() )
|
||||||
pLeft = aIter->second;
|
pLeft = aIter->second;
|
||||||
|
@ -75,7 +75,7 @@ namespace dbaui
|
|||||||
bool bChangedSomething = false;
|
bool bChangedSomething = false;
|
||||||
if ( IsValueChangedFromSaved() )
|
if ( IsValueChangedFromSaved() )
|
||||||
{
|
{
|
||||||
OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectEntry() );
|
OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectedEntry() );
|
||||||
OSL_ENSURE( aFind != m_aCharSets.end(), "CharSetListBox::StoreSelectedCharSet: could not translate the selected character set!" );
|
OSL_ENSURE( aFind != m_aCharSets.end(), "CharSetListBox::StoreSelectedCharSet: could not translate the selected character set!" );
|
||||||
if ( aFind != m_aCharSets.end() )
|
if ( aFind != m_aCharSets.end() )
|
||||||
{
|
{
|
||||||
|
@ -285,7 +285,7 @@ IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void )
|
|||||||
|
|
||||||
OUString OUserAdmin::GetUser()
|
OUString OUserAdmin::GetUser()
|
||||||
{
|
{
|
||||||
return m_pUSER->GetSelectEntry();
|
return m_pUSER->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/)
|
void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/)
|
||||||
|
@ -193,7 +193,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, OKClickHdl, Button*, void )
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void )
|
IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void )
|
||||||
{
|
{
|
||||||
OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry();
|
OUString aSelection = m_pLB_FreeIndexes->GetSelectedEntry();
|
||||||
OUString aTableName = m_pCB_Tables->GetText();
|
OUString aTableName = m_pCB_Tables->GetText();
|
||||||
OTableIndex aIndex = RemoveFreeIndex( aSelection, true );
|
OTableIndex aIndex = RemoveFreeIndex( aSelection, true );
|
||||||
InsertTableIndex( aTableName, aIndex );
|
InsertTableIndex( aTableName, aIndex );
|
||||||
@ -203,7 +203,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void )
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void )
|
IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void )
|
||||||
{
|
{
|
||||||
OUString aSelection = m_pLB_TableIndexes->GetSelectEntry();
|
OUString aSelection = m_pLB_TableIndexes->GetSelectedEntry();
|
||||||
OUString aTableName = m_pCB_Tables->GetText();
|
OUString aTableName = m_pCB_Tables->GetText();
|
||||||
OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection );
|
OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection );
|
||||||
InsertFreeIndex( aIndex );
|
InsertFreeIndex( aIndex );
|
||||||
|
@ -141,7 +141,7 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
|
|||||||
{
|
{
|
||||||
OUString sSelected;
|
OUString sSelected;
|
||||||
if (m_pDatasource->GetEntryCount())
|
if (m_pDatasource->GetEntryCount())
|
||||||
sSelected = m_pDatasource->GetSelectEntry();
|
sSelected = m_pDatasource->GetSelectedEntry();
|
||||||
m_pDatasource->Clear();
|
m_pDatasource->Clear();
|
||||||
// fill the list
|
// fill the list
|
||||||
for ( StringBag::const_iterator aDS = _rDatasources.begin();
|
for ( StringBag::const_iterator aDS = _rDatasources.begin();
|
||||||
|
@ -55,7 +55,7 @@ public:
|
|||||||
virtual ~ODatasourceSelectDialog() override;
|
virtual ~ODatasourceSelectDialog() override;
|
||||||
virtual void dispose() override;
|
virtual void dispose() override;
|
||||||
OUString GetSelected() const {
|
OUString GetSelected() const {
|
||||||
return m_pDatasource->GetSelectEntry();
|
return m_pDatasource->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
void Select( const OUString& _rEntry ) {
|
void Select( const OUString& _rEntry ) {
|
||||||
m_pDatasource->SelectEntry(_rEntry);
|
m_pDatasource->SelectEntry(_rEntry);
|
||||||
|
@ -292,7 +292,7 @@ namespace dbaui
|
|||||||
{
|
{
|
||||||
case COLUMN_ID_FIELDNAME:
|
case COLUMN_ID_FIELDNAME:
|
||||||
{
|
{
|
||||||
OUString sFieldSelected = m_pFieldNameCell->GetSelectEntry();
|
OUString sFieldSelected = m_pFieldNameCell->GetSelectedEntry();
|
||||||
bool bEmptySelected = sFieldSelected.isEmpty();
|
bool bEmptySelected = sFieldSelected.isEmpty();
|
||||||
if (isNewField())
|
if (isNewField())
|
||||||
{
|
{
|
||||||
@ -384,7 +384,7 @@ namespace dbaui
|
|||||||
{ // a field has been selected
|
{ // a field has been selected
|
||||||
if (GetCurRow() >= GetRowCount() - 2)
|
if (GetCurRow() >= GetRowCount() - 2)
|
||||||
{ // and we're in one of the last two rows
|
{ // and we're in one of the last two rows
|
||||||
OUString sSelectedEntry = m_pFieldNameCell->GetSelectEntry();
|
OUString sSelectedEntry = m_pFieldNameCell->GetSelectedEntry();
|
||||||
sal_Int32 nCurrentRow = GetCurRow();
|
sal_Int32 nCurrentRow = GetCurRow();
|
||||||
sal_Int32 rowCount = GetRowCount();
|
sal_Int32 rowCount = GetRowCount();
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ void DlgFilterCrit::dispose()
|
|||||||
ModalDialog::dispose();
|
ModalDialog::dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
#define LbText(x) ((x).GetSelectEntry())
|
#define LbText(x) ((x).GetSelectedEntry())
|
||||||
#define LbPos(x) ((x).GetSelectEntryPos())
|
#define LbPos(x) ((x).GetSelectEntryPos())
|
||||||
|
|
||||||
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
|
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const
|
||||||
@ -316,7 +316,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
OUString sTableName;
|
OUString sTableName;
|
||||||
_rFilter.Name = _rField.GetSelectEntry();
|
_rFilter.Name = _rField.GetSelectedEntry();
|
||||||
Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name);
|
Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name);
|
||||||
if ( xColumn.is() )
|
if ( xColumn.is() )
|
||||||
{
|
{
|
||||||
@ -361,7 +361,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
_rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
|
_rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectedEntry() );
|
||||||
if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL )
|
if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL )
|
||||||
{
|
{
|
||||||
OUString sPredicateValue;
|
OUString sPredicateValue;
|
||||||
@ -436,15 +436,15 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI
|
|||||||
OUString sField;
|
OUString sField;
|
||||||
if ( &_rValueInput == m_pET_WHEREVALUE1 )
|
if ( &_rValueInput == m_pET_WHEREVALUE1 )
|
||||||
{
|
{
|
||||||
sField = m_pLB_WHEREFIELD1->GetSelectEntry();
|
sField = m_pLB_WHEREFIELD1->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if ( &_rValueInput == m_pET_WHEREVALUE2 )
|
else if ( &_rValueInput == m_pET_WHEREVALUE2 )
|
||||||
{
|
{
|
||||||
sField = m_pLB_WHEREFIELD2->GetSelectEntry();
|
sField = m_pLB_WHEREFIELD2->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if ( &_rValueInput == m_pET_WHEREVALUE3 )
|
else if ( &_rValueInput == m_pET_WHEREVALUE3 )
|
||||||
{
|
{
|
||||||
sField = m_pLB_WHEREFIELD3->GetSelectEntry();
|
sField = m_pLB_WHEREFIELD3->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
OSL_FAIL( "DlgFilterCrit::getMatchingColumn: invalid event source!" );
|
OSL_FAIL( "DlgFilterCrit::getMatchingColumn: invalid event source!" );
|
||||||
|
@ -228,7 +228,7 @@ OUString DlgOrderCrit::GetOrderList( ) const
|
|||||||
if(!sOrder.isEmpty())
|
if(!sOrder.isEmpty())
|
||||||
sOrder += ",";
|
sOrder += ",";
|
||||||
|
|
||||||
OUString sName = m_aColumnList[i]->GetSelectEntry();
|
OUString sName = m_aColumnList[i]->GetSelectedEntry();
|
||||||
sOrder += ::dbtools::quoteName(sQuote,sName);
|
sOrder += ::dbtools::quoteName(sQuote,sName);
|
||||||
if(m_aValueList[i]->GetSelectEntryPos())
|
if(m_aValueList[i]->GetSelectEntryPos())
|
||||||
sOrder += " DESC ";
|
sOrder += " DESC ";
|
||||||
|
@ -226,10 +226,10 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void )
|
|||||||
if(!bAll)
|
if(!bAll)
|
||||||
{
|
{
|
||||||
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
|
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
|
||||||
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
|
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
|
||||||
|
|
||||||
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j)
|
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j)
|
||||||
pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1));
|
pLeft->RemoveEntry(pLeft->GetSelectedEntry(j-1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -270,9 +270,9 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void )
|
|||||||
fillColumns(pRight,aRightColumns);
|
fillColumns(pRight,aRightColumns);
|
||||||
|
|
||||||
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
|
for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i)
|
||||||
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase);
|
moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase);
|
||||||
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; )
|
for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; )
|
||||||
pLeft->RemoveEntry(pLeft->GetSelectEntry(--j));
|
pLeft->RemoveEntry(pLeft->GetSelectedEntry(--j));
|
||||||
|
|
||||||
enableButtons();
|
enableButtons();
|
||||||
}
|
}
|
||||||
|
@ -280,7 +280,7 @@ OUString OWizTypeSelect::GetTitle() const
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
|
IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void )
|
||||||
{
|
{
|
||||||
OUString aColumnName( m_pColumnNames->GetSelectEntry() );
|
OUString aColumnName( m_pColumnNames->GetSelectedEntry() );
|
||||||
|
|
||||||
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
|
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
|
||||||
if(pField)
|
if(pField)
|
||||||
@ -325,7 +325,7 @@ void OWizTypeSelect::ActivatePage( )
|
|||||||
|
|
||||||
bool OWizTypeSelect::LeavePage()
|
bool OWizTypeSelect::LeavePage()
|
||||||
{
|
{
|
||||||
OUString aColumnName( m_pColumnNames->GetSelectEntry() );
|
OUString aColumnName( m_pColumnNames->GetSelectedEntry() );
|
||||||
|
|
||||||
bool bDuplicateName = false;
|
bool bDuplicateName = false;
|
||||||
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
|
OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
|
||||||
|
@ -980,7 +980,7 @@ bool OSelectionBrowseBox::SaveModified()
|
|||||||
|
|
||||||
case BROW_TABLE_ROW:
|
case BROW_TABLE_ROW:
|
||||||
{
|
{
|
||||||
OUString aAliasName = m_pTableCell->GetSelectEntry();
|
OUString aAliasName = m_pTableCell->GetSelectedEntry();
|
||||||
strOldCellContents = pEntry->GetAlias();
|
strOldCellContents = pEntry->GetAlias();
|
||||||
if ( m_pTableCell->GetSelectEntryPos() != 0 )
|
if ( m_pTableCell->GetSelectEntryPos() != 0 )
|
||||||
{
|
{
|
||||||
|
@ -99,7 +99,7 @@ namespace abp
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
AddressSettings& rSettings = getSettings();
|
AddressSettings& rSettings = getSettings();
|
||||||
rSettings.sSelectedTable = m_pTableList->GetSelectEntry();
|
rSettings.sSelectedTable = m_pTableList->GetSelectedEntry();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -437,7 +437,7 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void)
|
|||||||
BibConfig* pConfig = BibModul::GetConfig();
|
BibConfig* pConfig = BibModul::GetConfig();
|
||||||
for(sal_uInt16 nEntry = 0; nEntry < COLUMN_COUNT; nEntry++)
|
for(sal_uInt16 nEntry = 0; nEntry < COLUMN_COUNT; nEntry++)
|
||||||
{
|
{
|
||||||
OUString sSel = aListBoxes[nEntry]->GetSelectEntry();
|
OUString sSel = aListBoxes[nEntry]->GetSelectedEntry();
|
||||||
if(sSel != sNone)
|
if(sSel != sNone)
|
||||||
{
|
{
|
||||||
aNew.aColumnPairs[nWriteIndex].sRealColumnName = sSel;
|
aNew.aColumnPairs[nWriteIndex].sRealColumnName = sSel;
|
||||||
@ -519,7 +519,7 @@ void DBChangeDialog_Impl::dispose()
|
|||||||
|
|
||||||
OUString DBChangeDialog_Impl::GetCurrentURL()const
|
OUString DBChangeDialog_Impl::GetCurrentURL()const
|
||||||
{
|
{
|
||||||
return m_pSelectionLB->GetSelectEntry();
|
return m_pSelectionLB->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
// XDispatchProvider
|
// XDispatchProvider
|
||||||
|
@ -476,7 +476,7 @@ IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Timer*, void )
|
|||||||
Sequence<PropertyValue> aPropVal(1);
|
Sequence<PropertyValue> aPropVal(1);
|
||||||
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());
|
PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray());
|
||||||
pPropertyVal[0].Name = "DataSourceName";
|
pPropertyVal[0].Name = "DataSourceName";
|
||||||
OUString aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource->GetSelectEntry() ) );
|
OUString aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource->GetSelectedEntry() ) );
|
||||||
pPropertyVal[0].Value <<= aEntry;
|
pPropertyVal[0].Value <<= aEntry;
|
||||||
SendDispatch(nTBC_LB_SOURCE, aPropVal);
|
SendDispatch(nTBC_LB_SOURCE, aPropVal);
|
||||||
}
|
}
|
||||||
|
@ -178,10 +178,10 @@ namespace dbp
|
|||||||
{
|
{
|
||||||
xOldConn = getFormConnection();
|
xOldConn = getFormConnection();
|
||||||
|
|
||||||
OUString sDataSource = m_pDatasource->GetSelectEntry();
|
OUString sDataSource = m_pDatasource->GetSelectedEntry();
|
||||||
rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) );
|
rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) );
|
||||||
}
|
}
|
||||||
OUString sCommand = m_pTable->GetSelectEntry();
|
OUString sCommand = m_pTable->GetSelectedEntry();
|
||||||
sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_pTable->GetSelectEntryData() );
|
sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_pTable->GetSelectEntryData() );
|
||||||
|
|
||||||
rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) );
|
rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) );
|
||||||
@ -278,7 +278,7 @@ namespace dbp
|
|||||||
// connect to the data source
|
// connect to the data source
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
OUString sCurrentDatasource = m_pDatasource->GetSelectEntry();
|
OUString sCurrentDatasource = m_pDatasource->GetSelectedEntry();
|
||||||
if (!sCurrentDatasource.isEmpty())
|
if (!sCurrentDatasource.isEmpty())
|
||||||
{
|
{
|
||||||
// obtain the DS object
|
// obtain the DS object
|
||||||
@ -421,7 +421,7 @@ namespace dbp
|
|||||||
|
|
||||||
void OMaybeListSelectionPage::implCommit(OUString& _rSelection)
|
void OMaybeListSelectionPage::implCommit(OUString& _rSelection)
|
||||||
{
|
{
|
||||||
_rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString();
|
_rSelection = m_pYes->IsChecked() ? m_pList->GetSelectedEntry() : OUString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -340,7 +340,7 @@ namespace dbp
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
OListComboSettings& rSettings = getSettings();
|
OListComboSettings& rSettings = getSettings();
|
||||||
rSettings.sListContentTable = m_pSelectTable->GetSelectEntry();
|
rSettings.sListContentTable = m_pSelectTable->GetSelectedEntry();
|
||||||
if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
|
if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason))
|
||||||
// need to select a table
|
// need to select a table
|
||||||
return false;
|
return false;
|
||||||
@ -404,7 +404,7 @@ namespace dbp
|
|||||||
IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, ListBox&, void )
|
IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, ListBox&, void )
|
||||||
{
|
{
|
||||||
updateDialogTravelUI();
|
updateDialogTravelUI();
|
||||||
m_pDisplayedField->SetText(m_pSelectTableField->GetSelectEntry());
|
m_pDisplayedField->SetText(m_pSelectTableField->GetSelectedEntry());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -413,7 +413,7 @@ namespace dbp
|
|||||||
if (!OLCPage::commitPage(_eReason))
|
if (!OLCPage::commitPage(_eReason))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
getSettings().sListContentField = m_pSelectTableField->GetSelectEntry();
|
getSettings().sListContentField = m_pSelectTableField->GetSelectedEntry();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -696,7 +696,7 @@ namespace pcr
|
|||||||
|
|
||||||
Any SAL_CALL OListboxControl::getValue()
|
Any SAL_CALL OListboxControl::getValue()
|
||||||
{
|
{
|
||||||
OUString sControlValue( getTypedControlWindow()->GetSelectEntry() );
|
OUString sControlValue( getTypedControlWindow()->GetSelectedEntry() );
|
||||||
|
|
||||||
Any aPropValue;
|
Any aPropValue;
|
||||||
if ( !sControlValue.isEmpty() )
|
if ( !sControlValue.isEmpty() )
|
||||||
@ -720,7 +720,7 @@ namespace pcr
|
|||||||
OUString sSelection;
|
OUString sSelection;
|
||||||
_rValue >>= sSelection;
|
_rValue >>= sSelection;
|
||||||
|
|
||||||
if ( sSelection != getTypedControlWindow()->GetSelectEntry() )
|
if ( sSelection != getTypedControlWindow()->GetSelectedEntry() )
|
||||||
getTypedControlWindow()->SelectEntry( sSelection );
|
getTypedControlWindow()->SelectEntry( sSelection );
|
||||||
|
|
||||||
if ( !getTypedControlWindow()->IsEntrySelected( sSelection ) )
|
if ( !getTypedControlWindow()->IsEntrySelected( sSelection ) )
|
||||||
|
@ -692,12 +692,12 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox&, rListBox, void )
|
|||||||
{
|
{
|
||||||
if( &rListBox == mpQuantumRangeBox )
|
if( &rListBox == mpQuantumRangeBox )
|
||||||
{
|
{
|
||||||
double fValue = mpQuantumRangeBox->GetSelectEntry().toDouble();
|
double fValue = mpQuantumRangeBox->GetSelectedEntry().toDouble();
|
||||||
mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement );
|
mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement );
|
||||||
}
|
}
|
||||||
else if( &rListBox == mpStringRangeBox )
|
else if( &rListBox == mpStringRangeBox )
|
||||||
{
|
{
|
||||||
mrSane.SetOptionValue( mnCurrentOption, mpStringRangeBox->GetSelectEntry() );
|
mrSane.SetOptionValue( mnCurrentOption, mpStringRangeBox->GetSelectedEntry() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1396,7 +1396,7 @@ void SaneDlg::SaveState()
|
|||||||
aConfig.DeleteGroup( "SANE" );
|
aConfig.DeleteGroup( "SANE" );
|
||||||
aConfig.SetGroup( "SANE" );
|
aConfig.SetGroup( "SANE" );
|
||||||
aConfig.WriteKey( "SO_LastSANEDevice",
|
aConfig.WriteKey( "SO_LastSANEDevice",
|
||||||
OUStringToOString(mpDeviceBox->GetSelectEntry(), RTL_TEXTENCODING_UTF8) );
|
OUStringToOString(mpDeviceBox->GetSelectedEntry(), RTL_TEXTENCODING_UTF8) );
|
||||||
|
|
||||||
static char const* pSaveOptions[] = {
|
static char const* pSaveOptions[] = {
|
||||||
"resolution",
|
"resolution",
|
||||||
|
@ -1802,7 +1802,7 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
|
|||||||
paParent->msSignReason = mpEdSignReason->GetText();
|
paParent->msSignReason = mpEdSignReason->GetText();
|
||||||
// Entry 0 is 'None'
|
// Entry 0 is 'None'
|
||||||
if (mpLBSignTSA->GetSelectEntryPos() >= 1)
|
if (mpLBSignTSA->GetSelectEntryPos() >= 1)
|
||||||
paParent->msSignTSA = mpLBSignTSA->GetSelectEntry();
|
paParent->msSignTSA = mpLBSignTSA->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -284,7 +284,7 @@ sal_Int32 FuncPage::GetFunctionEntryCount()
|
|||||||
|
|
||||||
OUString FuncPage::GetSelFunctionName() const
|
OUString FuncPage::GetSelFunctionName() const
|
||||||
{
|
{
|
||||||
return m_pLbFunction->GetSelectEntry();
|
return m_pLbFunction->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
const IFunctionDescription* FuncPage::GetFuncDesc( sal_Int32 nPos ) const
|
const IFunctionDescription* FuncPage::GetFuncDesc( sal_Int32 nPos ) const
|
||||||
|
@ -723,7 +723,7 @@ namespace svt
|
|||||||
sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos();
|
sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos();
|
||||||
OUString sSelected;
|
OUString sSelected;
|
||||||
if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
|
if ( LISTBOX_ENTRY_NOTFOUND != nSelected )
|
||||||
sSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntry();
|
sSelected = static_cast< ListBox const * >( _pControl )->GetSelectedEntry();
|
||||||
aReturn <<= sSelected;
|
aReturn <<= sSelected;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -852,7 +852,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void )
|
|||||||
if( nPos >= 0 )
|
if( nPos >= 0 )
|
||||||
{
|
{
|
||||||
OUString sMsg = FpsResId( STR_SVT_DELETESERVICE );
|
OUString sMsg = FpsResId( STR_SVT_DELETESERVICE );
|
||||||
sMsg = sMsg.replaceFirst( "$servicename$", m_pServices_lb->GetSelectEntry() );
|
sMsg = sMsg.replaceFirst( "$servicename$", m_pServices_lb->GetSelectedEntry() );
|
||||||
ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VclMessageType::Question, VclButtonsType::YesNo );
|
ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VclMessageType::Question, VclButtonsType::YesNo );
|
||||||
|
|
||||||
if( aBox->Execute() == RET_YES )
|
if( aBox->Execute() == RET_YES )
|
||||||
|
@ -227,7 +227,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->GetSelectEntry();
|
_rDisplayName = _pLbFilter->GetSelectedEntry();
|
||||||
return static_cast< SvtFileDialogFilter_Impl* >( _pLbFilter->GetSelectEntryData () );
|
return static_cast< SvtFileDialogFilter_Impl* >( _pLbFilter->GetSelectEntryData () );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ void SAL_CALL DropdownToolbarController::dispose()
|
|||||||
Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
|
Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
|
||||||
{
|
{
|
||||||
Sequence<PropertyValue> aArgs( 2 );
|
Sequence<PropertyValue> aArgs( 2 );
|
||||||
OUString aSelectedText = m_pListBoxControl->GetSelectEntry();
|
OUString aSelectedText = m_pListBoxControl->GetSelectedEntry();
|
||||||
|
|
||||||
// Add key modifier to argument list
|
// Add key modifier to argument list
|
||||||
aArgs[0].Name = "KeyModifier";
|
aArgs[0].Name = "KeyModifier";
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false);
|
void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false);
|
||||||
|
|
||||||
Color GetSelectEntryColor() const { return m_aSelectedColor.first; }
|
Color GetSelectEntryColor() const { return m_aSelectedColor.first; }
|
||||||
NamedColor GetSelectEntry() const { return m_aSelectedColor; }
|
NamedColor GetSelectedEntry() const { return m_aSelectedColor; }
|
||||||
|
|
||||||
void SelectEntry(const NamedColor& rColor);
|
void SelectEntry(const NamedColor& rColor);
|
||||||
void SelectEntry(const Color& rColor);
|
void SelectEntry(const Color& rColor);
|
||||||
|
@ -143,7 +143,7 @@ public:
|
|||||||
|
|
||||||
sal_Int32 GetSelectEntryCount() const;
|
sal_Int32 GetSelectEntryCount() const;
|
||||||
sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const;
|
sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const;
|
||||||
OUString GetSelectEntry() const { return GetEntry( GetSelectEntryPos() ); }
|
OUString GetSelectedEntry() const { return GetEntry( GetSelectEntryPos() ); }
|
||||||
bool IsEntryPosSelected( sal_Int32 nPos ) const;
|
bool IsEntryPosSelected( sal_Int32 nPos ) const;
|
||||||
void SelectEntryPos( sal_Int32 nPos, bool bSelect = true );
|
void SelectEntryPos( sal_Int32 nPos, bool bSelect = true );
|
||||||
void SetNoSelection();
|
void SetNoSelection();
|
||||||
|
@ -165,7 +165,7 @@ public:
|
|||||||
void SelectEntryPos( sal_Int32 nPos, bool bSelect = true );
|
void SelectEntryPos( sal_Int32 nPos, bool bSelect = true );
|
||||||
|
|
||||||
sal_Int32 GetSelectEntryCount() const;
|
sal_Int32 GetSelectEntryCount() const;
|
||||||
OUString GetSelectEntry( sal_Int32 nSelIndex = 0 ) const;
|
OUString GetSelectedEntry( sal_Int32 nSelIndex = 0 ) const;
|
||||||
sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const;
|
sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const;
|
||||||
|
|
||||||
bool IsEntrySelected(const OUString& rStr) const;
|
bool IsEntrySelected(const OUString& rStr) const;
|
||||||
|
@ -152,12 +152,12 @@ short ODateTimeDialog::Execute()
|
|||||||
sal_Int32 nWidth = 0;
|
sal_Int32 nWidth = 0;
|
||||||
if ( m_pDate->IsChecked() )
|
if ( m_pDate->IsChecked() )
|
||||||
{
|
{
|
||||||
OUString sDateFormat = m_pDateListBox->GetSelectEntry();
|
OUString sDateFormat = m_pDateListBox->GetSelectedEntry();
|
||||||
nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM);
|
nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM);
|
||||||
}
|
}
|
||||||
if ( m_pTime->IsChecked() )
|
if ( m_pTime->IsChecked() )
|
||||||
{
|
{
|
||||||
OUString sDateFormat = m_pTimeListBox->GetSelectEntry();
|
OUString sDateFormat = m_pTimeListBox->GetSelectedEntry();
|
||||||
nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM),nWidth);
|
nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM),nWidth);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -220,7 +220,7 @@ class AbstractScSelEntryDlg : public VclAbstractDialog
|
|||||||
protected:
|
protected:
|
||||||
virtual ~AbstractScSelEntryDlg() override = default;
|
virtual ~AbstractScSelEntryDlg() override = default;
|
||||||
public:
|
public:
|
||||||
virtual OUString GetSelectEntry() const = 0;
|
virtual OUString GetSelectedEntry() const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
class AbstractScLinkedAreaDlg : public VclAbstractDialog
|
class AbstractScLinkedAreaDlg : public VclAbstractDialog
|
||||||
@ -348,7 +348,7 @@ public:
|
|||||||
virtual void Insert( const OUString& rString, bool bSelected ) = 0;
|
virtual void Insert( const OUString& rString, bool bSelected ) = 0;
|
||||||
virtual sal_Int32 GetSelectEntryCount() const = 0;
|
virtual sal_Int32 GetSelectEntryCount() const = 0;
|
||||||
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0;
|
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0;
|
||||||
virtual OUString GetSelectEntry(sal_Int32 nPos) const = 0;
|
virtual OUString GetSelectedEntry(sal_Int32 nPos) const = 0;
|
||||||
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const = 0;
|
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -389,9 +389,9 @@ const OUString* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN )
|
|||||||
return pDlg->GetNextTable( pN );
|
return pDlg->GetNextTable( pN );
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString AbstractScSelEntryDlg_Impl::GetSelectEntry() const
|
OUString AbstractScSelEntryDlg_Impl::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
return pDlg->GetSelectEntry();
|
return pDlg->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter,
|
void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter,
|
||||||
@ -575,9 +575,9 @@ sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_Int32 nPos) const
|
|||||||
return pDlg->GetSelectEntryPos( nPos);
|
return pDlg->GetSelectEntryPos( nPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString AbstractScShowTabDlg_Impl::GetSelectEntry(sal_Int32 nPos) const
|
OUString AbstractScShowTabDlg_Impl::GetSelectedEntry(sal_Int32 nPos) const
|
||||||
{
|
{
|
||||||
return pDlg->GetSelectEntry(nPos);
|
return pDlg->GetSelectedEntry(nPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString AbstractScStringInputDlg_Impl::GetInputString() const
|
OUString AbstractScStringInputDlg_Impl::GetInputString() const
|
||||||
|
@ -230,7 +230,7 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg
|
|||||||
class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
|
class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
|
||||||
{
|
{
|
||||||
DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
|
DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg )
|
||||||
virtual OUString GetSelectEntry() const override;
|
virtual OUString GetSelectedEntry() const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg
|
class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg
|
||||||
@ -336,7 +336,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg
|
|||||||
virtual void Insert( const OUString& rString, bool bSelected ) override;
|
virtual void Insert( const OUString& rString, bool bSelected ) override;
|
||||||
virtual sal_Int32 GetSelectEntryCount() const override;
|
virtual sal_Int32 GetSelectEntryCount() const override;
|
||||||
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override;
|
virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override;
|
||||||
virtual OUString GetSelectEntry(sal_Int32 nPos) const override;
|
virtual OUString GetSelectedEntry(sal_Int32 nPos) const override;
|
||||||
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override;
|
virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -296,7 +296,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectEntry());
|
ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectedEntry());
|
||||||
return pEntry;
|
return pEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -453,7 +453,7 @@ namespace {
|
|||||||
|
|
||||||
void UpdateStyleList(ListBox& rLbStyle, const ScDocument* pDoc)
|
void UpdateStyleList(ListBox& rLbStyle, const ScDocument* pDoc)
|
||||||
{
|
{
|
||||||
OUString aSelectedStyle = rLbStyle.GetSelectEntry();
|
OUString aSelectedStyle = rLbStyle.GetSelectedEntry();
|
||||||
for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i)
|
for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i)
|
||||||
{
|
{
|
||||||
rLbStyle.RemoveEntry(i);
|
rLbStyle.RemoveEntry(i);
|
||||||
@ -528,7 +528,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow&
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString aStyleName = rLbStyle.GetSelectEntry();
|
OUString aStyleName = rLbStyle.GetSelectedEntry();
|
||||||
SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SfxStyleFamily::Para );
|
SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SfxStyleFamily::Para );
|
||||||
if(pStyleSheet)
|
if(pStyleSheet)
|
||||||
{
|
{
|
||||||
@ -607,7 +607,7 @@ ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const
|
|||||||
if(aFormula.isEmpty())
|
if(aFormula.isEmpty())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectEntry());
|
ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectedEntry());
|
||||||
return pEntry;
|
return pEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1302,7 +1302,7 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const
|
|||||||
ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
|
ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
|
||||||
condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos());
|
condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos());
|
||||||
pNewEntry->SetDateType(eType);
|
pNewEntry->SetDateType(eType);
|
||||||
pNewEntry->SetStyleName(maLbStyle->GetSelectEntry());
|
pNewEntry->SetStyleName(maLbStyle->GetSelectedEntry());
|
||||||
return pNewEntry;
|
return pNewEntry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -425,7 +425,7 @@ void ScPivotLayoutDialog::UpdateSourceRange()
|
|||||||
|
|
||||||
if (mpSourceRadioNamedRange->IsChecked())
|
if (mpSourceRadioNamedRange->IsChecked())
|
||||||
{
|
{
|
||||||
OUString aEntryString = mpSourceListBox->GetSelectEntry();
|
OUString aEntryString = mpSourceListBox->GetSelectedEntry();
|
||||||
ScRange aSourceRange = lclGetRangeForNamedRange(aEntryString, mpDocument);
|
ScRange aSourceRange = lclGetRangeForNamedRange(aEntryString, mpDocument);
|
||||||
if (!aSourceRange.IsValid() || aSourceSheet.GetSourceRange() == aSourceRange)
|
if (!aSourceRange.IsValid() || aSourceSheet.GetSourceRange() == aSourceRange)
|
||||||
return;
|
return;
|
||||||
@ -610,7 +610,7 @@ bool ScPivotLayoutDialog::GetDestination(ScRange& aDestinationRange, bool& bToNe
|
|||||||
|
|
||||||
if (mpDestinationRadioNamedRange->IsChecked())
|
if (mpDestinationRadioNamedRange->IsChecked())
|
||||||
{
|
{
|
||||||
OUString aName = mpDestinationListBox->GetSelectEntry();
|
OUString aName = mpDestinationListBox->GetSelectedEntry();
|
||||||
aDestinationRange = lclGetRangeForNamedRange(aName, mpDocument);
|
aDestinationRange = lclGetRangeForNamedRange(aName, mpDocument);
|
||||||
if (!aDestinationRange.IsValid())
|
if (!aDestinationRange.IsValid())
|
||||||
return false;
|
return false;
|
||||||
|
@ -99,7 +99,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc )
|
|||||||
{
|
{
|
||||||
const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos();
|
const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos();
|
||||||
|
|
||||||
rDesc.aDBName = m_pLbDatabase->GetSelectEntry();
|
rDesc.aDBName = m_pLbDatabase->GetSelectedEntry();
|
||||||
rDesc.aObject = m_pCbObject->GetText();
|
rDesc.aObject = m_pCbObject->GetText();
|
||||||
|
|
||||||
if (rDesc.aDBName.isEmpty() || rDesc.aObject.isEmpty())
|
if (rDesc.aDBName.isEmpty() || rDesc.aObject.isEmpty())
|
||||||
@ -123,7 +123,7 @@ void ScDataPilotDatabaseDlg::FillObjects()
|
|||||||
{
|
{
|
||||||
m_pCbObject->Clear();
|
m_pCbObject->Clear();
|
||||||
|
|
||||||
OUString aDatabaseName = m_pLbDatabase->GetSelectEntry();
|
OUString aDatabaseName = m_pLbDatabase->GetSelectedEntry();
|
||||||
if (aDatabaseName.isEmpty())
|
if (aDatabaseName.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -138,7 +138,7 @@ void ScDataPilotServiceDlg::dispose()
|
|||||||
|
|
||||||
OUString ScDataPilotServiceDlg::GetServiceName() const
|
OUString ScDataPilotServiceDlg::GetServiceName() const
|
||||||
{
|
{
|
||||||
return m_pLbService->GetSelectEntry();
|
return m_pLbService->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString ScDataPilotServiceDlg::GetParSource() const
|
OUString ScDataPilotServiceDlg::GetParSource() const
|
||||||
|
@ -237,7 +237,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
|
|||||||
DataPilotFieldReference aRef;
|
DataPilotFieldReference aRef;
|
||||||
|
|
||||||
aRef.ReferenceType = mxLbTypeWrp->GetControlValue();
|
aRef.ReferenceType = mxLbTypeWrp->GetControlValue();
|
||||||
aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectEntry());
|
aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectedEntry());
|
||||||
|
|
||||||
sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
|
sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos();
|
||||||
switch( nBaseItemPos )
|
switch( nBaseItemPos )
|
||||||
@ -252,7 +252,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const
|
|||||||
{
|
{
|
||||||
aRef.ReferenceItemType = DataPilotFieldReferenceItemType::NAMED;
|
aRef.ReferenceItemType = DataPilotFieldReferenceItemType::NAMED;
|
||||||
if( !mbEmptyItem || (nBaseItemPos > SC_BASEITEM_USER_POS) )
|
if( !mbEmptyItem || (nBaseItemPos > SC_BASEITEM_USER_POS) )
|
||||||
aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectEntry());
|
aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectedEntry());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -610,7 +610,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
|
|||||||
else
|
else
|
||||||
rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA;
|
rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA;
|
||||||
|
|
||||||
ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectEntry());
|
ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectedEntry());
|
||||||
if (!aFieldName.maName.isEmpty())
|
if (!aFieldName.maName.isEmpty())
|
||||||
{
|
{
|
||||||
rLabelData.maSortInfo.Field =
|
rLabelData.maSortInfo.Field =
|
||||||
@ -626,7 +626,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const
|
|||||||
|
|
||||||
// *** AUTO SHOW ***
|
// *** AUTO SHOW ***
|
||||||
|
|
||||||
aFieldName = GetFieldName(m_pLbShowUsing->GetSelectEntry());
|
aFieldName = GetFieldName(m_pLbShowUsing->GetSelectedEntry());
|
||||||
if (!aFieldName.maName.isEmpty())
|
if (!aFieldName.maName.isEmpty())
|
||||||
{
|
{
|
||||||
rLabelData.maShowInfo.IsEnabled = m_pCbShow->IsChecked();
|
rLabelData.maShowInfo.IsEnabled = m_pCbShow->IsChecked();
|
||||||
@ -870,7 +870,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const
|
|||||||
{
|
{
|
||||||
// Look up the internal dimension name which may be different from the
|
// Look up the internal dimension name which may be different from the
|
||||||
// displayed field name.
|
// displayed field name.
|
||||||
OUString aSelectedName = mpLbDims->GetSelectEntry();
|
OUString aSelectedName = mpLbDims->GetSelectedEntry();
|
||||||
DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
|
DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
|
||||||
if (itr == maNameIndexMap.end())
|
if (itr == maNameIndexMap.end())
|
||||||
// This should never happen!
|
// This should never happen!
|
||||||
|
@ -441,7 +441,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
|
|||||||
|
|
||||||
IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void )
|
IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void )
|
||||||
{
|
{
|
||||||
OUString aSelEntry = rLb.GetSelectEntry();
|
OUString aSelEntry = rLb.GetSelectedEntry();
|
||||||
ScSortKeyItems::iterator pIter;
|
ScSortKeyItems::iterator pIter;
|
||||||
|
|
||||||
// If last listbox is enabled add one item
|
// If last listbox is enabled add one item
|
||||||
|
@ -186,7 +186,7 @@ void ScFunctionWin::SetDescription()
|
|||||||
{
|
{
|
||||||
pDesc->initArgumentInfo(); // full argument info is needed
|
pDesc->initArgumentInfo(); // full argument info is needed
|
||||||
|
|
||||||
OUStringBuffer aBuf(aFuncList->GetSelectEntry());
|
OUStringBuffer aBuf(aFuncList->GetSelectedEntry());
|
||||||
aBuf.append(":\n\n");
|
aBuf.append(":\n\n");
|
||||||
aBuf.append(pDesc->GetParamList());
|
aBuf.append(pDesc->GetParamList());
|
||||||
aBuf.append("\n\n");
|
aBuf.append("\n\n");
|
||||||
@ -279,7 +279,7 @@ void ScFunctionWin::DoEnter()
|
|||||||
{
|
{
|
||||||
OUString aFirstArgStr;
|
OUString aFirstArgStr;
|
||||||
OUString aArgStr;
|
OUString aArgStr;
|
||||||
OUString aString=aFuncList->GetSelectEntry();
|
OUString aString=aFuncList->GetSelectedEntry();
|
||||||
SfxViewShell* pCurSh = SfxViewShell::Current();
|
SfxViewShell* pCurSh = SfxViewShell::Current();
|
||||||
nArgs=0;
|
nArgs=0;
|
||||||
|
|
||||||
@ -296,7 +296,7 @@ void ScFunctionWin::DoEnter()
|
|||||||
if (OutputDevice::isDisposed())
|
if (OutputDevice::isDisposed())
|
||||||
return;
|
return;
|
||||||
aString = "=";
|
aString = "=";
|
||||||
aString += aFuncList->GetSelectEntry();
|
aString += aFuncList->GetSelectedEntry();
|
||||||
if (pHdl)
|
if (pHdl)
|
||||||
pHdl->ClearText();
|
pHdl->ClearText();
|
||||||
}
|
}
|
||||||
@ -342,7 +342,7 @@ void ScFunctionWin::DoEnter()
|
|||||||
if (pHdl->GetEditString().isEmpty())
|
if (pHdl->GetEditString().isEmpty())
|
||||||
{
|
{
|
||||||
aString = "=";
|
aString = "=";
|
||||||
aString += aFuncList->GetSelectEntry();
|
aString += aFuncList->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
EditView *pEdView=pHdl->GetActiveView();
|
EditView *pEdView=pHdl->GetActiveView();
|
||||||
if(pEdView!=nullptr) // @ needed because of crash during setting a name
|
if(pEdView!=nullptr) // @ needed because of crash during setting a name
|
||||||
|
@ -39,7 +39,7 @@ public:
|
|||||||
virtual ~ScSelEntryDlg() override;
|
virtual ~ScSelEntryDlg() override;
|
||||||
virtual void dispose() override;
|
virtual void dispose() override;
|
||||||
|
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX
|
#endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX
|
||||||
|
@ -74,7 +74,7 @@ private:
|
|||||||
typedef ::std::vector< ScenarioEntry > ScenarioList;
|
typedef ::std::vector< ScenarioEntry > ScenarioList;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const ScenarioEntry* GetSelectedEntry() const;
|
const ScenarioEntry* GetSelectedScenarioEntry() const;
|
||||||
|
|
||||||
void ExecuteScenarioSlot( sal_uInt16 nSlotId );
|
void ExecuteScenarioSlot( sal_uInt16 nSlotId );
|
||||||
void SelectScenario();
|
void SelectScenario();
|
||||||
|
@ -47,7 +47,7 @@ public:
|
|||||||
void Insert( const OUString& rString, bool bSelected );
|
void Insert( const OUString& rString, bool bSelected );
|
||||||
|
|
||||||
sal_Int32 GetSelectEntryCount() const;
|
sal_Int32 GetSelectEntryCount() const;
|
||||||
OUString GetSelectEntry(sal_Int32 nPos) const;
|
OUString GetSelectedEntry(sal_Int32 nPos) const;
|
||||||
sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const;
|
sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -574,7 +574,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void)
|
|||||||
|
|
||||||
IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
|
IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void)
|
||||||
{
|
{
|
||||||
OUString aRangeStr = pLbRange->GetSelectEntry();
|
OUString aRangeStr = pLbRange->GetSelectedEntry();
|
||||||
sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos();
|
sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos();
|
||||||
bool bColName =
|
bool bColName =
|
||||||
(reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol);
|
(reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol);
|
||||||
@ -642,7 +642,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void)
|
|||||||
++nMoves;
|
++nMoves;
|
||||||
pLbRange->SelectEntryPos( ++nSelectPos );
|
pLbRange->SelectEntryPos( ++nSelectPos );
|
||||||
}
|
}
|
||||||
OUString aRangeStr = pLbRange->GetSelectEntry();
|
OUString aRangeStr = pLbRange->GetSelectedEntry();
|
||||||
if ( nMoves )
|
if ( nMoves )
|
||||||
{
|
{
|
||||||
if ( nSelectPos > 1 && nSelectPos >= nCnt )
|
if ( nSelectPos > 1 && nSelectPos >= nCnt )
|
||||||
@ -650,14 +650,14 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void)
|
|||||||
// do not stop at the delimiter
|
// do not stop at the delimiter
|
||||||
nSelectPos = nCnt - 2;
|
nSelectPos = nCnt - 2;
|
||||||
pLbRange->SelectEntryPos( nSelectPos );
|
pLbRange->SelectEntryPos( nSelectPos );
|
||||||
aRangeStr = pLbRange->GetSelectEntry();
|
aRangeStr = pLbRange->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if ( nSelectPos > 2 && nSelectPos < nCnt && !aRangeStr.isEmpty()
|
else if ( nSelectPos > 2 && nSelectPos < nCnt && !aRangeStr.isEmpty()
|
||||||
&& aRangeStr == pEdAssign->GetText() )
|
&& aRangeStr == pEdAssign->GetText() )
|
||||||
{ // move upwards instead of below to the previous position
|
{ // move upwards instead of below to the previous position
|
||||||
nSelectPos -= 2;
|
nSelectPos -= 2;
|
||||||
pLbRange->SelectEntryPos( nSelectPos );
|
pLbRange->SelectEntryPos( nSelectPos );
|
||||||
aRangeStr = pLbRange->GetSelectEntry();
|
aRangeStr = pLbRange->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
|
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
|
||||||
|
@ -88,8 +88,8 @@ IMPL_LINK_NOARG(DataProviderDlg, SelectHdl, ListBox&, void)
|
|||||||
void DataProviderDlg::UpdateEnable()
|
void DataProviderDlg::UpdateEnable()
|
||||||
{
|
{
|
||||||
bool bEmptyEntry = m_pCbUrl->GetURL().isEmpty() ||
|
bool bEmptyEntry = m_pCbUrl->GetURL().isEmpty() ||
|
||||||
m_pCBData->GetSelectEntry().isEmpty() ||
|
m_pCBData->GetSelectedEntry().isEmpty() ||
|
||||||
m_pCBProvider->GetSelectEntry().isEmpty();
|
m_pCBProvider->GetSelectedEntry().isEmpty();
|
||||||
m_pBtnOk->Enable(!bEmptyEntry);
|
m_pBtnOk->Enable(!bEmptyEntry);
|
||||||
setOptimalLayoutSize();
|
setOptimalLayoutSize();
|
||||||
}
|
}
|
||||||
@ -117,11 +117,11 @@ void DataProviderDlg::StartImport()
|
|||||||
if (aURL.isEmpty())
|
if (aURL.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
OUString maDBDataName = m_pCBData->GetSelectEntry();
|
OUString maDBDataName = m_pCBData->GetSelectedEntry();
|
||||||
if (maDBDataName.isEmpty())
|
if (maDBDataName.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
OUString aProvider = m_pCBProvider->GetSelectEntry();
|
OUString aProvider = m_pCBProvider->GetSelectedEntry();
|
||||||
if (aProvider.isEmpty())
|
if (aProvider.isEmpty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -212,7 +212,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
|
|||||||
}
|
}
|
||||||
else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
|
else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
|
||||||
{
|
{
|
||||||
aStrCurSelTable = m_pLbTables->GetSelectEntry();
|
aStrCurSelTable = m_pLbTables->GetSelectedEntry();
|
||||||
pStr = &aStrCurSelTable;
|
pStr = &aStrCurSelTable;
|
||||||
if ( pN )
|
if ( pN )
|
||||||
*pN = m_pLbTables->GetSelectEntryPos();
|
*pN = m_pLbTables->GetSelectEntryPos();
|
||||||
@ -228,7 +228,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
|
|||||||
|
|
||||||
if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
|
if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() )
|
||||||
{
|
{
|
||||||
aStrCurSelTable = m_pLbTables->GetSelectEntry( nSelTabIndex );
|
aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex );
|
||||||
pStr = &aStrCurSelTable;
|
pStr = &aStrCurSelTable;
|
||||||
if ( pN )
|
if ( pN )
|
||||||
*pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex );
|
*pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex );
|
||||||
|
@ -53,9 +53,9 @@ void ScSelEntryDlg::dispose()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OUString ScSelEntryDlg::GetSelectEntry() const
|
OUString ScSelEntryDlg::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
return m_pLb->GetSelectEntry();
|
return m_pLb->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void)
|
IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void)
|
||||||
|
@ -319,7 +319,7 @@ OUString ScLinkedAreaDlg::GetSource()
|
|||||||
{
|
{
|
||||||
if (i > 0)
|
if (i > 0)
|
||||||
aBuf.append(';');
|
aBuf.append(';');
|
||||||
aBuf.append(m_pLbRanges->GetSelectEntry(i));
|
aBuf.append(m_pLbRanges->GetSelectedEntry(i));
|
||||||
}
|
}
|
||||||
return aBuf.makeStringAndClear();
|
return aBuf.makeStringAndClear();
|
||||||
}
|
}
|
||||||
|
@ -282,7 +282,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, Button*, void)
|
|||||||
if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) )
|
if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) )
|
||||||
{
|
{
|
||||||
OUString aMsg = aStrDelMsg.getToken( 0, '#' )
|
OUString aMsg = aStrDelMsg.getToken( 0, '#' )
|
||||||
+ m_pLbFormat->GetSelectEntry()
|
+ m_pLbFormat->GetSelectedEntry()
|
||||||
+ aStrDelMsg.getToken( 1, '#' );
|
+ aStrDelMsg.getToken( 1, '#' );
|
||||||
|
|
||||||
if ( RET_YES ==
|
if ( RET_YES ==
|
||||||
@ -318,7 +318,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void)
|
|||||||
while( !bOk )
|
while( !bOk )
|
||||||
{
|
{
|
||||||
|
|
||||||
OUString aFormatName = m_pLbFormat->GetSelectEntry();
|
OUString aFormatName = m_pLbFormat->GetSelectedEntry();
|
||||||
OUString aEntry;
|
OUString aEntry;
|
||||||
|
|
||||||
VclPtrInstance<ScStringInputDlg> pDlg( this,
|
VclPtrInstance<ScStringInputDlg> pDlg( this,
|
||||||
|
@ -71,9 +71,9 @@ sal_Int32 ScShowTabDlg::GetSelectEntryCount() const
|
|||||||
return m_pLb->GetSelectEntryCount();
|
return m_pLb->GetSelectEntryCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString ScShowTabDlg::GetSelectEntry(sal_Int32 nPos) const
|
OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const
|
||||||
{
|
{
|
||||||
return m_pLb->GetSelectEntry(nPos);
|
return m_pLb->GetSelectedEntry(nPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const
|
sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const
|
||||||
|
@ -137,7 +137,7 @@ bool ScNameDefDlg::IsFormulaValid()
|
|||||||
|
|
||||||
bool ScNameDefDlg::IsNameValid()
|
bool ScNameDefDlg::IsNameValid()
|
||||||
{
|
{
|
||||||
OUString aScope = m_pLbScope->GetSelectEntry();
|
OUString aScope = m_pLbScope->GetSelectedEntry();
|
||||||
OUString aName = m_pEdName->GetText();
|
OUString aName = m_pEdName->GetText();
|
||||||
|
|
||||||
ScRangeName* pRangeName = nullptr;
|
ScRangeName* pRangeName = nullptr;
|
||||||
@ -194,7 +194,7 @@ bool ScNameDefDlg::IsNameValid()
|
|||||||
|
|
||||||
void ScNameDefDlg::AddPushed()
|
void ScNameDefDlg::AddPushed()
|
||||||
{
|
{
|
||||||
OUString aScope = m_pLbScope->GetSelectEntry();
|
OUString aScope = m_pLbScope->GetSelectedEntry();
|
||||||
OUString aName = m_pEdName->GetText();
|
OUString aName = m_pEdName->GetText();
|
||||||
OUString aExpression = m_pEdRange->GetText();
|
OUString aExpression = m_pEdRange->GetText();
|
||||||
|
|
||||||
|
@ -268,7 +268,7 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData)
|
|||||||
|
|
||||||
bool ScNameDlg::IsNameValid()
|
bool ScNameDlg::IsNameValid()
|
||||||
{
|
{
|
||||||
OUString aScope = m_pLbScope->GetSelectEntry();
|
OUString aScope = m_pLbScope->GetSelectedEntry();
|
||||||
OUString aName = m_pEdName->GetText();
|
OUString aName = m_pEdName->GetText();
|
||||||
aName = aName.trim();
|
aName = aName.trim();
|
||||||
|
|
||||||
@ -394,7 +394,7 @@ void ScNameDlg::NameModified()
|
|||||||
if (aOldScope.isEmpty())
|
if (aOldScope.isEmpty())
|
||||||
return;
|
return;
|
||||||
OUString aExpr = m_pEdAssign->GetText();
|
OUString aExpr = m_pEdAssign->GetText();
|
||||||
OUString aNewScope = m_pLbScope->GetSelectEntry();
|
OUString aNewScope = m_pLbScope->GetSelectedEntry();
|
||||||
|
|
||||||
ScRangeName* pOldRangeName = GetRangeName( aOldScope );
|
ScRangeName* pOldRangeName = GetRangeName( aOldScope );
|
||||||
ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) );
|
ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) );
|
||||||
|
@ -310,7 +310,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, ListBox&, rListBox, void)
|
|||||||
{
|
{
|
||||||
ScNavigatorDlg::ReleaseFocus();
|
ScNavigatorDlg::ReleaseFocus();
|
||||||
|
|
||||||
OUString aDocName = rListBox.GetSelectEntry();
|
OUString aDocName = rListBox.GetSelectedEntry();
|
||||||
aLbEntries->SelectDoc(aDocName);
|
aLbEntries->SelectDoc(aDocName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryLis
|
|||||||
|
|
||||||
void ScScenarioListBox::Select()
|
void ScScenarioListBox::Select()
|
||||||
{
|
{
|
||||||
if( const ScenarioEntry* pEntry = GetSelectedEntry() )
|
if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() )
|
||||||
mrParent.SetComment( pEntry->maComment );
|
mrParent.SetComment( pEntry->maComment );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
|
|||||||
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
|
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
|
||||||
if ( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu )
|
if ( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu )
|
||||||
{
|
{
|
||||||
if( const ScenarioEntry* pEntry = GetSelectedEntry() )
|
if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() )
|
||||||
{
|
{
|
||||||
if( !pEntry->mbProtected )
|
if( !pEntry->mbProtected )
|
||||||
{
|
{
|
||||||
@ -152,7 +152,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
|
|||||||
return bHandled || ListBox::EventNotify(rNEvt);
|
return bHandled || ListBox::EventNotify(rNEvt);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const
|
const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedScenarioEntry() const
|
||||||
{
|
{
|
||||||
size_t nPos = GetSelectEntryPos();
|
size_t nPos = GetSelectEntryPos();
|
||||||
return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr;
|
return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr;
|
||||||
@ -162,7 +162,7 @@ void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId )
|
|||||||
{
|
{
|
||||||
if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() )
|
if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() )
|
||||||
{
|
{
|
||||||
SfxStringItem aStringItem( nSlotId, GetSelectEntry() );
|
SfxStringItem aStringItem( nSlotId, GetSelectedEntry() );
|
||||||
pViewFrm->GetDispatcher()->ExecuteList(nSlotId,
|
pViewFrm->GetDispatcher()->ExecuteList(nSlotId,
|
||||||
SfxCallMode::SLOT | SfxCallMode::RECORD, { &aStringItem } );
|
SfxCallMode::SLOT | SfxCallMode::RECORD, { &aStringItem } );
|
||||||
}
|
}
|
||||||
|
@ -154,7 +154,7 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
|
|||||||
pBreakCB ->IsValueChangedFromSaved() ||
|
pBreakCB ->IsValueChangedFromSaved() ||
|
||||||
pGuideLineCB ->IsValueChangedFromSaved())
|
pGuideLineCB ->IsValueChangedFromSaved())
|
||||||
{
|
{
|
||||||
NamedColor aNamedColor = pColorLB->GetSelectEntry();
|
NamedColor aNamedColor = pColorLB->GetSelectedEntry();
|
||||||
pLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
|
pLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second);
|
||||||
rCoreSet->Put(ScTpViewItem(*pLocalOptions));
|
rCoreSet->Put(ScTpViewItem(*pLocalOptions));
|
||||||
bRet = true;
|
bRet = true;
|
||||||
|
@ -741,7 +741,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
|
|||||||
OSL_ENSURE(pDlg, "Dialog create fail!");
|
OSL_ENSURE(pDlg, "Dialog create fail!");
|
||||||
if ( pDlg->Execute() == RET_OK )
|
if ( pDlg->Execute() == RET_OK )
|
||||||
{
|
{
|
||||||
OUString aName = pDlg->GetSelectEntry();
|
OUString aName = pDlg->GetSelectedEntry();
|
||||||
pTabViewShell->GotoDBArea( aName );
|
pTabViewShell->GotoDBArea( aName );
|
||||||
rReq.AppendItem( SfxStringItem( SID_SELECT_DB, aName ) );
|
rReq.AppendItem( SfxStringItem( SID_SELECT_DB, aName ) );
|
||||||
rReq.Done();
|
rReq.Done();
|
||||||
|
@ -154,7 +154,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
|
|||||||
const sal_Int32 nCount = pDlg->GetSelectEntryCount();
|
const sal_Int32 nCount = pDlg->GetSelectEntryCount();
|
||||||
for (sal_Int32 nPos=0; nPos<nCount; ++nPos)
|
for (sal_Int32 nPos=0; nPos<nCount; ++nPos)
|
||||||
{
|
{
|
||||||
aName = pDlg->GetSelectEntry(nPos);
|
aName = pDlg->GetSelectedEntry(nPos);
|
||||||
rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) );
|
rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) );
|
||||||
rNames.push_back(aName);
|
rNames.push_back(aName);
|
||||||
}
|
}
|
||||||
|
@ -574,7 +574,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
|
|||||||
const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
|
const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
|
||||||
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
|
if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
|
||||||
{
|
{
|
||||||
OUString sActEntry( pImagesLst->GetSelectEntry() );
|
OUString sActEntry( pImagesLst->GetSelectedEntry() );
|
||||||
OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
|
OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
|
||||||
OUString sAct(*pActData);
|
OUString sAct(*pActData);
|
||||||
|
|
||||||
|
@ -984,7 +984,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView )
|
|||||||
sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos();
|
sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos();
|
||||||
|
|
||||||
if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless
|
if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless
|
||||||
nLoopCount = m_pLbLoopCount->GetSelectEntry().toUInt32();
|
nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32();
|
||||||
|
|
||||||
aAnimBmp.aBmpEx = *pBitmapEx;
|
aAnimBmp.aBmpEx = *pBitmapEx;
|
||||||
aAnimBmp.aPosPix = aPt;
|
aAnimBmp.aPosPix = aPt;
|
||||||
|
@ -239,9 +239,9 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
|
|||||||
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) );
|
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) );
|
||||||
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) );
|
rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) );
|
||||||
|
|
||||||
NamedColor aColor = m_pLbStartColor->GetSelectEntry();
|
NamedColor aColor = m_pLbStartColor->GetSelectedEntry();
|
||||||
rOutAttrs.Put(XColorItem(ATTR_COPY_START_COLOR, aColor.second, aColor.first));
|
rOutAttrs.Put(XColorItem(ATTR_COPY_START_COLOR, aColor.second, aColor.first));
|
||||||
aColor = m_pLbEndColor->GetSelectEntry();
|
aColor = m_pLbEndColor->GetSelectedEntry();
|
||||||
rOutAttrs.Put(XColorItem(ATTR_COPY_END_COLOR, aColor.second, aColor.first));
|
rOutAttrs.Put(XColorItem(ATTR_COPY_END_COLOR, aColor.second, aColor.first));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -413,7 +413,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p)
|
|||||||
|
|
||||||
for( sal_Int32 i = 0; i < nCount; i++ )
|
for( sal_Int32 i = 0; i < nCount; i++ )
|
||||||
{
|
{
|
||||||
OUString aStr = m_pLbPages->GetSelectEntry( i );
|
OUString aStr = m_pLbPages->GetSelectedEntry( i );
|
||||||
pEntry = m_pLbCustomPages->InsertEntry( aStr,
|
pEntry = m_pLbCustomPages->InsertEntry( aStr,
|
||||||
nullptr, false, nPosCP );
|
nullptr, false, nPosCP );
|
||||||
|
|
||||||
|
@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
|
|||||||
// if it is the active window, we jump to the page
|
// if it is the active window, we jump to the page
|
||||||
if( pInfo && pInfo->IsActive() )
|
if( pInfo && pInfo->IsActive() )
|
||||||
{
|
{
|
||||||
OUString aStr( maTlbObjects->GetSelectEntry() );
|
OUString aStr( maTlbObjects->GetSelectedEntry() );
|
||||||
|
|
||||||
if( !aStr.isEmpty() )
|
if( !aStr.isEmpty() )
|
||||||
{
|
{
|
||||||
@ -345,7 +345,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
|
|||||||
|
|
||||||
IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
|
IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
|
||||||
{
|
{
|
||||||
OUString aStrLb = maLbDocs->GetSelectEntry();
|
OUString aStrLb = maLbDocs->GetSelectedEntry();
|
||||||
long nPos = maLbDocs->GetSelectEntryPos();
|
long nPos = maLbDocs->GetSelectEntryPos();
|
||||||
bool bFound = false;
|
bool bFound = false;
|
||||||
::sd::DrawDocShell* pDocShell = nullptr;
|
::sd::DrawDocShell* pDocShell = nullptr;
|
||||||
|
@ -294,7 +294,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
|
|||||||
{
|
{
|
||||||
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll->IsChecked() ) );
|
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll->IsChecked() ) );
|
||||||
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow->IsChecked() ) );
|
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow->IsChecked() ) );
|
||||||
rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectEntry() ) );
|
rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectedEntry() ) );
|
||||||
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) );
|
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) );
|
||||||
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() ) );
|
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() ) );
|
||||||
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) );
|
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) );
|
||||||
|
@ -324,7 +324,7 @@ void SdPageObjsTLB::Clear()
|
|||||||
maSelectionEntryText.clear();
|
maSelectionEntryText.clear();
|
||||||
maTreeItem.clear();
|
maTreeItem.clear();
|
||||||
if (GetCurEntry())
|
if (GetCurEntry())
|
||||||
maSelectionEntryText = GetSelectEntry();
|
maSelectionEntryText = GetSelectedEntry();
|
||||||
SvTreeListEntry* pEntry = FirstChild(nullptr);
|
SvTreeListEntry* pEntry = FirstChild(nullptr);
|
||||||
SaveExpandedTreeItemState(pEntry, maTreeItem);
|
SaveExpandedTreeItemState(pEntry, maTreeItem);
|
||||||
}
|
}
|
||||||
@ -420,7 +420,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, bool bAllPages,
|
|||||||
OUString aSelection;
|
OUString aSelection;
|
||||||
if( GetSelectionCount() > 0 )
|
if( GetSelectionCount() > 0 )
|
||||||
{
|
{
|
||||||
aSelection = GetSelectEntry();
|
aSelection = GetSelectedEntry();
|
||||||
Clear();
|
Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -697,7 +697,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc )
|
|||||||
/**
|
/**
|
||||||
* @return selected string
|
* @return selected string
|
||||||
*/
|
*/
|
||||||
OUString SdPageObjsTLB::GetSelectEntry()
|
OUString SdPageObjsTLB::GetSelectedEntry()
|
||||||
{
|
{
|
||||||
return GetEntryText( GetCurEntry() );
|
return GetEntryText( GetCurEntry() );
|
||||||
}
|
}
|
||||||
@ -1006,9 +1006,9 @@ void SdPageObjsTLB::DoDrag()
|
|||||||
OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::DecodeMechanism::NONE );
|
||||||
NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
|
NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType();
|
||||||
|
|
||||||
aURL += "#" + GetSelectEntry();
|
aURL += "#" + GetSelectedEntry();
|
||||||
|
|
||||||
INetBookmark aBookmark( aURL, GetSelectEntry() );
|
INetBookmark aBookmark( aURL, GetSelectedEntry() );
|
||||||
sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
|
sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
|
||||||
|
|
||||||
if( eDragType == NAVIGATOR_DRAGTYPE_LINK )
|
if( eDragType == NAVIGATOR_DRAGTYPE_LINK )
|
||||||
|
@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
|
|||||||
|
|
||||||
IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
|
IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
|
||||||
{
|
{
|
||||||
m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() );
|
m_pEdtBookmark->SetText( m_pLbTree->GetSelectedEntry() );
|
||||||
}
|
}
|
||||||
|
|
||||||
IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
|
IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
|
||||||
@ -835,7 +835,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
|
|||||||
m_pLbTreeDocument->Control::IsVisible() &&
|
m_pLbTreeDocument->Control::IsVisible() &&
|
||||||
m_pLbTreeDocument->GetSelectionCount() > 0 )
|
m_pLbTreeDocument->GetSelectionCount() > 0 )
|
||||||
{
|
{
|
||||||
OUString aTmpStr( m_pLbTreeDocument->GetSelectEntry() );
|
OUString aTmpStr( m_pLbTreeDocument->GetSelectedEntry() );
|
||||||
if( !aTmpStr.isEmpty() )
|
if( !aTmpStr.isEmpty() )
|
||||||
{
|
{
|
||||||
aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr;
|
aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr;
|
||||||
|
@ -206,7 +206,7 @@ public:
|
|||||||
bool IsEqualToDoc( const SdDrawDocument* pInDoc );
|
bool IsEqualToDoc( const SdDrawDocument* pInDoc );
|
||||||
bool HasSelectedChildren( const OUString& rName );
|
bool HasSelectedChildren( const OUString& rName );
|
||||||
bool SelectEntry( const OUString& rName );
|
bool SelectEntry( const OUString& rName );
|
||||||
OUString GetSelectEntry();
|
OUString GetSelectedEntry();
|
||||||
|
|
||||||
//Mark Current Entry
|
//Mark Current Entry
|
||||||
void SetSdNavigatorWinFlag(bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
|
void SetSdNavigatorWinFlag(bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;};
|
||||||
|
@ -1032,7 +1032,7 @@ IMPL_LINK_NOARG(SlideBackground, AssignMasterPage, ListBox&, void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
OUString aLayoutName(mpMasterSlide->GetSelectEntry());
|
OUString aLayoutName(mpMasterSlide->GetSelectedEntry());
|
||||||
pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false);
|
pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -400,7 +400,7 @@ bool ContentListBox_Impl::EventNotify( NotifyEvent& rNEvt )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OUString ContentListBox_Impl::GetSelectEntry() const
|
OUString ContentListBox_Impl::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
OUString aRet;
|
OUString aRet;
|
||||||
SvTreeListEntry* pEntry = FirstSelected();
|
SvTreeListEntry* pEntry = FirstSelected();
|
||||||
@ -776,7 +776,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OUString IndexTabPage_Impl::GetSelectEntry() const
|
OUString IndexTabPage_Impl::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
OUString aRet;
|
OUString aRet;
|
||||||
IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) ));
|
IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) ));
|
||||||
@ -1080,7 +1080,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
OUString SearchTabPage_Impl::GetSelectEntry() 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->GetSelectEntryData());
|
||||||
@ -1326,7 +1326,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink
|
|||||||
m_pBookmarksBox->SetDoubleClickHdl(rLink);
|
m_pBookmarksBox->SetDoubleClickHdl(rLink);
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString BookmarksTabPage_Impl::GetSelectEntry() 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->GetSelectEntryData());
|
||||||
@ -1714,7 +1714,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const
|
OUString SfxHelpIndexWindow_Impl::GetSelectedEntry() const
|
||||||
{
|
{
|
||||||
OUString sRet;
|
OUString sRet;
|
||||||
|
|
||||||
@ -1722,19 +1722,19 @@ OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const
|
|||||||
|
|
||||||
if (sName == "contents")
|
if (sName == "contents")
|
||||||
{
|
{
|
||||||
sRet = pCPage->GetSelectEntry();
|
sRet = pCPage->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if (sName == "index")
|
else if (sName == "index")
|
||||||
{
|
{
|
||||||
sRet = pIPage->GetSelectEntry();
|
sRet = pIPage->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if (sName == "find")
|
else if (sName == "find")
|
||||||
{
|
{
|
||||||
sRet = pSPage->GetSelectEntry();
|
sRet = pSPage->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
else if (sName == "bookmarks")
|
else if (sName == "bookmarks")
|
||||||
{
|
{
|
||||||
sRet = pBPage->GetSelectEntry();
|
sRet = pBPage->GetSelectedEntry();
|
||||||
}
|
}
|
||||||
|
|
||||||
return sRet;
|
return sRet;
|
||||||
@ -2804,7 +2804,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void )
|
|||||||
IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool)
|
IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool)
|
||||||
{
|
{
|
||||||
pIndexWin->SelectExecutableEntry();
|
pIndexWin->SelectExecutableEntry();
|
||||||
OUString aEntry = pIndexWin->GetSelectEntry();
|
OUString aEntry = pIndexWin->GetSelectedEntry();
|
||||||
|
|
||||||
if ( aEntry.isEmpty() )
|
if ( aEntry.isEmpty() )
|
||||||
return false;
|
return false;
|
||||||
|
@ -69,7 +69,7 @@ public:
|
|||||||
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
|
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
|
||||||
|
|
||||||
void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
|
void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); }
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
// class HelpTabPage_Impl ------------------------------------------------
|
// class HelpTabPage_Impl ------------------------------------------------
|
||||||
@ -106,7 +106,7 @@ public:
|
|||||||
virtual Control* GetLastFocusControl() override;
|
virtual Control* GetLastFocusControl() override;
|
||||||
|
|
||||||
void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
|
void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); }
|
||||||
OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); }
|
OUString GetSelectedEntry() const { return m_pContentBox->GetSelectedEntry(); }
|
||||||
void SetFocusOnBox() { m_pContentBox->GrabFocus(); }
|
void SetFocusOnBox() { m_pContentBox->GrabFocus(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -156,7 +156,7 @@ public:
|
|||||||
void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink );
|
void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink );
|
||||||
void SetFactory( const OUString& rFactory );
|
void SetFactory( const OUString& rFactory );
|
||||||
const OUString& GetFactory() const { return sFactory; }
|
const OUString& GetFactory() const { return sFactory; }
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
|
void SetFocusOnBox() { m_pIndexCB->GrabFocus(); }
|
||||||
bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
|
bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); }
|
||||||
|
|
||||||
@ -233,7 +233,7 @@ public:
|
|||||||
|
|
||||||
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
|
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
|
||||||
void SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
|
void SetFactory( const OUString& rFactory ) { aFactory = rFactory; }
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
void ClearPage();
|
void ClearPage();
|
||||||
void SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
|
void SetFocusOnBox() { m_pResultsLB->GrabFocus(); }
|
||||||
bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
|
bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); }
|
||||||
@ -274,7 +274,7 @@ public:
|
|||||||
virtual Control* GetLastFocusControl() override;
|
virtual Control* GetLastFocusControl() override;
|
||||||
|
|
||||||
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
|
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink );
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
|
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
|
||||||
void SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); }
|
void SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); }
|
||||||
};
|
};
|
||||||
@ -338,10 +338,10 @@ public:
|
|||||||
void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
|
void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; }
|
||||||
void SetFactory( const OUString& rFactory, bool bActive );
|
void SetFactory( const OUString& rFactory, bool bActive );
|
||||||
OUString GetFactory() const { return pIPage->GetFactory(); }
|
OUString GetFactory() const { return pIPage->GetFactory(); }
|
||||||
OUString GetSelectEntry() const;
|
OUString GetSelectedEntry() const;
|
||||||
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
|
void AddBookmarks( const OUString& rTitle, const OUString& rURL );
|
||||||
bool IsValidFactory( const OUString& _rFactory );
|
bool IsValidFactory( const OUString& _rFactory );
|
||||||
OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); }
|
OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectedEntry(); }
|
||||||
void ClearSearchPage();
|
void ClearSearchPage();
|
||||||
void GrabFocusBack();
|
void GrabFocusBack();
|
||||||
bool HasFocusOnEdit() const;
|
bool HasFocusOnEdit() const;
|
||||||
|
@ -289,7 +289,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
|
|||||||
if ( pBox->IsEnabled() )
|
if ( pBox->IsEnabled() )
|
||||||
{
|
{
|
||||||
// it is the current entry, which name was modified
|
// it is the current entry, which name was modified
|
||||||
const bool bSelect = pBox->GetSelectEntry() == aBuf;
|
const bool bSelect = pBox->GetSelectedEntry() == aBuf;
|
||||||
pBox->RemoveEntry( aBuf );
|
pBox->RemoveEntry( aBuf );
|
||||||
pBox->InsertEntry( rNew );
|
pBox->InsertEntry( rNew );
|
||||||
|
|
||||||
@ -337,7 +337,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void )
|
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void )
|
||||||
{
|
{
|
||||||
OUString aTemplName(m_pFollowLb->GetSelectEntry());
|
OUString aTemplName(m_pFollowLb->GetSelectedEntry());
|
||||||
OUString aEditTemplName(m_pNameRo->GetText());
|
OUString aEditTemplName(m_pNameRo->GetText());
|
||||||
if (!( aTemplName == aEditTemplName))
|
if (!( aTemplName == aEditTemplName))
|
||||||
m_pEditStyleBtn->Enable();
|
m_pEditStyleBtn->Enable();
|
||||||
@ -347,7 +347,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, voi
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void )
|
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void )
|
||||||
{
|
{
|
||||||
OUString aTemplName(m_pFollowLb->GetSelectEntry());
|
OUString aTemplName(m_pFollowLb->GetSelectedEntry());
|
||||||
if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() ))
|
if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() ))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -364,7 +364,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&,
|
|||||||
|
|
||||||
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void )
|
IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void )
|
||||||
{
|
{
|
||||||
OUString aTemplName(m_pBaseLb->GetSelectEntry());
|
OUString aTemplName(m_pBaseLb->GetSelectedEntry());
|
||||||
if (aTemplName != SfxResId(STR_NONE))
|
if (aTemplName != SfxResId(STR_NONE))
|
||||||
Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() );
|
Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() );
|
||||||
}
|
}
|
||||||
@ -619,7 +619,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
|
|||||||
|
|
||||||
if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() )
|
if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() )
|
||||||
{
|
{
|
||||||
const OUString aFollowEntry( m_pFollowLb->GetSelectEntry() );
|
const OUString aFollowEntry( m_pFollowLb->GetSelectedEntry() );
|
||||||
|
|
||||||
if ( pStyle->GetFollow() != aFollowEntry )
|
if ( pStyle->GetFollow() != aFollowEntry )
|
||||||
{
|
{
|
||||||
@ -636,7 +636,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
|
|||||||
|
|
||||||
if ( m_pBaseLb->IsEnabled() )
|
if ( m_pBaseLb->IsEnabled() )
|
||||||
{
|
{
|
||||||
OUString aParentEntry( m_pBaseLb->GetSelectEntry() );
|
OUString aParentEntry( m_pBaseLb->GetSelectedEntry() );
|
||||||
|
|
||||||
if ( SfxResId(STR_NONE) == aParentEntry || aParentEntry == pStyle->GetName() )
|
if ( SfxResId(STR_NONE) == aParentEntry || aParentEntry == pStyle->GetName() )
|
||||||
aParentEntry.clear();
|
aParentEntry.clear();
|
||||||
|
@ -238,7 +238,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectEntry() );
|
m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectedEntry() );
|
||||||
|
|
||||||
m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() );
|
m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() );
|
||||||
m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() );
|
m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() );
|
||||||
|
@ -1629,7 +1629,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
|
|||||||
|
|
||||||
IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void )
|
IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void )
|
||||||
{
|
{
|
||||||
if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectEntry())
|
if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectedEntry())
|
||||||
{
|
{
|
||||||
EnableHierarchical(true);
|
EnableHierarchical(true);
|
||||||
}
|
}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user