summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-07-02 22:28:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-02 22:28:33 +0200
commit25f90ea26caaccda60cc25a62b20c5645772df5e (patch)
tree7bd19d2dbfd8fd1d89bf766ea16eed1bc930dc49 /svx
parent798e8c5eec97e67dd6bdf0f370073914b709045e (diff)
loplugin:casttovoid: svx
Change-Id: I7915d8f069dc0602512d7ab1084c5d7d3b30ee90
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx6
-rw-r--r--svx/source/accessibility/ShapeTypeHandler.cxx5
-rw-r--r--svx/source/fmcomp/fmgridif.cxx6
-rw-r--r--svx/source/fmcomp/gridcell.cxx8
-rw-r--r--svx/source/form/datanavi.cxx3
-rw-r--r--svx/source/form/fmpgeimp.cxx3
-rw-r--r--svx/source/form/fmsrcimp.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx5
-rw-r--r--svx/source/form/formcontroller.cxx1
-rw-r--r--svx/source/form/formfeaturedispatcher.cxx3
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgraphic.cxx2
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx4
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx9
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/svdraw/svdmrkv.cxx8
-rw-r--r--svx/source/svdraw/svdundo.cxx1
-rw-r--r--svx/source/table/tablelayouter.cxx6
-rw-r--r--svx/source/table/tablemodel.cxx6
-rw-r--r--svx/source/table/tablertfexporter.cxx6
-rw-r--r--svx/source/table/tablertfimporter.cxx3
-rw-r--r--svx/source/unodraw/unoshape.cxx20
-rw-r--r--svx/source/xml/xmleohlp.cxx4
-rw-r--r--svx/source/xml/xmlxtimp.cxx54
23 files changed, 44 insertions, 125 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index d8d2e43773d9..c4c81118babf 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -503,9 +503,8 @@ bool AccessibleControlShape::ensureListeningState(
else
OSL_FAIL( "AccessibleControlShape::ensureListeningState: this property does not exist at this model!" );
}
- catch( const Exception& e )
+ catch( const Exception& )
{
- (void)e; // make compiler happy
OSL_FAIL( "AccessibleControlShape::ensureListeningState: could not change the listening state!" );
}
@@ -694,9 +693,8 @@ bool AccessibleControlShape::ensureControlModelAccess()
if ( m_xControlModel.is() )
m_xModelPropsMeta = m_xControlModel->getPropertySetInfo();
}
- catch( const Exception& e )
+ catch( const Exception& )
{
- (void)e; // make compiler happy
OSL_FAIL( "AccessibleControlShape::ensureControlModelAccess: caught an exception!" );
}
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index a0cd0ce5c73f..4f7f17549d5b 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -159,11 +159,6 @@ void ShapeTypeHandler::AddShapeTypeList (int nDescriptorCount,
for (int i=0; i<nDescriptorCount; i++)
{
- #if OSL_DEBUG_LEVEL > 0
- ShapeTypeId nId (aDescriptorList[i].mnShapeTypeId);
- (void)nId;
- #endif
-
// Fill Type descriptor.
maShapeTypeDescriptorList[nFirstId+i].mnShapeTypeId = aDescriptorList[i].mnShapeTypeId;
maShapeTypeDescriptorList[nFirstId+i].msServiceName = aDescriptorList[i].msServiceName;
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 21f1043dfcb2..6b61ab0acd5b 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -572,10 +572,9 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
{
aOldCursorBookmark = Reference< css::sdbcx::XRowLocate > (xForm, UNO_QUERY)->getBookmark();
}
- catch( const Exception& e )
+ catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- (void)e;
}
}
}
@@ -595,10 +594,9 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >&
xLocate->moveToBookmark(aOldCursorBookmark);
}
}
- catch( const Exception& e )
+ catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
- (void)e;
}
Reference< css::awt::XView > xPeerView(getPeer(), UNO_QUERY);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index f5489e3dda16..2a58190fda9c 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -588,7 +588,6 @@ void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, bool
DBG_ASSERT( !_bWarnIfNotExistent || ( xPSI.is() && xPSI->hasPropertyByName( _rPropertyName ) ),
"DbCellControl::doPropertyListening: no property set info or non-existent property!" );
- (void)_bWarnIfNotExistent;
if ( xPSI.is() && xPSI->hasPropertyByName( _rPropertyName ) )
m_pModelChangeBroadcaster->addProperty( _rPropertyName );
@@ -2835,7 +2834,6 @@ CellControllerRef DbFilterField::CreateController() const
void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
{
OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" );
- (void)_rxModel;
OSL_FAIL( "DbListBox::updateFromModel: not implemented yet (how the hell did you reach this?)!" );
// TODO: implement this.
@@ -3353,17 +3351,15 @@ void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMou
}
-void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener )
+void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& )
{
OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" );
- (void)_rxListener;
}
-void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener )
+void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& )
{
OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" );
- (void)_rxListener;
}
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a57a9164f823..1c2ece9f4891 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1225,9 +1225,6 @@ namespace svxform
if ( xTarget.is() )
m_pNaviWin->AddEventBroadcaster( xTarget );
- #if OSL_DEBUG_LEVEL > 0
- css::xml::dom::NodeType eNodeType = xRoot->getNodeType(); (void)eNodeType;
- #endif
OUString sNodeName =
m_xUIHelper->getNodeDisplayName( xRoot, m_pNaviWin->IsShowDetails() );
if ( sNodeName.isEmpty() )
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index e4eb82b6531a..3da638ebcc24 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -580,9 +580,8 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
}
}
}
- catch(const Exception& e)
+ catch(const Exception&)
{
- (void)e;
OSL_FAIL("FmFormPageImpl::findFormForDataSource: caught an exception!");
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 765475c758cc..a07db3c07ab9 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -211,13 +211,11 @@ bool FmSearchEngine::MoveCursor()
}
catch(css::sdbc::SQLException const& e)
{
- (void)e;
SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught a DatabaseException: " << e.SQLState );
bSuccess = false;
}
catch(Exception const& e)
{
- (void)e;
SAL_WARN( "svx", "FmSearchEngine::MoveCursor: caught an Exception: " << e.Message);
bSuccess = false;
}
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index a4315cd23e7b..9d742c2f600b 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -238,7 +238,6 @@ namespace svx
void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source )
{
- (void)Source;
DBG_ASSERT( Source.Source == m_xWindow, "FmFocusListenerAdapter::disposing: where did this come from?" );
m_xWindow.clear();
}
@@ -340,7 +339,6 @@ namespace svx
void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source )
{
- (void)Source;
DBG_ASSERT( Source.Source == m_xWindow, "FmMouseListenerAdapter::disposing: where did this come from?" );
m_xWindow.clear();
}
@@ -1053,10 +1051,7 @@ namespace svx
void FmTextControlShell::formDeactivated( const Reference< runtime::XFormController >& _rxController )
{
-#if OSL_DEBUG_LEVEL > 0
SAL_INFO("svx.form", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 ));
-#endif
- (void)_rxController;
if ( IsActiveControl() )
controlDeactivated();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1132e823f5bd..54777d9ebe8d 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -4141,7 +4141,6 @@ void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent)
void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL )
{
- (void)_rURL;
OSL_ENSURE(_rURL.Complete == FMURL_CONFIRM_DELETION, "FormController::removeStatusListener: invalid (unsupported) URL!");
// we never really added the listener, so we don't need to remove it
}
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index bfda3c7a54c8..5570aa975767 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -124,7 +124,6 @@ namespace svx
::osl::ClearableMutexGuard aGuard( m_rMutex );
OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::dispatch: not responsible for this URL!" );
- (void)_rURL;
if ( !m_xFormOperations->isEnabled( m_nFormFeature ) )
return;
@@ -159,7 +158,6 @@ namespace svx
void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
{
- (void)_rURL;
OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::addStatusListener: unexpected URL!" );
OSL_ENSURE( _rxControl.is(), "OSingleFeatureDispatcher::addStatusListener: senseless call!" );
if ( !_rxControl.is() )
@@ -176,7 +174,6 @@ namespace svx
void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL )
{
- (void)_rURL;
OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::removeStatusListener: unexpected URL!" );
OSL_ENSURE( _rxControl.is(), "OSingleFeatureDispatcher::removeStatusListener: senseless call!" );
if ( !_rxControl.is() )
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 70d676a4ddef..232abcf5f622 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -218,8 +218,6 @@ namespace sdr
// the event. The parameter allows checking for the correct event.
void ViewObjectContactOfGraphic::forgetAsynchGraphicLoadingEvent(sdr::event::AsynchGraphicLoadingEvent* pEvent)
{
- (void) pEvent; // suppress warning
-
if(mpAsynchLoadEvent)
{
OSL_ENSURE(!pEvent || mpAsynchLoadEvent.get() == pEvent,
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 4285b5fd007b..a286dd1a4902 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -228,10 +228,8 @@ void GraphicPropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState,
- const bool bIsEnabled)
+ const bool)
{
- (void)bIsEnabled;
-
switch( nSID )
{
case SID_ATTR_GRAF_LUMINANCE:
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 7f83015f4a0e..293969610614 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -131,10 +131,7 @@ void ParaPropertyPanel::HandleContextChange (
mpTBxOutline->Show( maContext.GetApplication_DI() == vcl::EnumContext::Application::DrawImpress );
}
-void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
-{
- (void)rEvent;
-}
+void ParaPropertyPanel::DataChanged (const DataChangedEvent&) {}
void ParaPropertyPanel::ReSize()
{
@@ -198,10 +195,8 @@ void ParaPropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState,
- const bool bIsEnabled)
+ const bool)
{
- (void)bIsEnabled;
-
switch (nSID)
{
case SID_ATTR_METRIC:
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 4d9a5da4e1cf..3b76365ed6ff 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -494,10 +494,8 @@ void PosSizePropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState,
- const bool bIsEnabled)
+ const bool)
{
- (void)bIsEnabled;
-
mpFtAngle->Enable();
mpMtrAngle->Enable();
mpDial->Enable();
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index c2094783068d..846a067e3d8b 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1749,11 +1749,9 @@ SdrObject* SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrPageView*& rpP
bool bMarked(nOptions & SdrSearchOptions::MARKED);
bool bMasters=!bMarked && bool(nOptions & SdrSearchOptions::ALSOONMASTER);
bool bBack(nOptions & SdrSearchOptions::BACKWARD);
-#if OSL_DEBUG_LEVEL > 0
- bool bNext(nOptions & SdrSearchOptions::NEXT); (void)bNext; // n.i.
- bool bBoundCheckOn2ndPass(nOptions & SdrSearchOptions::PASS2BOUND); (void)bBoundCheckOn2ndPass;// n.i.
- bool bCheckNearestOn3rdPass(nOptions & SdrSearchOptions::PASS3NEAREST); (void)bCheckNearestOn3rdPass;// n.i.
-#endif
+ // nOptions & SdrSearchOptions::NEXT: n.i.
+ // nOptions & SdrSearchOptions::PASS2BOUND: n.i.
+ // nOptions & SdrSearchOptions::PASS3NEAREST// n.i.
if (nTol<0) nTol=ImpGetHitTolLogic(nTol,nullptr);
Point aPt(rPnt);
SdrObject* pObj=nullptr;
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 5eba805c6834..ea5ed60938bb 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1399,7 +1399,6 @@ void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum)
pChkPg=rMod.RemovePage(nNum);
}
DBG_ASSERT(pChkPg==&mrPage,"SdrUndoPage::ImpRemovePage(): RemovePage!=&mrPage");
- (void)pChkPg;
}
}
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index e0d8c52ee5ed..19ac6bfea300 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1066,9 +1066,8 @@ void TableLayouter::DistributeColumns( ::tools::Rectangle& rArea, sal_Int32 nFir
LayoutTable( rArea, true, false );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sdr::table::TableLayouter::DistributeColumns(), exception caught!");
}
}
@@ -1117,9 +1116,8 @@ void TableLayouter::DistributeRows( ::tools::Rectangle& rArea, sal_Int32 nFirstR
LayoutTable( rArea, false, true );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sdr::table::TableLayouter::DistributeRows(), exception caught!");
}
}
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 54e543c218b6..69202bf8aefe 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1007,9 +1007,8 @@ void TableModel::optimize()
nWidth1 += nWidth2;
xSet2->setPropertyValue( sWidth, Any( nWidth1 ) );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("svx::TableModel::optimize(), exception caught!");
}
@@ -1045,9 +1044,8 @@ void TableModel::optimize()
nHeight1 += nHeight2;
xSet2->setPropertyValue( sHeight, Any( nHeight1 ) );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("svx::TableModel::optimize(), exception caught!");
}
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index eb5d9271d7e0..23808e5a70d3 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -104,9 +104,8 @@ void SdrTableRtfExporter::Write()
nPos += HundMMToTwips( nWidth );
aColumnStart.push_back( nPos );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!");
}
@@ -119,9 +118,8 @@ void SdrTableRtfExporter::Write()
Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW );
WriteRow( xRowSet, nRow, aColumnStart );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!");
}
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 6f217f08c1fc..d1800721fdf4 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -351,9 +351,8 @@ void SdrTableRTFParser::FillTable()
mrTableObj.NbcSetSnapRect( aRect );
}
- catch( Exception& e )
+ catch( Exception& )
{
- (void)e;
OSL_FAIL("sdr::table::SdrTableRTFParser::InsertCell(), exception caught!" );
}
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index b213c026ebbd..ccc976217b67 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1791,14 +1791,8 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >&
{
setPropertyValue( *pNames, *pValues );
}
- catch( beans::UnknownPropertyException& e )
- {
- (void)e;
- }
- catch( uno::Exception& ex )
- {
- (void)ex;
- }
+ catch( beans::UnknownPropertyException& ) {}
+ catch( uno::Exception& ) {}
}
}
else
@@ -1812,14 +1806,8 @@ void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >&
{
xSet->setPropertyValue( *pNames, *pValues );
}
- catch( beans::UnknownPropertyException& e )
- {
- (void)e;
- }
- catch( uno::Exception& ex )
- {
- (void)ex;
- }
+ catch( beans::UnknownPropertyException& ) {}
+ catch( uno::Exception& ) {}
}
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index c21fe6c11e51..7f821cc6aad9 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -356,11 +356,9 @@ uno::Reference < embed::XStorage > const & SvXMLEmbeddedObjectHelper::ImplGetCon
void SvXMLEmbeddedObjectHelper::ImplReadObject(
const OUString& rContainerStorageName,
OUString& rObjName,
- const SvGlobalName *pClassId,
+ const SvGlobalName *, // pClassId, see "TODO/LATER" below
SvStream* pTemp )
{
- (void)pClassId;
-
uno::Reference < embed::XStorage > xDocStor( mpDocPersist->getStorage() );
uno::Reference < embed::XStorage > xCntnrStor( ImplGetContainerStorage( rContainerStorageName ) );
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 68b3c3052d6d..22b5df8e5baa 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -77,12 +77,12 @@ public:
virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
protected:
- void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importColor( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importMarker( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importDash( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importHatch( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importGradient( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importBitmap( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
private:
uno::Reference< XNameContainer > mxTable;
@@ -153,22 +153,22 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPr
switch( meContext )
{
case SvxXMLTableImportContextEnum::Color:
- importColor( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importColor( xAttrList, aAny, aName );
break;
case SvxXMLTableImportContextEnum::Marker:
- importMarker( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importMarker( xAttrList, aAny, aName );
break;
case SvxXMLTableImportContextEnum::Dash:
- importDash( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importDash( xAttrList, aAny, aName );
break;
case SvxXMLTableImportContextEnum::Hatch:
- importHatch( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importHatch( xAttrList, aAny, aName );
break;
case SvxXMLTableImportContextEnum::Gradient:
- importGradient( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importGradient( xAttrList, aAny, aName );
break;
case SvxXMLTableImportContextEnum::Bitmap:
- importBitmap( nPrefix, rLocalName, xAttrList, aAny, aName );
+ importBitmap( xAttrList, aAny, aName );
break;
}
@@ -192,11 +192,8 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPr
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importColor( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
@@ -222,11 +219,8 @@ void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rL
}
}
-void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importMarker( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
try
{
XMLMarkerStyleImport aMarkerStyle( GetImport() );
@@ -238,11 +232,8 @@ void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& r
}
}
-void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importDash( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
try
{
XMLDashStyleImport aDashStyle( GetImport() );
@@ -254,11 +245,8 @@ void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLo
}
}
-void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importHatch( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
try
{
XMLHatchStyleImport aHatchStyle( GetImport() );
@@ -270,11 +258,8 @@ void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rL
}
}
-void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importGradient( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
try
{
XMLGradientStyleImport aGradientStyle( GetImport() );
@@ -286,11 +271,8 @@ void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString&
}
}
-void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importBitmap( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
- (void)nPrfx;
- (void)rLocalName;
-
try
{
XMLImageStyle aImageStyle;