summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/FontFeaturesDialog.cxx4
-rw-r--r--cui/source/dialogs/SignatureLineDialogBase.cxx4
-rw-r--r--cui/source/dialogs/cuicharmap.cxx4
-rw-r--r--cui/source/dialogs/insdlg.cxx8
-rw-r--r--cui/source/factory/dlgfact.cxx14
-rw-r--r--cui/source/factory/init.cxx2
-rw-r--r--cui/source/inc/FontFeaturesDialog.hxx2
-rw-r--r--cui/source/inc/SignatureLineDialogBase.hxx2
-rw-r--r--cui/source/inc/cuicharmap.hxx2
-rw-r--r--cui/source/inc/insdlg.hxx5
-rw-r--r--cui/source/options/optjava.cxx6
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx4
-rw-r--r--cui/source/tabpages/chardlg.cxx4
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--cui/uiconfig/ui/calloutdialog.ui2
16 files changed, 33 insertions, 34 deletions
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index fd3d560224c2..00b28434651a 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -197,9 +197,9 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
return sResultFontName;
}
-short FontFeaturesDialog::execute()
+short FontFeaturesDialog::run()
{
- short nResult = m_xDialog->run();
+ short nResult = GenericDialogController::run();
if (nResult == RET_OK)
{
m_sResultFontName = createFontNameWithFeatures();
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx b/cui/source/dialogs/SignatureLineDialogBase.cxx
index a4806bdf1c01..c0e7871e1291 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -23,9 +23,9 @@ SignatureLineDialogBase::SignatureLineDialogBase(weld::Widget* pParent, Referenc
{
}
-short SignatureLineDialogBase::execute()
+short SignatureLineDialogBase::run()
{
- short nRet = run();
+ short nRet = GenericDialogController::run();
if (nRet == RET_OK)
Apply();
return nRet;
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 4639d6a6c9df..e83fdbe5c78e 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -184,7 +184,7 @@ SvxCharacterMap::SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet,
m_xSearchSet->Hide();
}
-short SvxCharacterMap::execute()
+short SvxCharacterMap::run()
{
if( SvxShowCharSet::getSelectedChar() == ' ')
{
@@ -202,7 +202,7 @@ short SvxCharacterMap::execute()
m_xOKBtn->set_sensitive(true);
}
- return run();
+ return SfxDialogController::run();
}
void SvxCharacterMap::SetChar( sal_UCS4 c )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b954f29d9a52..84b395ec7da7 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -156,7 +156,7 @@ SvInsertOleDlg::SvInsertOleDlg(weld::Window* pParent, const Reference<embed::XSt
m_xRbNewObject->set_active(true);
}
-short SvInsertOleDlg::execute()
+short SvInsertOleDlg::run()
{
short nRet = RET_OK;
SvObjectServerList aObjS;
@@ -176,7 +176,7 @@ short SvInsertOleDlg::execute()
OUString aName;
DBG_ASSERT( m_xStorage.is(), "No storage!");
- if ( m_xStorage.is() && ( nRet = run() ) == RET_OK )
+ if ( m_xStorage.is() && ( nRet = InsertObjectDialog_Impl::run() ) == RET_OK )
{
OUString aFileName;
bool bCreateNew = IsCreateNew();
@@ -383,7 +383,7 @@ void SfxInsertFloatingFrameDialog::Init()
m_xBTOpen->connect_clicked(LINK(this, SfxInsertFloatingFrameDialog, OpenHdl));
}
-short SfxInsertFloatingFrameDialog::execute()
+short SfxInsertFloatingFrameDialog::run()
{
short nRet = RET_OK;
bool bOK = false;
@@ -475,7 +475,7 @@ short SfxInsertFloatingFrameDialog::execute()
bOK = m_xStorage.is();
}
- if ( bOK && ( nRet = run() ) == RET_OK )
+ if ( bOK && ( nRet = InsertObjectDialog_Impl::run() ) == RET_OK )
{
OUString aURL;
if (!m_xEDURL->get_text().isEmpty())
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index be648afb4361..138d5427b0a8 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -153,7 +153,7 @@ short AbstractSvxSearchSimilarityDialog_Impl::Execute()
short AbstractSvxTransformTabDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
bool AbstractSvxTransformTabDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
@@ -163,7 +163,7 @@ bool AbstractSvxTransformTabDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
short AbstractSvxCaptionDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
bool AbstractSvxCaptionDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
@@ -219,7 +219,7 @@ short AbstractGraphicFilterDialog_Impl::Execute()
short AbstractSvxAreaTabDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
bool AbstractSvxAreaTabDialog_Impl::StartExecuteAsync(AsyncContext &rCtx)
@@ -234,7 +234,7 @@ short AbstractPasteDialog_Impl::Execute()
short AbstractInsertObjectDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
IMPL_ABSTDLG_BASE(AbstractLinksDialog_Impl);
@@ -267,12 +267,12 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const OUString& rStr)
short AbstractSignatureLineDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
short AbstractSignSignatureLineDialog_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
IMPL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl);
@@ -345,7 +345,7 @@ void CuiAbstractTabDialog_Impl::SetText( const OUString& rStr )
short CuiAbstractTabController_Impl::Execute()
{
- return m_xDlg->execute();
+ return m_xDlg->run();
}
bool CuiAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx)
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index d2bf5ed6606e..4ca3ed0e6e89 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -29,7 +29,7 @@ SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(vcl::Window const * i_pParent,
SvxCharacterMap aDlg(i_pParent ? i_pParent->GetFrameWeld() : nullptr, nullptr, false);
aDlg.DisableFontSelection();
aDlg.SetCharFont(i_rFont);
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
{
sal_UCS4 cChar = aDlg.GetChar();
// using the new UCS4 constructor
diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx
index 4fe46ca99bb1..ccecb1fcbcbd 100644
--- a/cui/source/inc/FontFeaturesDialog.hxx
+++ b/cui/source/inc/FontFeaturesDialog.hxx
@@ -63,7 +63,7 @@ private:
public:
FontFeaturesDialog(weld::Window* pParent, OUString const& rFontName);
~FontFeaturesDialog() override;
- short execute();
+ virtual short run() override;
OUString const& getResultFontName() { return m_sResultFontName; }
diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx
index 8954ecd98a60..2701be29035c 100644
--- a/cui/source/inc/SignatureLineDialogBase.hxx
+++ b/cui/source/inc/SignatureLineDialogBase.hxx
@@ -20,7 +20,7 @@ public:
SignatureLineDialogBase(weld::Widget* pParent, css::uno::Reference<css::frame::XModel> xModel,
const OUString& rUIFile, const OString& rDialogId);
- short execute();
+ virtual short run() override;
protected:
css::uno::Reference<css::frame::XModel> m_xModel;
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index bcf952a62123..1928fe344814 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -141,7 +141,7 @@ private:
public:
SvxCharacterMap(weld::Window* pParent, const SfxItemSet* pSet, const bool bInsert=true);
- short execute();
+ virtual short run() override;
void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 892386c2d89b..a63d8587d658 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,6 @@ public:
virtual css::uno::Reference<css::io::XInputStream> GetIconIfIconified(OUString* pGraphicMediaType);
void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
virtual bool IsCreateNew() const;
- virtual short execute() = 0;
};
class SvInsertOleDlg : public InsertObjectDialog_Impl
@@ -73,7 +72,7 @@ public:
SvInsertOleDlg(weld::Window* pParent,
const css::uno::Reference < css::embed::XStorage >& xStorage,
const SvObjectServerList* pServers );
- virtual short execute() override;
+ virtual short run() override;
/// get replacement for the iconified embedded object and the mediatype of the replacement
css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) override;
@@ -110,7 +109,7 @@ public:
const css::uno::Reference<css::embed::XStorage>& xStorage);
SfxInsertFloatingFrameDialog(weld::Window* pParent,
const css::uno::Reference<css::embed::XEmbeddedObject>& xObj);
- virtual short execute() override;
+ virtual short run() override;
};
#endif // INCLUDED_CUI_SOURCE_INC_INSDLG_HXX
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 9b3660d35592..47f6625ee9fa 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -278,7 +278,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl, Button*, void)
m_xParamDlg->DisableButtons(); //disable add, edit and remove button when dialog is reopened
}
- if (m_xParamDlg->execute() == RET_OK)
+ if (m_xParamDlg->run() == RET_OK)
{
if ( aParameterList != m_xParamDlg->GetParameters() )
{
@@ -810,11 +810,11 @@ void SvxJavaParameterDlg::EditParameter()
}
}
-short SvxJavaParameterDlg::execute()
+short SvxJavaParameterDlg::run()
{
m_xParameterEdit->grab_focus();
m_xAssignedList->select(-1);
- return m_xDialog->run();
+ return GenericDialogController::run();
}
std::vector< OUString > SvxJavaParameterDlg::GetParameters() const
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index f6e715915aa6..396cf63a20b7 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -167,7 +167,7 @@ public:
explicit SvxJavaParameterDlg(weld::Window* pParent);
virtual ~SvxJavaParameterDlg() override;
- short execute();
+ virtual short run() override;
std::vector< OUString > GetParameters() const;
void SetParameters( std::vector< OUString > const & rParams );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b754fd31c378..2a08fa616064 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -729,7 +729,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void)
ImpUserData* pUserData = static_cast<ImpUserData*>(m_pCheckLB->FirstSelected()->GetUserData());
aMapDlg.SetCharFont(*pUserData->pFont);
aMapDlg.SetChar( (*pUserData->pString)[0] );
- if (RET_OK == aMapDlg.execute())
+ if (RET_OK == aMapDlg.run())
{
const vcl::Font& aFont(aMapDlg.GetCharFont());
*pUserData->pFont = aFont;
@@ -2077,7 +2077,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void )
}
aMap.SetChar( cDlg );
aMap.DisableFontSelection();
- if (aMap.execute() == RET_OK)
+ if (aMap.run() == RET_OK)
{
sal_UCS4 cNewChar = aMap.GetChar();
switch( nMode )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index cb4562e22b3b..acb3bfb8e9c3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1167,7 +1167,7 @@ IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, weld::Button&, rButton, voi
if (!sFontName.isEmpty() && pNameBox)
{
cui::FontFeaturesDialog aDialog(GetDialogFrameWeld(), sFontName);
- if (aDialog.execute() == RET_OK)
+ if (aDialog.run() == RET_OK)
{
pNameBox->set_active_text(aDialog.getResultFontName());
UpdatePreview_Impl();
@@ -3093,7 +3093,7 @@ void SvxCharTwoLinesPage::SelectCharacter(weld::TreeView* pBox)
SvxCharacterMap aDlg(GetFrameWeld(), nullptr, false);
aDlg.DisableFontSelection();
- if (aDlg.execute() == RET_OK)
+ if (aDlg.run() == RET_OK)
{
sal_Unicode cChar = static_cast<sal_Unicode>(aDlg.GetChar());
SetBracket( cChar, bStart );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 59e5862a98e5..fc586579bbaf 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1983,7 +1983,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, weld::Button&, void)
aMap.SetCharFont(aActBulletFont);
if (bSameBullet)
aMap.SetChar(cBullet);
- if (aMap.execute() == RET_OK)
+ if (aMap.run() == RET_OK)
{
// change Font Numrules
aActBulletFont = aMap.GetCharFont();
diff --git a/cui/uiconfig/ui/calloutdialog.ui b/cui/uiconfig/ui/calloutdialog.ui
index 8956c6cc661c..6cc6794ec0ca 100644
--- a/cui/uiconfig/ui/calloutdialog.ui
+++ b/cui/uiconfig/ui/calloutdialog.ui
@@ -90,7 +90,7 @@
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="scrollable">True</property>
generated by cgit (git 2.34.1) at 2024-07-01 13:01:29 +0000