connectivity/source/drivers/file/fanalyzer.cxx | 3 -
connectivity/source/drivers/file/fcomp.cxx | 2 -
connectivity/source/inc/file/fanalyzer.hxx | 3 -
editeng/source/misc/SvXMLAutoCorrectImport.cxx | 10 ++---
editeng/source/misc/SvXMLAutoCorrectImport.hxx | 6 +--
editeng/source/xml/xmltxtimp.cxx | 10 ++---
framework/source/accelerators/acceleratorconfiguration.cxx | 9 +----
framework/source/accelerators/presethandler.cxx | 4 +-
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 2 -
framework/source/inc/accelerators/presethandler.hxx | 4 +-
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 6 +--
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 18
+++++-----
svx/source/xml/xmlxtimp.cxx | 18
+++++-----
xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 5 --
xmlsecurity/inc/framework/signatureverifierimpl.hxx | 5 --
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 6 ---
xmlsecurity/source/framework/signatureverifierimpl.cxx | 6 ---
17 files changed, 42 insertions(+), 75 deletions(-)
New commits:
commit 18f80da7a689ab962735c0f657497b8f1ed4d606
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Jul 27 15:55:38 2017 +0200
loplugin:checkunusedparams more part2
Change-Id: Ibb940c2a7098313dfa282734894b1abc1ac40bc2
Reviewed-on: https://gerrit.libreoffice.org/40489
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx
b/connectivity/source/drivers/file/fanalyzer.cxx
index 4e7d5f16175d..2e457d5e222e 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -144,8 +144,7 @@ void OSQLAnalyzer::bindEvaluationRow(OValueRefRow const &
_pRow)
}
OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
- const Reference< XPropertySet>&
_xCol,
- const Reference< XNameAccess>&
/*_xIndexes*/)
+ const Reference< XPropertySet>&
_xCol)
{
return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
}
diff --git a/connectivity/source/drivers/file/fcomp.cxx
b/connectivity/source/drivers/file/fcomp.cxx
index 1853b8caeca7..d922a5293022 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -440,7 +440,7 @@ OOperand*
OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode)
{
if (m_orgColumns->getByName(aColumnName) >>= xCol)
{
- pOperand = OSQLAnalyzer::createOperandAttr(Reference<
XColumnLocate>(m_orgColumns,UNO_QUERY)->findColumn(aColumnName),xCol,m_xIndexes);
+ pOperand = OSQLAnalyzer::createOperandAttr(Reference<
XColumnLocate>(m_orgColumns,UNO_QUERY)->findColumn(aColumnName),xCol);
}
else
{// Column doesn't exist in the Result-set
diff --git a/connectivity/source/inc/file/fanalyzer.hxx
b/connectivity/source/inc/file/fanalyzer.hxx
index b5a7af7bafb6..e1202fa736e8 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -76,8 +76,7 @@ namespace connectivity
void setSelectionEvaluationResult(OValueRefRow const & _pRow,const
std::vector<sal_Int32>& _rColumnMapping);
void setOrigColumns(const css::uno::Reference<
css::container::XNameAccess>& rCols);
static OOperandAttr* createOperandAttr(sal_Int32 _nPos,
- const css::uno::Reference<
css::beans::XPropertySet>& _xCol,
- const css::uno::Reference<
css::container::XNameAccess>& _xIndexes);
+ const css::uno::Reference<
css::beans::XPropertySet>& _xCol);
};
}
}
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
index c5b47020a4fe..8dfa094c52d5 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx
@@ -43,14 +43,13 @@ SvXMLImportContext
*SvXMLAutoCorrectImport::CreateFastContext( sal_Int32 Element
const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
{
if( Element == SvXMLAutoCorrectToken::BLOCKLIST )
- return new SvXMLWordListContext( *this, xAttrList );
+ return new SvXMLWordListContext( *this );
else
return SvXMLImport::CreateFastContext( Element, xAttrList );
}
SvXMLWordListContext::SvXMLWordListContext(
- SvXMLAutoCorrectImport& rImport,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > &
/*xAttrList*/ ) :
+ SvXMLAutoCorrectImport& rImport ) :
SvXMLImportContext ( rImport ),
rLocalRef(rImport)
{
@@ -120,14 +119,13 @@ SvXMLImportContext
*SvXMLExceptionListImport::CreateFastContext(sal_Int32 Elemen
const uno::Reference< xml::sax::XFastAttributeList > & xAttrList )
{
if( Element == SvXMLAutoCorrectToken::BLOCKLIST )
- return new SvXMLExceptionListContext( *this, xAttrList );
+ return new SvXMLExceptionListContext( *this );
else
return SvXMLImport::CreateFastContext( Element, xAttrList );
}
SvXMLExceptionListContext::SvXMLExceptionListContext(
- SvXMLExceptionListImport& rImport,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & /*
xAttrList */ ) :
+ SvXMLExceptionListImport& rImport ) :
SvXMLImportContext ( rImport ),
rLocalRef(rImport)
{
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
index 4fe97f37de47..d27785bf9b43 100644
--- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx
@@ -52,8 +52,7 @@ class SvXMLWordListContext : public SvXMLImportContext
private:
SvXMLAutoCorrectImport & rLocalRef;
public:
- SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList );
+ SvXMLWordListContext ( SvXMLAutoCorrectImport& rImport );
virtual css::uno::Reference<XFastContextHandler> SAL_CALL
createFastChildContext( sal_Int32 Element,
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
@@ -96,8 +95,7 @@ class SvXMLExceptionListContext : public SvXMLImportContext
private:
SvXMLExceptionListImport & rLocalRef;
public:
- SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList );
+ SvXMLExceptionListContext ( SvXMLExceptionListImport& rImport );
virtual css::uno::Reference<XFastContextHandler> SAL_CALL
createFastChildContext( sal_Int32 Element,
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 3a97f9e52b25..c44cc8ad0994 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -58,7 +58,7 @@ using namespace xmloff::token;
class SvxXMLTextImportContext : public SvXMLImportContext
{
public:
- SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const
OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const
uno::Reference< XText >& xText );
+ SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const
OUString& rLName, const uno::Reference< XText >& xText );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const
OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
override;
@@ -69,7 +69,7 @@ private:
};
-SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList
>&, const uno::Reference< XText >& xText )
+SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XText >& xText )
: SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
{
}
@@ -79,7 +79,7 @@ SvXMLImportContext
*SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPre
SvXMLImportContext* pContext = nullptr;
if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
{
- pContext = new SvxXMLTextImportContext( GetImport(), nPrefix,
rLocalName, xAttrList, mxText );
+ pContext = new SvxXMLTextImportContext( GetImport(), nPrefix,
rLocalName, mxText );
}
else if( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName,
XML_AUTOMATIC_STYLES ) )
{
@@ -113,13 +113,13 @@ private:
const uno::Reference< XText > mxText;
};
-SvXMLImportContext *SvxXMLXTextImportComponent::CreateContext( sal_uInt16
nPrefix, const OUString& rLocalName, const uno::Reference<
xml::sax::XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLXTextImportComponent::CreateContext( sal_uInt16
nPrefix, const OUString& rLocalName, const uno::Reference<
xml::sax::XAttributeList >& /*xAttrList*/ )
{
SvXMLImportContext* pContext = nullptr;
if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName,
XML_DOCUMENT_CONTENT ) )
{
- pContext = new SvxXMLTextImportContext( *this, nPrefix, rLocalName,
xAttrList, mxText );
+ pContext = new SvxXMLTextImportContext( *this, nPrefix, rLocalName,
mxText );
}
if( nullptr == pContext )
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 2f257eb11926..ecc33938ab75 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -799,19 +799,16 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
SolarMutexGuard g;
bool bPreferred;
- css::uno::Reference< css::container::XNameAccess > xAccess;
bPreferred = true;
// on-demand creation of the primary write cache
impl_getCFG(bPreferred, true);
- m_xCfg->getByName(CFG_ENTRY_PRIMARY) >>= xAccess;
- impl_ts_save(bPreferred, xAccess);
+ impl_ts_save(bPreferred);
bPreferred = false;
// on-demand creation of the secondary write cache
impl_getCFG(bPreferred, true);
- m_xCfg->getByName(CFG_ENTRY_SECONDARY) >>= xAccess;
- impl_ts_save(bPreferred, xAccess);
+ impl_ts_save(bPreferred);
}
void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const
css::uno::Reference< css::embed::XStorage >& xStorage)
@@ -1097,7 +1094,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( bool
bPreferred, const css:
m_aSecondaryReadCache.takeOver(aReadCache);
}
-void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred, const
css::uno::Reference< css::container::XNameAccess >& /*xCfg*/)
+void XCUBasedAcceleratorConfiguration::impl_ts_save(bool bPreferred)
{
if (bPreferred)
{
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index 22519dff34f8..65af45a5c3e0 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -297,7 +297,7 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getWorkingStorageUser
return m_xWorkingStorageUser;
}
-css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageShare(const css::uno::Reference<
css::embed::XStorage >& /*xChild*/)
+css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageShare()
{
css::uno::Reference< css::embed::XStorage > xWorking;
{
@@ -308,7 +308,7 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageShare
return SharedStorages::get().m_lStoragesShare.getParentStorage(xWorking);
}
-css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageUser(const css::uno::Reference<
css::embed::XStorage >& /*xChild*/)
+css::uno::Reference< css::embed::XStorage >
PresetHandler::getParentStorageUser()
{
css::uno::Reference< css::embed::XStorage > xWorking;
{
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index bb2fd77d927e..09b717f6d383 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -303,7 +303,7 @@ class XCUBasedAcceleratorConfiguration : public
::cppu::WeakImplHelper<
private:
void impl_ts_load(bool bPreferred, const css::uno::Reference<
css::container::XNameAccess >& xCfg);
- void impl_ts_save(bool bPreferred, const css::uno::Reference<
css::container::XNameAccess >& xCfg);
+ void impl_ts_save(bool bPreferred);
void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand, const bool bPreferred);
void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent,
const bool bPreferred);
diff --git a/framework/source/inc/accelerators/presethandler.hxx
b/framework/source/inc/accelerators/presethandler.hxx
index 1fe4d407a78b..da2d6b5b3736 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -202,8 +202,8 @@ class PresetHandler
@return css::embed::XStorage
A valid storage if a paranet exists. NULL otherwise.
*/
- css::uno::Reference< css::embed::XStorage >
getParentStorageShare(const css::uno::Reference< css::embed::XStorage >&
xChild);
- css::uno::Reference< css::embed::XStorage > getParentStorageUser
(const css::uno::Reference< css::embed::XStorage >& xChild);
+ css::uno::Reference< css::embed::XStorage > getParentStorageShare();
+ css::uno::Reference< css::embed::XStorage > getParentStorageUser ();
/** @short free all internal structures and let this handler
work on a new type of configuration sets.
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 00c66f75be67..8b1e0bdc9a94 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -898,10 +898,8 @@ ModuleUIConfigurationManager::ModuleUIConfigurationManager(
// initialize root storages for all resource types
m_xUserRootCommit.set(
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getOrCreateRootStorageUser(),
css::uno::UNO_QUERY); // can be empty
- m_xDefaultConfigStorage =
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageShare(
-
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageShare());
- m_xUserConfigStorage =
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageUser(
-
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getWorkingStorageUser());
+ m_xDefaultConfigStorage =
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageShare();
+ m_xUserConfigStorage =
m_pStorageHandler[css::ui::UIElementType::MENUBAR]->getParentStorageUser();
if ( m_xUserConfigStorage.is() )
{
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index a5e1fe1b9e1c..40b53da62354 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -301,7 +301,7 @@ public:
static SearchToolbarControllersManager& createControllersManager();
void registryController( const css::uno::Reference< css::frame::XFrame >&
xFrame, const css::uno::Reference< css::frame::XStatusListener >&
xStatusListener, const OUString& sCommandURL );
- void freeController ( const css::uno::Reference< css::frame::XFrame >&
xFrame, const css::uno::Reference< css::frame::XStatusListener >&
xStatusListener, const OUString& sCommandURL );
+ void freeController ( const css::uno::Reference< css::frame::XFrame >&
xFrame, const OUString& sCommandURL );
css::uno::Reference< css::frame::XStatusListener > findController( const
css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL
);
void saveSearchHistory(const FindTextFieldControl*
m_pFindTextFieldControl);
@@ -377,7 +377,7 @@ void SearchToolbarControllersManager::registryController(
const css::uno::Refere
}
}
-void SearchToolbarControllersManager::freeController( const
css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference<
css::frame::XStatusListener >& /*xStatusListener*/, const OUString& sCommandURL
)
+void SearchToolbarControllersManager::freeController( const
css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& sCommandURL )
{
SearchToolbarControllersMap::iterator pIt =
aSearchToolbarControllersMap.find(xFrame);
if (pIt != aSearchToolbarControllersMap.end())
@@ -507,7 +507,7 @@ void SAL_CALL FindTextToolbarController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
if (m_pFindTextFieldControl != nullptr) {
@@ -679,7 +679,7 @@ void SAL_CALL UpDownSearchToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
}
@@ -795,7 +795,7 @@ void SAL_CALL MatchCaseToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
@@ -914,7 +914,7 @@ void SAL_CALL SearchFormattedToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
@@ -1030,7 +1030,7 @@ void SAL_CALL FindAllToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
}
@@ -1137,7 +1137,7 @@ void SAL_CALL ExitSearchToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
}
@@ -1255,7 +1255,7 @@ void SAL_CALL SearchLabelToolboxController::dispose()
{
SolarMutexGuard aSolarMutexGuard;
-
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
css::uno::Reference< css::frame::XStatusListener >(static_cast<
::cppu::OWeakObject* >(this), css::uno::UNO_QUERY), m_aCommandURL);
+
SearchToolbarControllersManager::createControllersManager().freeController(m_xFrame,
m_aCommandURL);
svt::ToolboxController::dispose();
}
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 22b5df8e5baa..9e62941dcb31 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -71,7 +71,7 @@ enum class SvxXMLTableImportContextEnum { Color, Marker,
Dash, Hatch, Gradient,
class SvxXMLTableImportContext : public SvXMLImportContext
{
public:
- SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const
OUString& rLName, const uno::Reference< XAttributeList >& xAttrList,
SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >&
xTable,
+ SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const
OUString& rLName, SvxXMLTableImportContextEnum eContext, const uno::Reference<
XNameContainer >& xTable,
bool bOOoFormat );
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const
OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
override;
@@ -91,7 +91,7 @@ private:
};
-SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList
>&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer
>& xTable, bool bOOoFormat )
+SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName, SvxXMLTableImportContextEnum
eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat )
: SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext(
eContext ),
mbOOoFormat( bOOoFormat )
{
@@ -417,7 +417,7 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const
OUString &rReferer,
return bRet;
}
-SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContext *SvxXMLXTableImport::CreateContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const uno::Reference< XAttributeList >&
/*xAttrList*/ )
{
if( XML_NAMESPACE_OOO == nPrefix ||
XML_NAMESPACE_OFFICE == nPrefix )
@@ -428,32 +428,32 @@ SvXMLImportContext *SvxXMLXTableImport::CreateContext(
sal_uInt16 nPrefix, const
if ( rLocalName == "color-table" )
{
if( aType == ::cppu::UnoType<sal_Int32>::get() )
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Color, mrTable, bOOoFormat
);
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Color, mrTable, bOOoFormat );
}
else if ( rLocalName == "marker-table" )
{
if( aType ==
cppu::UnoType<drawing::PolyPolygonBezierCoords>::get())
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Marker, mrTable,
bOOoFormat );
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Marker, mrTable, bOOoFormat );
}
else if ( rLocalName == "dash-table" )
{
if( aType == cppu::UnoType<drawing::LineDash>::get())
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Dash, mrTable, bOOoFormat
);
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Dash, mrTable, bOOoFormat );
}
else if ( rLocalName == "hatch-table" )
{
if( aType == cppu::UnoType<drawing::Hatch>::get())
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Hatch, mrTable, bOOoFormat
);
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Hatch, mrTable, bOOoFormat );
}
else if ( rLocalName == "gradient-table" )
{
if( aType == cppu::UnoType<awt::Gradient>::get())
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Gradient, mrTable,
bOOoFormat );
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Gradient, mrTable, bOOoFormat );
}
else if ( rLocalName == "bitmap-table" )
{
if( aType == ::cppu::UnoType<OUString>::get())
- return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, xAttrList, SvxXMLTableImportContextEnum::Bitmap, mrTable,
bOOoFormat );
+ return new SvxXMLTableImportContext( *this, nPrefix,
rLocalName, SvxXMLTableImportContextEnum::Bitmap, mrTable, bOOoFormat );
}
}
diff --git a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
index 683d2d2a676d..d893ad9546a7 100644
--- a/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
+++ b/xmlsecurity/inc/framework/signaturecreatorimpl.hxx
@@ -94,11 +94,6 @@ OUString SignatureCreatorImpl_getImplementationName();
/// @throws css::uno::RuntimeException
css::uno::Sequence< OUString > SAL_CALL
SignatureCreatorImpl_getSupportedServiceNames( );
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL SignatureCreatorImpl_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
-
#endif
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index 592e4740c714..e9e3d050136b 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -87,11 +87,6 @@ OUString SignatureVerifierImpl_getImplementationName();
/// @throws css::uno::RuntimeException
css::uno::Sequence< OUString > SAL_CALL
SignatureVerifierImpl_getSupportedServiceNames( );
-/// @throws css::uno::Exception
-css::uno::Reference< css::uno::XInterface >
-SAL_CALL SignatureVerifierImpl_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr);
-
#endif
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index d938601afed7..b94a97583018 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -191,12 +191,6 @@ cssu::Sequence< OUString > SAL_CALL
SignatureCreatorImpl_getSupportedServiceName
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL
SignatureCreatorImpl_createInstance(
- const cssu::Reference< cssl::XMultiServiceFactory >& /*xMSF*/ )
-{
- return static_cast<cppu::OWeakObject*>(new SignatureCreatorImpl);
-}
-
/* XServiceInfo */
OUString SAL_CALL SignatureCreatorImpl::getImplementationName( )
{
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx
b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 0ae3b619ddcc..b02a78ee9d74 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -145,12 +145,6 @@ cssu::Sequence< OUString > SAL_CALL
SignatureVerifierImpl_getSupportedServiceNam
return aRet;
}
-cssu::Reference< cssu::XInterface > SAL_CALL
SignatureVerifierImpl_createInstance(
- const cssu::Reference< cssl::XMultiServiceFactory >& /*rSMgr*/)
-{
- return static_cast<cppu::OWeakObject*>(new SignatureVerifierImpl);
-}
-
/* XServiceInfo */
OUString SAL_CALL SignatureVerifierImpl::getImplementationName( )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
