desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 12 ++++-----
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6 ++--
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 14 +++++------
desktop/source/deployment/registry/package/dp_package.cxx | 4 +--
desktop/source/deployment/registry/script/dp_script.cxx | 2 -
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2 -
desktop/source/lib/init.cxx | 8 +++---
helpcontent2 | 2 -
8 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit a90315573a96e0e72846c6d676ca59dd386bd3f5
Author: Rafael Lima <rafael.palma.l...@gmail.com>
AuthorDate: Wed Feb 17 13:32:10 2021 +0100
Commit: Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Wed Feb 17 13:32:10 2021 +0100
Update git submodules
* Update helpcontent2 from branch 'master'
to 00cf8de0436b61d64c7c406de2106ee0c1949459
- Create SF Filesystem Help page
Also in this patch:
- lib_ScriptForge.xhp: add links to table of contents
- sf_dialogcontrol.xhp: silence strings for translation
Change-Id: I9b69be483d93957cdc793d95f56f33a48e3f1c85
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110788
Tested-by: Jenkins
Reviewed-by: Rafael Lima <rafael.palma.l...@gmail.com>
diff --git a/helpcontent2 b/helpcontent2
index ec6e0c930fd8..00cf8de0436b 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec6e0c930fd8a7ca5dc6a84a686602acff69234e
+Subproject commit 00cf8de0436b61d64c7c406de2106ee0c1949459
commit fd8bedb54a66bb62bfbfc48639f780b433d7defe
Author: Noel <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 17 12:47:53 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 17 13:31:57 2021 +0100
loplugin:referencecasting in desktop
Change-Id: I19da92c3cbf082965f01fd2339f42419f4229aa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111056
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index d2fca9d95e03..95cb874f1ca9 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -844,7 +844,7 @@ void ExtensionCmdQueue::Thread::_addExtension(
::rtl::Reference< ProgressCmdEnv
uno::Any anyTitle;
try
{
- anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv.get(),
m_xContext ).getPropertyValue( "Title" );
+ anyTitle = ::ucbhelper::Content( rPackageURL, rCmdEnv, m_xContext
).getPropertyValue( "Title" );
}
catch ( const uno::Exception & )
{
@@ -868,7 +868,7 @@ void ExtensionCmdQueue::Thread::_addExtension(
::rtl::Reference< ProgressCmdEnv
try
{
xExtMgr->addExtension(rPackageURL, uno::Sequence<beans::NamedValue>(),
- rRepository, xAbortChannel, rCmdEnv.get() );
+ rRepository, xAbortChannel, rCmdEnv );
}
catch ( const ucb::CommandFailedException & )
{
@@ -897,7 +897,7 @@ void ExtensionCmdQueue::Thread::_removeExtension(
::rtl::Reference< ProgressCmdE
OUString id( dp_misc::getIdentifier( xPackage ) );
try
{
- xExtMgr->removeExtension( id, xPackage->getName(),
xPackage->getRepositoryName(), xAbortChannel, rCmdEnv.get() );
+ xExtMgr->removeExtension( id, xPackage->getName(),
xPackage->getRepositoryName(), xAbortChannel, rCmdEnv );
}
catch ( const deployment::DeploymentException & )
{}
@@ -985,7 +985,7 @@ void ExtensionCmdQueue::Thread::_enableExtension(
::rtl::Reference< ProgressCmdE
try
{
- xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv.get() );
+ xExtMgr->enableExtension( xPackage, xAbortChannel, rCmdEnv );
if ( m_pDialogHelper )
m_pDialogHelper->updatePackageInfo( xPackage );
}
@@ -1009,7 +1009,7 @@ void ExtensionCmdQueue::Thread::_disableExtension(
::rtl::Reference< ProgressCmd
try
{
- xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv.get() );
+ xExtMgr->disableExtension( xPackage, xAbortChannel, rCmdEnv );
if ( m_pDialogHelper )
m_pDialogHelper->updatePackageInfo( xPackage );
}
@@ -1033,7 +1033,7 @@ void ExtensionCmdQueue::Thread::_acceptLicense(
::rtl::Reference< ProgressCmdEnv
try
{
- xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel,
rCmdEnv.get() );
+ xExtMgr->checkPrerequisitesAndEnable( xPackage, xAbortChannel, rCmdEnv
);
if ( m_pDialogHelper )
m_pDialogHelper->updatePackageInfo( xPackage );
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index ed6ed79fd256..980e086ebc69 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -230,7 +230,7 @@ ExtensionBox_Impl::~ExtensionBox_Impl()
for (auto const& entry : m_vEntries)
{
- entry->m_xPackage->removeEventListener( m_xRemoveListener.get() );
+ entry->m_xPackage->removeEventListener( m_xRemoveListener );
}
m_vEntries.clear();
@@ -884,7 +884,7 @@ void ExtensionBox_Impl::addEventListenerOnce(
if ( std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(),
FindWeakRef(extension)) )
{
- extension->addEventListener( m_xRemoveListener.get() );
+ extension->addEventListener( m_xRemoveListener );
m_vListenerAdded.emplace_back(extension);
}
}
@@ -996,7 +996,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference<
deployment::XPackage
// the entry will be moved into the m_vRemovedEntries list which
will be
// cleared on the next paint event
m_vRemovedEntries.push_back( *iIndex );
-
(*iIndex)->m_xPackage->removeEventListener(m_xRemoveListener.get());
+ (*iIndex)->m_xPackage->removeEventListener(m_xRemoveListener);
m_vEntries.erase( iIndex );
m_bNeedsRecalc = true;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 5983313de51b..bda1b1678190 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -305,7 +305,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
m_sDownloadFolder = destFolder;
try
{
- dp_misc::create_folder(nullptr, destFolder, m_updateCmdEnv.get() );
+ dp_misc::create_folder(nullptr, destFolder, m_updateCmdEnv );
} catch (const css::uno::Exception & e)
{
css::uno::Any anyEx = cppu::getCaughtException();
@@ -445,11 +445,11 @@ void UpdateInstallDialog::Thread::installExtensions()
if (!updateData.bIsShared)
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.sLocalURL,
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
- "user", xAbortChannel, m_updateCmdEnv.get());
+ "user", xAbortChannel, m_updateCmdEnv);
else
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.sLocalURL,
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
- "shared", xAbortChannel, m_updateCmdEnv.get());
+ "shared", xAbortChannel, m_updateCmdEnv);
}
else if (updateData.aUpdateSource.is())
{
@@ -462,11 +462,11 @@ void UpdateInstallDialog::Thread::installExtensions()
if (!updateData.bIsShared)
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.aUpdateSource->getURL(),
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
- "user", xAbortChannel, m_updateCmdEnv.get());
+ "user", xAbortChannel, m_updateCmdEnv);
else
xExtension = m_dialog.getExtensionManager()->addExtension(
updateData.aUpdateSource->getURL(),
css::uno::Sequence<css::beans::NamedValue>(&prop, 1),
- "shared", xAbortChannel, m_updateCmdEnv.get());
+ "shared", xAbortChannel, m_updateCmdEnv);
}
}
catch (css::deployment::DeploymentException & de)
@@ -554,10 +554,10 @@ bool UpdateInstallDialog::Thread::download(OUString const
& sDownloadURL, Update
destFolder = dp_misc::makeURL( m_sDownloadFolder, tempEntry ) + "_";
::ucbhelper::Content destFolderContent;
- dp_misc::create_folder( &destFolderContent, destFolder,
m_updateCmdEnv.get() );
+ dp_misc::create_folder( &destFolderContent, destFolder, m_updateCmdEnv );
::ucbhelper::Content sourceContent;
- (void)dp_misc::create_ucb_content(&sourceContent, sDownloadURL,
m_updateCmdEnv.get());
+ (void)dp_misc::create_ucb_content(&sourceContent, sDownloadURL,
m_updateCmdEnv);
const OUString sTitle( StrTitle::getTitle( sourceContent ) );
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index 0f20a9203ea6..20571efa8947 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -491,7 +491,7 @@ BackendImpl::PackageImpl::isRegistered_(
//would never be called for the items. But since the extension is removed
//and not registered anyway, this does not matter.
const Sequence< Reference<deployment::XPackage> > bundle(
- getBundle( abortChannel.get(), xCmdEnv ) );
+ getBundle( abortChannel, xCmdEnv ) );
bool reg = false;
bool present = false;
@@ -789,7 +789,7 @@ void BackendImpl::PackageImpl::processPackage_(
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
{
const Sequence< Reference<deployment::XPackage> > bundle(
- getBundle( abortChannel.get(), xCmdEnv ) );
+ getBundle( abortChannel, xCmdEnv ) );
if (doRegisterPackage)
{
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx
b/desktop/source/deployment/registry/script/dp_script.cxx
index fa0cc83d0618..c0adcf069484 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -116,7 +116,7 @@ BackendImpl::PackageImpl::PackageImpl(
Reference<XCommandEnvironment> const &xCmdEnv,
OUString const & scriptURL, OUString const & dialogURL, bool bRemoved,
OUString const & identifier)
- : Package( myBackend.get(), url,
+ : Package( myBackend, url,
OUString(), OUString(), // will be late-initialized
!scriptURL.isEmpty() ? myBackend->m_xBasicLibTypeInfo
: myBackend->m_xDialogLibTypeInfo, bRemoved, identifier),
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 4dcd55e02991..916a5882c519 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -136,7 +136,7 @@ BackendImpl::PackageImpl::PackageImpl(
::rtl::Reference<BackendImpl> const & myBackend,
OUString const & url, OUString const & libType, bool bRemoved,
OUString const & identifier)
- : Package( myBackend.get(), url, OUString(), OUString(),
+ : Package( myBackend, url, OUString(), OUString(),
myBackend->m_xTypeInfo, bRemoved, identifier),
m_descr(libType)
{
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b400c24ab55c..7d8785040964 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1909,7 +1909,7 @@ bool
CallbackFlushHandler::processWindowEvent(CallbackData& aCallbackData)
#ifndef IOS
auto xClip = forceSetClipboardForCurrentView(m_pDocument);
- uno::Reference<datatransfer::clipboard::XClipboard>
xClipboard(xClip.get());
+ uno::Reference<datatransfer::clipboard::XClipboard> xClipboard(xClip);
pWindow->SetClipboard(xClipboard);
#endif
}
@@ -2256,7 +2256,7 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
pLib->mInteractionMap.erase(aURL.toUtf8());
}
});
- uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction.get());
+ uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction);
aFilterOptions[1].Name = "InteractionHandler";
aFilterOptions[1].Value <<= xInteraction;
@@ -2621,7 +2621,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
// gImpl does not have to exist when running from a unit test
rtl::Reference<LOKInteractionHandler> const pInteraction(
new LOKInteractionHandler("saveas", gImpl, pDocument));
- uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction.get());
+ uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction);
aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER()]
<<= xInteraction;
}
@@ -3861,7 +3861,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument*
pThis, const char* pComma
rtl::Reference<LOKInteractionHandler> const pInteraction(
new LOKInteractionHandler("save", gImpl, pDocument));
- uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction.get());
+ uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction);
beans::PropertyValue aValue;
aValue.Name = "InteractionHandler";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
