summaryrefslogtreecommitdiff
path: root/cui/source/dialogs
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-18 13:00:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-19 06:26:00 +0000
commitdcb1fbef204ebe7b0a6ccdf70630aa217a8d0e94 (patch)
treec00d8972fd57a628b8d1376ef605dc5107502ff6 /cui/source/dialogs
parent98b77ad1e6acbbdda4843a4b57c1185d53884581 (diff)
loplugin:expandablemethodds in cui
Change-Id: I7b2321d45171f9b73965efea32832a3789f0dee7 Reviewed-on: https://gerrit.libreoffice.org/30011 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r--cui/source/dialogs/insdlg.cxx13
-rw-r--r--cui/source/dialogs/linkdlg.cxx14
-rw-r--r--cui/source/dialogs/pastedlg.cxx2
3 files changed, 14 insertions, 15 deletions
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 2d72164caa68..eb6f18a1a089 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -209,11 +209,10 @@ short SvInsertOleDlg::Execute()
}
// fill listbox and select default
- ListBox& rBox = GetObjectTypes();
- rBox.SetUpdateMode( false );
+ m_pLbObjecttype->SetUpdateMode( false );
for ( sal_uLong i = 0; i < m_pServers->Count(); i++ )
- rBox.InsertEntry( (*m_pServers)[i].GetHumanName() );
- rBox.SetUpdateMode( true );
+ m_pLbObjecttype->InsertEntry( (*m_pServers)[i].GetHumanName() );
+ m_pLbObjecttype->SetUpdateMode( true );
SelectDefault();
OUString aName;
@@ -225,7 +224,7 @@ short SvInsertOleDlg::Execute()
if ( bCreateNew )
{
// create and insert new embedded object
- OUString aServerName = rBox.GetSelectEntry();
+ OUString aServerName = m_pLbObjecttype->GetSelectEntry();
const SvObjectServer* pS = m_pServers->Get( aServerName );
if ( pS )
{
@@ -299,12 +298,12 @@ short SvInsertOleDlg::Execute()
}
else
{
- aFileName = GetFilePath();
+ aFileName = m_pEdFilepath->GetText();
INetURLObject aURL;
aURL.SetSmartProtocol( INetProtocol::File );
aURL.SetSmartURL( aFileName );
aFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
- bool bLink = IsLinked();
+ bool bLink = m_pCbFilelink->IsChecked();
if ( !aFileName.isEmpty() )
{
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index bfd3d5bbaee2..d8201ba0e89a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -424,7 +424,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
if( !xLink.Is() )
return;
- ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, Closelinkmsg() );
+ ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, aStrCloselinkmsg );
if( RET_YES == aBox->Execute() )
{
@@ -455,7 +455,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, BreakLinkClickHdl, Button*, void )
}
else
{
- ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, CloselinkmsgMulti() );
+ ScopedVclPtrInstance< QueryBox > aBox( this, WB_YES_NO | WB_DEF_YES, aStrCloselinkmsgMulti );
if( RET_YES == aBox->Execute() )
{
@@ -563,16 +563,16 @@ OUString SvBaseLinksDlg::ImplGetStateStr( const SvBaseLink& rLnk )
{
OUString sRet;
if( !rLnk.GetObj() )
- sRet = Brokenlink();
+ sRet = aStrBrokenlink;
else if( rLnk.GetObj()->IsPending() )
{
- sRet = Waitinglink();
- StartUpdateTimer();
+ sRet = aStrWaitinglink;
+ aUpdateIdle.Start();
}
else if( SfxLinkUpdateMode::ALWAYS == rLnk.GetUpdateMode() )
- sRet = Autolink();
+ sRet = aStrAutolink;
else
- sRet = Manuallink();
+ sRet = aStrManuallink;
return sRet;
}
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index d6750ca7fad0..c0d5da6d506d 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -194,7 +194,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe
aTypeName = convertLineEnd(aTypeName, GetSystemLineEnd());
}
- ObjectSource().SetText( aTypeName );
+ m_pFtObjectSource->SetText( aTypeName );
if( Dialog::Execute() == RET_OK )
{