summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/jsdialog/jsdialogbuilder.hxx6
-rw-r--r--vcl/inc/salvtables.hxx2
-rw-r--r--vcl/jsdialog/jsdialogbuilder.cxx12
-rw-r--r--vcl/source/app/salvtables.cxx4
-rw-r--r--vcl/source/font/FeatureParser.cxx3
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx3
-rw-r--r--vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx4
-rw-r--r--vcl/unx/gtk3/gtkinst.cxx3
8 files changed, 17 insertions, 20 deletions
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index f553e7e96bd8..55183d95558f 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -510,7 +510,7 @@ public:
virtual void response(int response) override;
virtual weld::Button* weld_widget_for_response(int response) override;
virtual int run() override;
- virtual bool runAsync(std::shared_ptr<weld::DialogController> aOwner,
+ virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn) override;
virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
const std::function<void(sal_Int32)>& func) override;
@@ -527,7 +527,7 @@ public:
virtual void response(int response) override;
virtual weld::Button* weld_widget_for_response(int response) override;
virtual int run() override;
- virtual bool runAsync(std::shared_ptr<weld::DialogController> aOwner,
+ virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn) override;
virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
const std::function<void(sal_Int32)>& func) override;
@@ -696,7 +696,7 @@ public:
virtual int run() override;
// TODO: move to dialog class so we will not send json when built but on run
- bool runAsync(std::shared_ptr<weld::DialogController> aOwner,
+ bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn) override;
bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 4074e097a4f4..88025bde129c 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -527,7 +527,7 @@ private:
public:
SalInstanceDialog(::Dialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership);
- virtual bool runAsync(std::shared_ptr<weld::DialogController> aOwner,
+ virtual bool runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn) override;
virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 060d75e58807..7b3b304bf82b 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -1379,10 +1379,10 @@ int JSDialog::run()
return ret;
}
-bool JSDialog::runAsync(std::shared_ptr<weld::DialogController> aOwner,
+bool JSDialog::runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn)
{
- bool ret = SalInstanceDialog::runAsync(aOwner, rEndDialogFn);
+ bool ret = SalInstanceDialog::runAsync(rxOwner, rEndDialogFn);
sendFullUpdate();
return ret;
}
@@ -1402,10 +1402,10 @@ int JSAssistant::run()
return ret;
}
-bool JSAssistant::runAsync(std::shared_ptr<weld::DialogController> aOwner,
+bool JSAssistant::runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn)
{
- bool ret = SalInstanceDialog::runAsync(aOwner, rEndDialogFn);
+ bool ret = SalInstanceDialog::runAsync(rxOwner, rEndDialogFn);
sendFullUpdate();
return ret;
}
@@ -1855,10 +1855,10 @@ int JSMessageDialog::run()
return bRet;
}
-bool JSMessageDialog::runAsync(std::shared_ptr<weld::DialogController> aOwner,
+bool JSMessageDialog::runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn)
{
- bool bRet = SalInstanceMessageDialog::runAsync(aOwner, rEndDialogFn);
+ bool bRet = SalInstanceMessageDialog::runAsync(rxOwner, rEndDialogFn);
RememberMessageDialog();
sendFullUpdate();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 17e6435c3fc2..f51ce48a505c 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1771,11 +1771,11 @@ SalInstanceDialog::SalInstanceDialog(::Dialog* pDialog, SalInstanceBuilder* pBui
}
}
-bool SalInstanceDialog::runAsync(std::shared_ptr<weld::DialogController> aOwner,
+bool SalInstanceDialog::runAsync(std::shared_ptr<weld::DialogController> const& rxOwner,
const std::function<void(sal_Int32)>& rEndDialogFn)
{
VclAbstractDialog::AsyncContext aCtx;
- aCtx.mxOwnerDialogController = aOwner;
+ aCtx.mxOwnerDialogController = rxOwner;
aCtx.maEndDialogFn = rEndDialogFn;
VclButtonBox* pActionArea = m_xDialog->get_action_area();
if (pActionArea)
diff --git a/vcl/source/font/FeatureParser.cxx b/vcl/source/font/FeatureParser.cxx
index 697662032f75..44b7d962429d 100644
--- a/vcl/source/font/FeatureParser.cxx
+++ b/vcl/source/font/FeatureParser.cxx
@@ -46,8 +46,7 @@ FeatureParser::FeatureParser(std::u16string_view rFontName)
}
else
{
- OString sFeature = OUStringToOString(sToken, RTL_TEXTENCODING_ASCII_US);
- FeatureSetting aFeature(sFeature);
+ FeatureSetting aFeature(OUStringToOString(sToken, RTL_TEXTENCODING_ASCII_US));
if (aFeature.m_nTag != 0)
m_aFeatures.push_back(aFeature);
}
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index c2c838d5db55..c15b917d3420 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -829,8 +829,7 @@ void PDFExtOutDevData::SetAlternateText( const OUString& rText )
void PDFExtOutDevData::CreateControl( const PDFWriter::AnyWidget& rControlType )
{
- std::shared_ptr< PDFWriter::AnyWidget > pClone( rControlType.Clone() );
- mpPageSyncData->PushAction( mrOutDev, vcl::CreateControl{ pClone } );
+ mpPageSyncData->PushAction(mrOutDev, vcl::CreateControl{ rControlType.Clone() });
}
void PDFExtOutDevData::BeginGroup()
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
index 57b6e7c53e18..867e28a9124d 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
@@ -148,8 +148,6 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute()
uno::Reference< awt::XExtendedToolkit > xToolkit =
awt::Toolkit::create(m_xContext);
- uno::Reference<frame::XDesktop> xDesktop = frame::Desktop::create(m_xContext);
-
GtkWindow *pParent = GTK_WINDOW(m_pParentWidget);
if (!pParent)
{
@@ -158,7 +156,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute()
}
if (pParent)
gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
- rtl::Reference<RunDialog> pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop);
+ rtl::Reference<RunDialog> pRunDialog = new RunDialog(m_pDialog, xToolkit, frame::Desktop::create(m_xContext));
gint nStatus = pRunDialog->run();
switch( nStatus )
{
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c76d6291cedf..3def046ce22a 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -7057,7 +7057,8 @@ public:
}
}
- virtual bool runAsync(std::shared_ptr<weld::DialogController> rDialogController, const std::function<void(sal_Int32)>& func) override
+ virtual bool runAsync(const std::shared_ptr<weld::DialogController>& rDialogController,
+ const std::function<void(sal_Int32)>& func) override
{
assert(!m_nResponseSignalId && !m_nCancelSignalId && !m_nSignalDeleteId);
generated by cgit (git 2.34.1) at 2024-12-24 12:30:12 +0000