[Libreoffice-commits] core.git: sw/inc sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 9 08:44:51 UTC 2017
sw/inc/PostItMgr.hxx | 2 +-
sw/inc/swmodule.hxx | 4 ++--
sw/inc/view.hxx | 10 +++++-----
sw/source/core/doc/DocumentSettingManager.cxx | 4 ++--
sw/source/core/view/viewsh.cxx | 2 +-
sw/source/filter/html/htmltab.cxx | 6 +++---
sw/source/filter/ww8/docxattributeoutput.cxx | 16 ++++++++--------
sw/source/filter/ww8/docxattributeoutput.hxx | 6 +++---
sw/source/filter/ww8/rtfattributeoutput.cxx | 5 ++---
sw/source/filter/ww8/rtfattributeoutput.hxx | 2 +-
sw/source/filter/ww8/wrtw8nds.cxx | 12 ++++++------
sw/source/filter/ww8/wrtww8.hxx | 4 ++--
sw/source/filter/xml/xmlimp.cxx | 3 +--
sw/source/filter/xml/xmltexti.cxx | 3 +--
sw/source/filter/xml/xmltexti.hxx | 3 +--
sw/source/ui/fldui/fldfunc.cxx | 3 +--
sw/source/uibase/app/swmodul1.cxx | 4 ++--
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/source/uibase/fldui/fldmgr.cxx | 2 +-
sw/source/uibase/inc/fldmgr.hxx | 2 +-
sw/source/uibase/inc/navipi.hxx | 5 ++---
sw/source/uibase/inc/pview.hxx | 2 +-
sw/source/uibase/inc/unodispatch.hxx | 2 +-
sw/source/uibase/uiview/pview.cxx | 8 ++++----
sw/source/uibase/uiview/uivwimp.cxx | 4 ++--
sw/source/uibase/uiview/view.cxx | 2 +-
sw/source/uibase/uiview/viewport.cxx | 6 +++---
sw/source/uibase/uno/unodispatch.cxx | 19 +++++++++----------
sw/source/uibase/utlui/content.cxx | 2 +-
sw/source/uibase/utlui/navipi.cxx | 9 ++++-----
30 files changed, 73 insertions(+), 81 deletions(-)
New commits:
commit b35a4cf023844dbbb3666c730213e9bc679d4a4f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon May 8 13:46:08 2017 +0200
loplugin:checkunusedparams in sw(part5)
Change-Id: Iee48e6c77f1eb57cd8a3a245e5415051b85f4cc1
Reviewed-on: https://gerrit.libreoffice.org/37387
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 319a83c1cac2..38f2bbff3ff3 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -293,7 +293,7 @@ class SwPostItMgr: public SfxListener
std::vector< vcl::Window* >* pChildren );
void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
- void PaintTile(OutputDevice& rRenderContext, const tools::Rectangle& rRect);
+ void PaintTile(OutputDevice& rRenderContext);
};
#endif
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index de72dd4547b6..71cf3c0f499f 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -217,8 +217,8 @@ public:
FieldUnit GetMetric( bool bWeb ) const;
// Pass update-statuses.
- sal_uInt16 GetLinkUpdMode( bool bWeb ) const;
- SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const;
+ sal_uInt16 GetLinkUpdMode() const;
+ SwFieldUpdateFlags GetFieldUpdateFlags() const;
// Virtual methods for options dialog.
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) override;
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 6af7a90ce00e..55f87ec82937 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -325,7 +325,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SvxZoomType eZoomType,
short nFactor,
bool bViewOnly);
- SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner );
+ SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill );
SAL_DLLPRIVATE void ShowAtResize();
@@ -408,7 +408,7 @@ public:
const SwEditWin &GetEditWin () const { return *m_pEditWin; }
#if defined(_WIN32) || defined UNX
- void ScannerEventHdl( const css::lang::EventObject& rEventObject );
+ void ScannerEventHdl();
#endif
// hand the handler for text blocks to the shell; create if applicable
@@ -421,10 +421,10 @@ public:
sal_uInt16 nRangeX = USHRT_MAX,
sal_uInt16 nRangeY = USHRT_MAX);
- long SetVScrollMax(long lMax);
- long SetHScrollMax(long lMax);
+ long SetVScrollMax(long lMax);
+ long SetHScrollMax(long lMax);
- void SpellError(LanguageType eLang);
+ void SpellError(LanguageType eLang);
bool ExecSpellPopup( const Point& rPt );
void ExecFieldPopup( const Point& rPt, sw::mark::IFieldmark *fieldBM );
void ExecSmartTagPopup( const Point& rPt );
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index dd41cb6e7b47..9330dbe1bb32 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -474,7 +474,7 @@ sal_uInt16 sw::DocumentSettingManager::getLinkUpdateMode( /*[in]*/bool bGlobalSe
{
sal_uInt16 nRet = mnLinkUpdMode;
if( bGlobalSettings && GLOBALSETTING == nRet )
- nRet = SW_MOD()->GetLinkUpdMode(get(DocumentSettingId::HTML_MODE));
+ nRet = SW_MOD()->GetLinkUpdMode();
return nRet;
}
@@ -487,7 +487,7 @@ SwFieldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool
{
SwFieldUpdateFlags eRet = meFieldUpdMode;
if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet )
- eRet = SW_MOD()->GetFieldUpdateFlags(get(DocumentSettingId::HTML_MODE));
+ eRet = SW_MOD()->GetFieldUpdateFlags();
return eRet;
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 616bcbd1aa7f..8ce4de7d028c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1911,7 +1911,7 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
SwPostItMgr* pPostItMgr = GetPostItMgr();
if (GetViewOptions()->IsPostIts() && pPostItMgr)
- pPostItMgr->PaintTile(rDevice, aOutRect);
+ pPostItMgr->PaintTile(rDevice);
// SwViewShell's output device tear down
mpOut = pSaveOut;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 35b8f59e981f..0a499420f247 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2994,7 +2994,7 @@ public:
void StartNoBreak( const SwPosition& rPos );
void EndNoBreak( const SwPosition& rPos );
- void CheckNoBreak( const SwPosition& rPos, SwDoc *pDoc );
+ void CheckNoBreak( const SwPosition& rPos );
};
CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
@@ -3222,7 +3222,7 @@ void CellSaveStruct::EndNoBreak( const SwPosition& rPos )
}
}
-void CellSaveStruct::CheckNoBreak( const SwPosition& rPos, SwDoc * /*pDoc*/ )
+void CellSaveStruct::CheckNoBreak( const SwPosition& rPos )
{
if( m_pCnts && m_pCurrCnts==m_pCnts )
{
@@ -3945,7 +3945,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( pSaveStruct->IsInSection() )
{
- pSaveStruct->CheckNoBreak( *m_pPam->GetPoint(), m_xDoc.get() );
+ pSaveStruct->CheckNoBreak( *m_pPam->GetPoint() );
// End all open contexts. We'll take AttrMin because nContextStMin might
// have been modified. Since it's gonna be restored by EndContext, it's okay
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 07924d9a2da2..e4abf74e5bd4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -700,7 +700,7 @@ void DocxAttributeOutput::SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_
{
sal_Int32 nOpenCell = lastOpenCell.back();
if (nOpenCell != -1 && nOpenCell != nCell && nOpenCell < MAX_CELL_IN_WORD)
- EndTableCell(pInner, nOpenCell, nRow);
+ EndTableCell(nOpenCell);
sal_Int32 nClosedCell = lastClosedCell.back();
for (sal_Int32 i = nClosedCell+1; i < nCell; ++i)
@@ -713,7 +713,7 @@ void DocxAttributeOutput::SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_
StartTableCell(pInner, i, nRow);
m_pSerializer->singleElementNS( XML_w, XML_p, FSEND );
- EndTableCell(pInner, i, nRow);
+ EndTableCell(i);
}
}
@@ -762,7 +762,7 @@ void DocxAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointe
m_pSerializer->singleElementNS( XML_w, XML_p, FSEND );
}
- EndTableCell(pInner, nCell, nRow);
+ EndTableCell(nCell);
}
// This is a line end
@@ -3152,7 +3152,7 @@ void DocxAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t
m_tableReference->m_bTableCellOpen = true;
}
-void DocxAttributeOutput::EndTableCell(ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ const &, sal_uInt32 nCell, sal_uInt32 /*nRow*/)
+void DocxAttributeOutput::EndTableCell(sal_uInt32 nCell)
{
lastClosedCell.back() = nCell;
lastOpenCell.back() = -1;
@@ -4477,9 +4477,9 @@ void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rOL
{
if( WriteOLEChart( pSdrObj, rSize ))
return;
- if( WriteOLEMath( pSdrObj, rOLENode, rSize ))
+ if( WriteOLEMath( rOLENode ))
return;
- if( PostponeOLE( pSdrObj, rOLENode, rSize, pFlyFrameFormat ))
+ if( PostponeOLE( rOLENode, rSize, pFlyFrameFormat ))
return;
// Then we fall back to just export the object as a graphic.
if( !m_pPostponedGraphic )
@@ -4596,7 +4596,7 @@ void DocxAttributeOutput::WritePostponedChart()
m_postponedChart = nullptr;
}
-bool DocxAttributeOutput::WriteOLEMath( const SdrObject*, const SwOLENode& rOLENode, const Size& )
+bool DocxAttributeOutput::WriteOLEMath( const SwOLENode& rOLENode )
{
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
SvGlobalName aObjName(xObj->getClassID());
@@ -4797,7 +4797,7 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
}
}
-bool DocxAttributeOutput::PostponeOLE( const SdrObject*, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat )
+bool DocxAttributeOutput::PostponeOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat )
{
if( !m_pPostponedOLEs )
//cannot be postponed, try to write now
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 9fb89a318a8a..a4f3fe8fbc58 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -413,8 +413,8 @@ private:
void WriteSrcRect( const SdrObject* pSdrObj, const SwFrameFormat* pFrameFormat );
void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat);
bool WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize );
- bool WriteOLEMath( const SdrObject* pSdrObj, const SwOLENode& rNode, const Size& rSize );
- bool PostponeOLE( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat );
+ bool WriteOLEMath( const SwOLENode& rNode );
+ bool PostponeOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat );
void WriteOLE( SwOLENode& rNode, const Size& rSize, const SwFlyFrameFormat* rFlyFrameFormat );
/// checks whether the current component is a diagram
@@ -425,7 +425,7 @@ private:
void StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner );
void StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow );
void TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow );
- void EndTableCell( ww8::WW8TableNodeInfoInner::Pointer_t const & pTableTextNodeInfoInner, sal_uInt32 nCell, sal_uInt32 nRow );
+ void EndTableCell( sal_uInt32 nCell );
void EndTableRow( );
void EndTable();
void SyncNodelessCells(ww8::WW8TableNodeInfoInner::Pointer_t const & pInner, sal_Int32 nCell, sal_uInt32 nRow);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 597316b2002c..4cce69b69bfd 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -904,8 +904,7 @@ void RtfAttributeOutput::TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_
// This is called when the nested table ends in a cell, and there's no
// paragraph benhind that; so we must check for the ends of cell, rows,
// and tables
- // ['true' to write an empty paragraph, MS Word insists on that]
- FinishTableRowCell(pNodeInfoInner, true);
+ FinishTableRowCell(pNodeInfoInner);
}
void RtfAttributeOutput::TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner)
@@ -1080,7 +1079,7 @@ void RtfAttributeOutput::EndTable()
m_pTableWrt.reset(nullptr);
}
-void RtfAttributeOutput::FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner, bool /*bForceEmptyParagraph*/)
+void RtfAttributeOutput::FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner)
{
if (pInner)
{
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 75560083f33d..2a5fca3c8309 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -471,7 +471,7 @@ private:
void EndTable();
/// End cell, row, and even the entire table if necessary.
- void FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner, bool bForceEmptyParagraph = false);
+ void FinishTableRowCell(const ww8::WW8TableNodeInfoInner::Pointer_t& pInner);
void WriteTextFootnoteNumStr(const SwFormatFootnote& rFootnote);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 6a0916eabf16..ddf3a0c098be 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1133,7 +1133,7 @@ OUString BookmarkToWriter(const OUString &rBookmark)
INetURLObject::DecodeMechanism::Unambiguous, RTL_TEXTENCODING_ASCII_US);
}
-void SwWW8AttrIter::OutSwFormatRefMark(const SwFormatRefMark& rAttr, bool)
+void SwWW8AttrIter::OutSwFormatRefMark(const SwFormatRefMark& rAttr)
{
if ( m_rExport.HasRefToObject( REF_SETREFATTR, &rAttr.GetRefName(), 0 ) )
m_rExport.AppendBookmark( MSWordExportBase::GetBookmarkName( REF_SETREFATTR,
@@ -1247,7 +1247,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
pEnd = pHt->End();
if (nullptr != pEnd && nPos == *pEnd && nPos != pHt->GetStart())
{
- OutSwFormatRefMark(*static_cast<const SwFormatRefMark*>(pItem), false);
+ OutSwFormatRefMark(*static_cast<const SwFormatRefMark*>(pItem));
--nRet;
}
break;
@@ -1286,13 +1286,13 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos)
case RES_TXTATR_REFMARK:
if ( nPos == pHt->GetStart() )
{
- OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), true );
+ OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ) );
++nRet;
}
pEnd = pHt->End();
if (nullptr != pEnd && nPos == *pEnd && nPos == pHt->GetStart())
{ // special case: empty TODO: is this possible or would empty one have pEnd null?
- OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ), false );
+ OutSwFormatRefMark( *static_cast< const SwFormatRefMark* >( pItem ) );
--nRet;
}
break;
@@ -1796,7 +1796,7 @@ sal_Int32 MSWordExportBase::GetNextPos( SwWW8AttrIter* aAttrIter, const SwTextNo
return std::min( nNextPos, std::min( nNextBookmark, nNextAnnotationMark ) );
}
-void MSWordExportBase::UpdatePosition( SwWW8AttrIter* aAttrIter, sal_Int32 nAktPos, sal_Int32 /*nEnd*/ )
+void MSWordExportBase::UpdatePosition( SwWW8AttrIter* aAttrIter, sal_Int32 nAktPos )
{
sal_Int32 nNextPos;
@@ -2451,7 +2451,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
AttrOutput().EndRun();
nAktPos = nNextAttr;
- UpdatePosition( &aAttrIter, nAktPos, nEnd );
+ UpdatePosition( &aAttrIter, nAktPos );
eChrSet = aAttrIter.GetCharSet();
}
while ( nAktPos < nEnd );
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 6adb263a614e..99e130cc3a41 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -791,7 +791,7 @@ protected:
sal_Int32 GetNextPos( SwWW8AttrIter* pAttrIter, const SwTextNode& rNode, sal_Int32 nAktPos );
/// Update the information for GetNextPos().
- void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos, sal_Int32 nEnd );
+ void UpdatePosition( SwWW8AttrIter* pAttrIter, sal_Int32 nAktPos );
/// Output SwTextNode
virtual void OutputTextNode( const SwTextNode& );
@@ -1474,7 +1474,7 @@ private:
sal_Int32 SearchNext( sal_Int32 nStartPos );
- void OutSwFormatRefMark(const SwFormatRefMark& rAttr, bool bStart);
+ void OutSwFormatRefMark(const SwFormatRefMark& rAttr);
void IterToCurrent();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7cebf5a4d561..d77a596c6ff5 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -957,8 +957,7 @@ XMLTextImportHelper* SwXMLImport::CreateTextImport()
return new SwXMLTextImportHelper( GetModel(), *this, getImportInfo(),
IsInsertMode(),
IsStylesOnlyMode(),
- IsBlockMode(), m_bOrganizerMode,
- m_bPreserveRedlineFlags );
+ IsBlockMode(), m_bOrganizerMode );
}
XMLShapeImportHelper* SwXMLImport::CreateShapeImport()
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index b33e5aec5c8f..3a67abd2c3f8 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -145,8 +145,7 @@ SwXMLTextImportHelper::SwXMLTextImportHelper(
SvXMLImport& rImport,
const uno::Reference<XPropertySet> & rInfoSet,
bool bInsertM, bool bStylesOnlyM,
- bool bBlockM, bool bOrganizerM,
- bool /*bPreserveRedlineFlags*/ ) :
+ bool bBlockM, bool bOrganizerM ) :
XMLTextImportHelper( rModel, rImport, bInsertM, bStylesOnlyM, true/*bProgress*/,
bBlockM, bOrganizerM ),
pRedlineHelper( nullptr )
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index f4ae970673aa..61b9d6cd0a5a 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -40,8 +40,7 @@ public:
SvXMLImport& rImport,
const css::uno::Reference<css::beans::XPropertySet>& rInfoSet,
bool bInsertM, bool bStylesOnlyM,
- bool bBlockM, bool bOrganizerM,
- bool bPreserveRedlineFlags );
+ bool bBlockM, bool bOrganizerM );
virtual ~SwXMLTextImportHelper() override;
virtual css::uno::Reference<css::beans::XPropertySet>
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index edf169f2e5e9..0c9587bb0013 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -533,8 +533,7 @@ void SwFieldFuncPage::UpdateSubType()
// call MacroBrowser, fill Listbox with Macros
IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, Button *, void)
{
- const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";"));
- if (GetFieldMgr().ChooseMacro(sMacro))
+ if (GetFieldMgr().ChooseMacro())
UpdateSubType();
}
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index c9ef218bb807..78300a9e7ac7 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -609,14 +609,14 @@ FieldUnit SwModule::GetMetric( bool bWeb ) const
}
// Pass-through Update-Status
-sal_uInt16 SwModule::GetLinkUpdMode( bool ) const
+sal_uInt16 SwModule::GetLinkUpdMode() const
{
if(!m_pUsrPref)
GetUsrPref(false);
return (sal_uInt16)m_pUsrPref->GetUpdateLinkMode();
}
-SwFieldUpdateFlags SwModule::GetFieldUpdateFlags( bool ) const
+SwFieldUpdateFlags SwModule::GetFieldUpdateFlags() const
{
if(!m_pUsrPref)
GetUsrPref(false);
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 6b2f3e4c567c..6f49708864d2 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -971,7 +971,7 @@ void SwPostItMgr::DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage)
}
}
-void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const tools::Rectangle& /*rRect*/)
+void SwPostItMgr::PaintTile(OutputDevice& rRenderContext)
{
for (SwSidebarItem* pItem : mvPostItFields)
{
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 4a291cdd6e0b..88718273b980 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -1611,7 +1611,7 @@ void SwFieldType::GetFieldName_()
}
}
-bool SwFieldMgr::ChooseMacro(const OUString&)
+bool SwFieldMgr::ChooseMacro()
{
bool bRet = false;
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 6302a84355c2..4e134e5f70aa 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -137,7 +137,7 @@ public:
void InsertFieldType(SwFieldType& rType);
- bool ChooseMacro(const OUString &rSelMacro);
+ bool ChooseMacro();
void SetMacroPath(const OUString& rPath);
const OUString& GetMacroPath() const { return sMacroPath; }
const OUString& GetMacroName() const { return sMacroName; }
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 90a20d6ac7ec..1825f8eac10f 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -149,7 +149,7 @@ public:
RegionMode GetRegionDropMode() const {return m_nRegionMode;}
void SetRegionDropMode(RegionMode nNewMode);
- sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ sal_Int8 AcceptDrop();
sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
bool IsGlobalDoc() const;
@@ -164,8 +164,7 @@ class SwNavigationChild : public SfxChildWindowContext
public:
SwNavigationChild( vcl::Window* ,
sal_uInt16 nId,
- SfxBindings*,
- SfxChildWinInfo* );
+ SfxBindings* );
//! soon obsolete !
static SfxChildWindowContext* CreateImpl(vcl::Window *pParent,
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 08427f6c778a..7e04b535568a 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -203,7 +203,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override;
SAL_DLLPRIVATE virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override;
- SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner );
+ SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill );
/** Helper method to execute SfxRequest FN_PAGE_UP and FN_PAGE_DOWN
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index c603f499fd4c..320bbf775d61 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -45,7 +45,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
//::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently
SolarMutexGuard aGuard;
public:
- DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&);
+ DispatchMutexLock_Impl();
~DispatchMutexLock_Impl();
};
friend class DispatchMutexLock_Impl;
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 08bc2285c4e3..0610d9b104f6 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1318,7 +1318,7 @@ bool SwPagePreview::ChgPage( int eMvMode, bool bUpdateScrollbar )
}
// From here, everything was taken from the SwView.
-void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ )
+void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill )
{
const StyleSettings &rSet = m_pViewWin->GetSettings().GetStyleSettings();
const long nTmp = rSet.GetScrollBarSize();
@@ -1332,7 +1332,7 @@ void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ )
void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize, bool )
{
SvBorder aBorder;
- CalcAndSetBorderPixel( aBorder, true );
+ CalcAndSetBorderPixel( aBorder );
tools::Rectangle aRect( rOfst, rSize );
aRect += aBorder;
ViewResizePixel( *m_pViewWin, aRect.TopLeft(), aRect.GetSize(),
@@ -1346,7 +1346,7 @@ void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize, bo
void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
{
SvBorder aBorder;
- CalcAndSetBorderPixel( aBorder, false );
+ CalcAndSetBorderPixel( aBorder );
// Never set EditWin !
@@ -1363,7 +1363,7 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
}
SvBorder aBorderNew;
- CalcAndSetBorderPixel( aBorderNew, false );
+ CalcAndSetBorderPixel( aBorderNew );
ViewResizePixel( *m_pViewWin, rOfst, rSize, m_pViewWin->GetOutputSizePixel(),
*m_pVScrollbar, *m_pHScrollbar, *m_pScrollFill );
}
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 6c7288e5521d..0584ffffd7c1 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -269,12 +269,12 @@ SwScannerEventListener::~SwScannerEventListener()
{
}
-void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject)
+void SAL_CALL SwScannerEventListener::disposing( const EventObject& /*rEventObject*/)
{
#if defined(_WIN32) || defined UNX
SolarMutexGuard aGuard;
if( pView )
- pView->ScannerEventHdl( rEventObject );
+ pView->ScannerEventHdl();
#endif
}
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 5383c26d0a36..8cc9b2438f62 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1656,7 +1656,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
#if defined(_WIN32) || defined UNX
-void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ )
+void SwView::ScannerEventHdl()
{
uno::Reference< XScannerManager2 > xScanMgr = SW_MOD()->GetScannerManager();
if( xScanMgr.is() )
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index edf3f4a21e90..e56fcd6c330c 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -813,7 +813,7 @@ void SwView::CalcVisArea( const Size &rOutPixel )
// Rearrange control elements
-void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ )
+void SwView::CalcAndSetBorderPixel( SvBorder &rToFill )
{
bool bRightVRuler = m_pWrtShell->GetViewOptions()->IsVRulerRight();
if ( m_pVRuler->IsVisible() )
@@ -971,7 +971,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize, bool )
{
Size aSz( rSize );
SvBorder aBorder;
- CalcAndSetBorderPixel( aBorder, true );
+ CalcAndSetBorderPixel( aBorder );
if ( GetViewFrame()->GetFrame().IsInPlace() )
{
Size aViewSize( aSz );
@@ -1083,7 +1083,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
const bool bScroll1 = m_pVScrollbar->IsVisible(true);
const bool bScroll2 = m_pHScrollbar->IsVisible(true);
SvBorder aBorder;
- CalcAndSetBorderPixel( aBorder, false );
+ CalcAndSetBorderPixel( aBorder );
const Size aEditSz( GetEditWin().GetOutputSizePixel() );
ViewResizePixel( GetEditWin(), rOfst, rSize, aEditSz, *m_pVScrollbar,
*m_pHScrollbar, *m_pScrollFill, m_pVRuler, m_pHRuler,
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index dd799932eed6..fd20b70d4961 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -64,7 +64,7 @@ SwXDispatchProviderInterceptor::~SwXDispatchProviderInterceptor()
uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch(
const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
uno::Reference< frame::XDispatch> xResult;
// create some dispatch ...
if(m_pView && aURL.Complete.startsWith(".uno:DataSourceBrowser/"))
@@ -100,7 +100,7 @@ uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedU
uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderInterceptor::queryDispatches(
const uno::Sequence< frame::DispatchDescriptor >& aDescripts )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
uno::Sequence< uno::Reference< frame::XDispatch> > aReturn(aDescripts.getLength());
uno::Reference< frame::XDispatch>* pReturn = aReturn.getArray();
const frame::DispatchDescriptor* pDescripts = aDescripts.getConstArray();
@@ -114,33 +114,33 @@ uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderIntercept
uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getSlaveDispatchProvider( )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
return m_xSlaveDispatcher;
}
void SwXDispatchProviderInterceptor::setSlaveDispatchProvider(
const uno::Reference< frame::XDispatchProvider >& xNewDispatchProvider )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
m_xSlaveDispatcher = xNewDispatchProvider;
}
uno::Reference< frame::XDispatchProvider > SwXDispatchProviderInterceptor::getMasterDispatchProvider( )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
return m_xMasterDispatcher;
}
void SwXDispatchProviderInterceptor::setMasterDispatchProvider(
const uno::Reference< frame::XDispatchProvider >& xNewSupplier )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
m_xMasterDispatcher = xNewSupplier;
}
void SwXDispatchProviderInterceptor::disposing( const lang::EventObject& )
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
if (m_xIntercepted.is())
{
m_xIntercepted->releaseDispatchProviderInterceptor(static_cast<frame::XDispatchProviderInterceptor*>(this));
@@ -176,7 +176,7 @@ sal_Int64 SwXDispatchProviderInterceptor::getSomething(
void SwXDispatchProviderInterceptor::Invalidate()
{
- DispatchMutexLock_Impl aLock(*this);
+ DispatchMutexLock_Impl aLock;
if (m_xIntercepted.is())
{
m_xIntercepted->releaseDispatchProviderInterceptor(static_cast<frame::XDispatchProviderInterceptor*>(this));
@@ -392,8 +392,7 @@ const sal_Char* SwXDispatch::GetDBChangeURL()
return cInternalDBChangeNotification;
}
-SwXDispatchProviderInterceptor::DispatchMutexLock_Impl::DispatchMutexLock_Impl(
- SwXDispatchProviderInterceptor& )
+SwXDispatchProviderInterceptor::DispatchMutexLock_Impl::DispatchMutexLock_Impl()
{
}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index abdb7dd027c1..ee788fd86840 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1043,7 +1043,7 @@ sal_Int8 SwContentTree::AcceptDrop( const AcceptDropEvent& rEvt )
nRet = SvTreeListBox::AcceptDrop( rEvt );
}
else if( !bIsInDrag )
- nRet = GetParentWindow()->AcceptDrop( rEvt );
+ nRet = GetParentWindow()->AcceptDrop();
return nRet;
}
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index a136379b4131..0a4cca1220e5 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -64,11 +64,11 @@ using namespace ::com::sun::star::frame;
//! soon obsolete !
SfxChildWindowContext* SwNavigationChild::CreateImpl( vcl::Window *pParent,
- SfxBindings *pBindings, SfxChildWinInfo* pInfo )
+ SfxBindings *pBindings, SfxChildWinInfo* /*pInfo*/ )
{
SfxChildWindowContext *pContext = new SwNavigationChild(pParent,
/* cast is safe here! */static_cast< sal_uInt16 >(SwView::GetInterfaceId()),
- pBindings,pInfo);
+ pBindings);
return pContext;
}
void SwNavigationChild::RegisterChildWindowContext(SfxModule* pMod)
@@ -1032,7 +1032,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
return sFileName;
}
-sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
+sal_Int8 SwNavigationPI::AcceptDrop()
{
return ( !SwContentTree::IsInDrag() &&
( m_aContentTree->IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
@@ -1192,8 +1192,7 @@ SwView* SwNavigationPI::GetCreateView() const
SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
sal_uInt16 nId,
- SfxBindings* _pBindings,
- SfxChildWinInfo* )
+ SfxBindings* _pBindings )
: SfxChildWindowContext( nId )
{
VclPtr<SwNavigationPI> pNavi = VclPtr<SwNavigationPI>::Create(_pBindings, pParent);
More information about the Libreoffice-commits
mailing list