[Libreoffice-commits] core.git: basctl/source chart2/source connectivity/source dbaccess/source desktop/source extensions/source filter/source reportdesign/source sc/source sdext/source sd/source svl/source svx/source sw/source writerfilter/source xmlsecurity/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jan 28 06:20:44 UTC 2020
basctl/source/basicide/moduldl2.cxx | 4 ++--
chart2/source/controller/main/ChartController_Insert.cxx | 2 +-
chart2/source/view/main/VLegendSymbolFactory.cxx | 3 +--
connectivity/source/commontools/dbtools.cxx | 2 +-
connectivity/source/commontools/predicateinput.cxx | 2 +-
dbaccess/source/core/dataaccess/datasource.cxx | 2 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx | 3 +--
extensions/source/bibliography/bibload.cxx | 3 +--
extensions/source/dbpilots/controlwizard.cxx | 2 +-
extensions/source/propctrlr/eventhandler.cxx | 2 +-
extensions/source/propctrlr/genericpropertyhandler.cxx | 2 +-
filter/source/config/cache/typedetection.cxx | 2 +-
reportdesign/source/ui/report/propbrw.cxx | 2 +-
sc/source/ui/dataprovider/csvdataprovider.cxx | 2 +-
sc/source/ui/dataprovider/htmldataprovider.cxx | 2 +-
sc/source/ui/vba/vbacomment.cxx | 2 +-
sd/source/ui/framework/factories/BasicViewFactory.cxx | 2 +-
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 3 +--
sd/source/ui/view/ViewShellBase.cxx | 2 +-
sdext/source/minimizer/optimizerdialogcontrols.cxx | 4 ++--
sdext/source/presenter/PresenterController.cxx | 3 +--
svl/source/crypto/cryptosign.cxx | 5 ++---
svx/source/form/fmPropBrw.cxx | 2 +-
svx/source/svdraw/textchainflow.cxx | 2 +-
sw/source/uibase/uno/unomailmerge.cxx | 4 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 +--
xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx | 2 +-
27 files changed, 31 insertions(+), 38 deletions(-)
New commits:
commit 65f007c629e5a7b2710e21e3f26164b433576e27
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Jan 26 13:26:35 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Jan 28 07:19:46 2020 +0100
remove some unused local vars
found by my new aggressive unused var plugin. these are unused return
values from function calls
Change-Id: I3359c583f535828f192cb833762dfedc008d82f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87439
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index c0ab18750539..ae7f57786614 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1320,8 +1320,8 @@ void createLibImpl(weld::Window* pWin, const ScriptDocument& rDocument,
try
{
// create module and dialog library
- Reference< container::XNameContainer > xModLib( rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName ) );
- Reference< container::XNameContainer > xDlgLib( rDocument.getOrCreateLibrary( E_DIALOGS, aLibName ) );
+ rDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
+ rDocument.getOrCreateLibrary( E_DIALOGS, aLibName );
if( pLibBox )
{
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index a8212bf99b27..1e4212a428cc 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -207,7 +207,7 @@ void ChartController::executeDispatch_InsertLegend()
m_xUndoManager );
ChartModel& rModel = dynamic_cast<ChartModel&>(*getModel());
- Reference< chart2::XLegend > xLegend = LegendHelper::showLegend(rModel, m_xCC);
+ LegendHelper::showLegend(rModel, m_xCC);
aUndoGuard.commit();
}
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 88e21eb95d28..1ccc0de34324 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -112,8 +112,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
return xResult;
// add an invisible square box to maintain aspect ratio
- Reference< drawing::XShape > xBound( pShapeFactory->createInvisibleRectangle(
- xResultGroup, rEntryKeyAspectRatio ));
+ pShapeFactory->createInvisibleRectangle( xResultGroup, rEntryKeyAspectRatio );
// create symbol
try
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 48384ef5e565..629c5cd074e2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -452,7 +452,7 @@ static SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet,
{
if ( _bAttachAutoDisposer )
{
- rtl::Reference<OAutoConnectionDisposer> pAutoDispose = new OAutoConnectionDisposer( _rxRowSet, xConnection );
+ new OAutoConnectionDisposer( _rxRowSet, xConnection );
}
else
xRowSetProps->setPropertyValue(
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index bfe19152f281..0b229aa9ec5a 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -302,7 +302,7 @@ namespace dbtools
{
// first try the international version
OUString sSql = "SELECT * FROM x WHERE " + sField + _rPredicateValue;
- std::unique_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true ) );
+ const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, true );
nType = DataType::DOUBLE;
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index a605b2e0c907..a9944bd6dac0 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -119,7 +119,7 @@ private:
public:
static void installAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener )
{
- Reference< XFlushListener > xAdapter( new FlushNotificationAdapter( _rxBroadcaster, _rxListener ) );
+ new FlushNotificationAdapter( _rxBroadcaster, _rxListener );
}
protected:
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 93e049b3308e..a82060d2c39d 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -861,8 +861,7 @@ void ExtensionManager::removeExtension(
new TmpRepositoryCommandEnv(xCmdEnv->getInteractionHandler()));
if (xExtensionBackup.is())
{
- Reference<css::deployment::XPackage> xRestored =
- xPackageManager->importExtension(
+ xPackageManager->importExtension(
xExtensionBackup, Reference<task::XAbortChannel>(),
tmpCmdEnv);
activateExtension(
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 95dc8bc962ba..6098e693c0c1 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -262,7 +262,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame,
aBibDesc.sDataSource = aSources.getConstArray()[0];
}
- Reference< XForm > xForm = m_xDatMan->createDatabaseForm( aBibDesc );
+ m_xDatMan->createDatabaseForm( aBibDesc );
Reference< awt::XWindow > aWindow = rFrame->getContainerWindow();
VCLXWindow* pParentComponent = comphelper::getUnoTunnelImplementation<VCLXWindow>(aWindow);
@@ -561,7 +561,6 @@ Type BibliographyLoader::getElementType()
sal_Bool BibliographyLoader::hasElements()
{
- Reference< XResultSet > xCursor = GetDataCursor();
Reference< XNameAccess > xColumns = GetDataColumns();
return xColumns.is() && xColumns->getElementNames().hasElements();
}
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 045f2924c8f7..aae97ab5a8d7 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -408,7 +408,7 @@ namespace dbp
{
// for this, use an AutoDisposer (so the conn is cleaned up when the form dies or gets another connection)
Reference< XRowSet > xFormRowSet( m_aContext.xForm, UNO_QUERY );
- rtl::Reference<OAutoConnectionDisposer> pAutoDispose = new OAutoConnectionDisposer( xFormRowSet, _rxConn );
+ new OAutoConnectionDisposer( xFormRowSet, _rxConn );
}
else
{
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index c25dffa415a3..a62487ecff4c 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -762,7 +762,7 @@ namespace pcr
LineDescriptor aDescriptor;
aDescriptor.Control = _rxControlFactory->createPropertyControl( PropertyControlType::TextField, true );
- Reference< XEventListener > xControlExtender = new PropertyControlExtender( aDescriptor.Control );
+ new PropertyControlExtender( aDescriptor.Control );
const EventDescription& rEvent = impl_getEventForName_throw( _rPropertyName );
aDescriptor.DisplayName = rEvent.sDisplayName;
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 2b04b7567bd2..7768a74caa69 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -584,7 +584,7 @@ namespace pcr
PropertyControlType::HyperlinkField, PropertyHandlerHelper::requiresReadOnlyControl( pos->second.Attributes ) );
Reference< XHyperlinkControl > xControl( aDescriptor.Control, UNO_QUERY_THROW );
- Reference< XActionListener > xEnsureDelete( new UrlClickHandler( m_xContext, xControl ) );
+ new UrlClickHandler( m_xContext, xControl );
}
}
break;
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0ae899b47990..38e010dc47d9 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -552,7 +552,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
CacheItem aType = cache.getItem(FilterCache::E_TYPE, sType);
aType[PROPNAME_PREFERREDFILTER] >>= sFilter;
- CacheItem aFilter = cache.getItem(FilterCache::E_FILTER, sFilter);
+ cache.getItem(FilterCache::E_FILTER, sFilter);
aLock.clear();
// <- SAFE
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 6ab6f3c22bdd..a99b87b9d019 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -151,7 +151,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare
{
uno::Reference< inspection::XObjectInspector > xInspector( m_xBrowserController, uno::UNO_SET_THROW );
uno::Reference< inspection::XObjectInspectorUI > xInspectorUI( xInspector->getInspectorUI() );
- uno::Reference< uno::XInterface > xDefaultHelpProvider( inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
+ inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI );
}
}
}
diff --git a/sc/source/ui/dataprovider/csvdataprovider.cxx b/sc/source/ui/dataprovider/csvdataprovider.cxx
index 8e619e63f771..e868e2269358 100644
--- a/sc/source/ui/dataprovider/csvdataprovider.cxx
+++ b/sc/source/ui/dataprovider/csvdataprovider.cxx
@@ -102,7 +102,7 @@ void CSVFetchThread::EndThread()
void CSVFetchThread::execute()
{
OStringBuffer aBuffer(64000);
- std::unique_ptr<SvStream> pStream = DataProvider::FetchStreamFromURL(maURL, aBuffer);
+ DataProvider::FetchStreamFromURL(maURL, aBuffer);
if (mbTerminate)
return;
diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx b/sc/source/ui/dataprovider/htmldataprovider.cxx
index b8b7b3746d2c..39a30c8754b9 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.cxx
@@ -182,7 +182,7 @@ void HTMLFetchThread::handleTable(xmlNodePtr pTable)
void HTMLFetchThread::execute()
{
OStringBuffer aBuffer(64000);
- std::unique_ptr<SvStream> pStream = DataProvider::FetchStreamFromURL(maURL, aBuffer);
+ DataProvider::FetchStreamFromURL(maURL, aBuffer);
if (aBuffer.isEmpty())
return;
diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx
index d78863cd1f78..1552fadb240e 100644
--- a/sc/source/ui/vba/vbacomment.cxx
+++ b/sc/source/ui/vba/vbacomment.cxx
@@ -51,7 +51,7 @@ ScVbaComment::ScVbaComment(
{
if ( !xRange.is() )
throw lang::IllegalArgumentException("range is not set ", uno::Reference< uno::XInterface >() , 1 );
- uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY );
+ getAnnotation();
}
// private helper functions
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index c4260ce8fc6b..83601e413e2b 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -438,7 +438,7 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes
static ::std::vector<Reference<XResourceId> > s_aCacheableResources = [&]()
{
::std::vector<Reference<XResourceId> > tmp;
- std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*mpBase));
+ FrameworkHelper::Instance(*mpBase);
// The slide sorter and the task panel are cacheable and relocatable.
tmp.push_back(FrameworkHelper::CreateResourceId(
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 19ac5f42b231..19750734056e 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -224,8 +224,7 @@ void SlideSorterView::PostModelChange()
// create new ones.
::osl::MutexGuard aGuard (mrModel.GetMutex());
- model::PageEnumeration aPageEnumeration (
- model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel));
+ model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel);
// The new page objects have to be scaled and positioned.
RequestRearrange();
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index b1650903d7d7..57b18bb945e4 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -317,7 +317,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
if (sView.isEmpty())
sView = GetInitialViewShellType();
- std::shared_ptr<FrameworkHelper> pHelper (FrameworkHelper::Instance(*this));
+ FrameworkHelper::Instance(*this);
// Create the resource ids for the center pane and view.
const Reference<drawing::framework::XResourceId> xCenterPaneId (
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index ef193b85a4a5..75dff5fb6e02 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -844,8 +844,8 @@ void OptimizerDialog::InitPage4()
Sequence< OUString > aNames( pNames, nCount );
Sequence< Any > aValues( pValues, nCount );
- Reference< XMultiPropertySet > xMultiPropertySet( insertControlModel( "com.sun.star.awt.UnoControlProgressBarModel",
- "Progress", aNames, aValues ), UNO_QUERY );
+ insertControlModel( "com.sun.star.awt.UnoControlProgressBarModel",
+ "Progress", aNames, aValues );
}
Reference< XTextListener > xTextListener;
Sequence< OUString > aItemList;
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index d2aad85c86cf..7012e0ae177a 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -733,8 +733,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
Reference<XPane> xPane (rEvent.ResourceObject,UNO_QUERY);
if (xPane.is())
{
- PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
- mpPaneContainer->FindPaneId(xPane->getResourceId()));
+ mpPaneContainer->FindPaneId(xPane->getResourceId());
}
}
else if (rEvent.ResourceId->isBoundTo(mxMainPaneId,AnchorBindingMode_INDIRECT))
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 0d5fca9b630c..34de60c3572c 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -1966,9 +1966,8 @@ namespace
xNSSInitializer = css::xml::crypto::NSSInitializer::create(comphelper::getProcessComponentContext());
// this calls NSS_Init
- css::uno::Reference<css::xml::crypto::XDigestContext> xDigestContext(
- xNSSInitializer->getDigestContext(css::xml::crypto::DigestID::SHA256,
- uno::Sequence<beans::NamedValue>()));
+ xNSSInitializer->getDigestContext(css::xml::crypto::DigestID::SHA256,
+ uno::Sequence<beans::NamedValue>());
}
}
#endif
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 60bcbd7676eb..33df59f4373f 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -494,7 +494,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
{
Reference< XObjectInspector > xInspector( m_xBrowserController, UNO_QUERY_THROW );
Reference< XObjectInspectorUI > xInspectorUI( xInspector->getInspectorUI() );
- Reference< XInterface > xDefaultHelpProvider( DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
+ DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI );
}
}
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 3ca13ce06b6c..316091cd5776 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -271,7 +271,7 @@ void EditingTextChainFlow::CheckForFlowEvents(SdrOutliner *pFlowOutl)
void EditingTextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl)
{
- std::unique_ptr<OutlinerParaObject> pNewText = mpOverflChText->RemoveOverflowingText(pNonOverflOutl);
+ mpOverflChText->RemoveOverflowingText(pNonOverflOutl);
//impSetTextForEditingOutliner(pNewText); //XXX: Don't call it since we do everything with NonOverflowingText::ToParaObject // XXX: You may need this for Underflow
// XXX: I'm not sure whether we need this (after all operations such as Paste don't change this - as far as I understand)
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index c393736f94c7..42971d327252 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -335,7 +335,7 @@ static bool DeleteTmpFile_Impl(
{
// somebody vetoed the closing, and took the ownership of the document
// -> ensure that the temporary file is deleted later on
- Reference< XEventListener > xEnsureDelete( new DelayedFileDeletion( rxModel, rTmpFileURL ) );
+ new DelayedFileDeletion( rxModel, rTmpFileURL );
// note: as soon as #106931# is fixed, the whole DelayedFileDeletion is to be superseded by
// a better solution
bDelete = false;
@@ -348,7 +348,7 @@ static bool DeleteTmpFile_Impl(
{
if ( !SWUnoHelper::UCB_DeleteFile( rTmpFileURL ) )
{
- Reference< XEventListener > xEnsureDelete( new DelayedFileDeletion( rxModel, rTmpFileURL ) );
+ new DelayedFileDeletion( rxModel, rTmpFileURL );
// same not as above: as soon as #106931#, ...
}
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1ae5c4998bed..24f769338c94 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4373,7 +4373,7 @@ void DomainMapper_Impl::handleToc
// create header of the TOC with the TOC title inside
const OUString aObjectType("com.sun.star.text.IndexHeaderSection");
- uno::Reference<beans::XPropertySet> xIfc = createSectionForRange(m_xSdtEntryStart, xTextRangeEndOfTocHeader, aObjectType, true);
+ createSectionForRange(m_xSdtEntryStart, xTextRangeEndOfTocHeader, aObjectType, true);
}
}
@@ -5621,7 +5621,6 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
else
{
uno::Reference< beans::XPropertySet > xFieldProperties( xTextField, uno::UNO_QUERY_THROW);
- uno::Reference<lang::XServiceInfo> xServiceInfo(xTextField, uno::UNO_QUERY);
OUString sContent;
bool bCanHaveContent = false;
try
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 62c188eff244..f11a3680f2ea 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -418,7 +418,7 @@ SAL_CALL XMLSignature_GpgImpl::validate(
reinterpret_cast<char*>(pKeyPacket),
nKeyLen, false);
- GpgME::ImportResult import_res=rCtx.importKeys(data_key);
+ rCtx.importKeys(data_key);
xmlFree(pKeyPacket);
// and re-run (rewind text and signature streams to position 0)
More information about the Libreoffice-commits
mailing list