[Libreoffice-commits] core.git: 5 commits - include/unotools sc/source sw/inc sw/source ucb/source unotools/source unoxml/source
Noel Grandin
noel at peralex.com
Mon Feb 29 07:09:15 UTC 2016
include/unotools/confignode.hxx | 2 -
include/unotools/fontcfg.hxx | 5 ---
include/unotools/fontcvt.hxx | 8 ++---
include/unotools/ucbhelper.hxx | 2 -
include/unotools/ucbstreamhelper.hxx | 9 ++----
sc/source/ui/view/gridwin_dbgutil.cxx | 2 -
sw/inc/SwNumberTree.hxx | 11 -------
sw/inc/swmodule.hxx | 2 -
sw/inc/swregion.hxx | 2 -
sw/inc/tblsel.hxx | 2 -
sw/inc/txtannotationfld.hxx | 3 --
sw/inc/unocrsrhelper.hxx | 3 --
sw/inc/view.hxx | 8 ++---
sw/source/core/SwNumberTree/SwNumberTree.cxx | 4 +-
sw/source/core/bastyp/swcache.cxx | 2 -
sw/source/core/bastyp/swregion.cxx | 4 +-
sw/source/core/doc/docfld.cxx | 5 +--
sw/source/core/doc/doctxm.cxx | 19 ++-----------
sw/source/core/doc/tblrwcl.cxx | 6 +---
sw/source/core/frmedt/tblsel.cxx | 6 +---
sw/source/core/inc/SwXMLTextBlocks.hxx | 6 +---
sw/source/core/inc/UndoTable.hxx | 2 -
sw/source/core/inc/docfld.hxx | 3 --
sw/source/core/inc/doctxm.hxx | 2 -
sw/source/core/inc/rolbck.hxx | 4 +-
sw/source/core/inc/sectfrm.hxx | 14 +++------
sw/source/core/inc/swblocks.hxx | 6 +---
sw/source/core/inc/swcache.hxx | 2 -
sw/source/core/inc/txtfly.hxx | 6 ++--
sw/source/core/layout/sectfrm.cxx | 4 +-
sw/source/core/swg/SwXMLTextBlocks1.cxx | 32 ++++++----------------
sw/source/core/swg/swblocks.cxx | 4 +-
sw/source/core/text/porlay.hxx | 12 ++++----
sw/source/core/txtnode/atrfld.cxx | 8 +----
sw/source/core/txtnode/ndtxt.cxx | 5 +--
sw/source/core/txtnode/txtedt.cxx | 5 +--
sw/source/core/undo/rolbck.cxx | 4 +-
sw/source/core/undo/untbl.cxx | 4 --
sw/source/core/unocore/unoobj.cxx | 4 +-
sw/source/filter/basflt/fltshell.cxx | 5 +--
sw/source/filter/html/css1atr.cxx | 6 ++--
sw/source/filter/html/htmlcss1.cxx | 5 ---
sw/source/filter/html/htmldrawreader.cxx | 6 +---
sw/source/filter/html/htmlflywriter.cxx | 8 ++---
sw/source/filter/html/parcss1.hxx | 7 ++--
sw/source/filter/html/swhtml.cxx | 14 ---------
sw/source/filter/html/swhtml.hxx | 12 +++-----
sw/source/filter/html/wrthtml.hxx | 4 +-
sw/source/filter/inc/fltshell.hxx | 2 -
sw/source/filter/inc/msfilter.hxx | 6 ----
sw/source/filter/inc/wrt_fn.hxx | 2 -
sw/source/filter/writer/wrt_fn.cxx | 8 ++---
sw/source/filter/ww8/docxexport.cxx | 2 -
sw/source/filter/ww8/docxexport.hxx | 2 -
sw/source/filter/ww8/rtfexport.cxx | 2 -
sw/source/filter/ww8/rtfexport.hxx | 2 -
sw/source/filter/ww8/writerwordglue.cxx | 5 +--
sw/source/filter/ww8/wrtww8.cxx | 12 +++-----
sw/source/filter/ww8/wrtww8.hxx | 8 ++---
sw/source/filter/ww8/ww8scan.hxx | 4 +-
sw/source/filter/xml/xmlitmap.hxx | 3 --
sw/source/filter/xml/xmlitmpr.cxx | 7 +---
sw/source/ui/chrdlg/numpara.cxx | 5 +--
sw/source/ui/fldui/fldpage.cxx | 11 +++----
sw/source/ui/fldui/fldpage.hxx | 6 +---
sw/source/ui/misc/num.cxx | 9 ++----
sw/source/uibase/app/swmodul1.cxx | 2 -
sw/source/uibase/dbui/mailmergehelper.cxx | 4 +-
sw/source/uibase/dochdl/swdtflvr.cxx | 29 ++++----------------
sw/source/uibase/fldui/fldmgr.cxx | 9 ++----
sw/source/uibase/frmdlg/frmmgr.cxx | 8 +----
sw/source/uibase/inc/annotsh.hxx | 2 -
sw/source/uibase/inc/fldmgr.hxx | 8 ++---
sw/source/uibase/inc/frmmgr.hxx | 3 --
sw/source/uibase/inc/inputwin.hxx | 4 +-
sw/source/uibase/inc/mailmergehelper.hxx | 2 -
sw/source/uibase/inc/num.hxx | 11 ++-----
sw/source/uibase/inc/numpara.hxx | 3 --
sw/source/uibase/inc/prcntfld.hxx | 4 +-
sw/source/uibase/inc/pview.hxx | 4 +-
sw/source/uibase/inc/swdtflvr.hxx | 2 -
sw/source/uibase/inc/usrpref.hxx | 33 +++++++++--------------
sw/source/uibase/shells/annotsh.cxx | 4 +-
sw/source/uibase/uiview/pview.cxx | 9 ++----
sw/source/uibase/uiview/view2.cxx | 4 +-
sw/source/uibase/uiview/viewsrch.cxx | 4 --
ucb/source/inc/regexpmap.hxx | 25 +++++------------
ucb/source/ucp/webdav-neon/ContentProperties.cxx | 12 ++------
ucb/source/ucp/webdav-neon/ContentProperties.hxx | 10 ++----
ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx | 5 ---
ucb/source/ucp/webdav-neon/webdavprovider.hxx | 3 --
unotools/source/config/confignode.cxx | 4 +-
unotools/source/config/fontcfg.cxx | 5 +--
unotools/source/misc/fontcvt.cxx | 4 +-
unotools/source/ucbhelper/ucbhelper.cxx | 4 +-
unotools/source/ucbhelper/ucbstreamhelper.cxx | 15 ++++------
unoxml/source/rdf/librdf_repository.cxx | 8 ++---
97 files changed, 235 insertions(+), 404 deletions(-)
New commits:
commit f214e8fa3c0c279fbdfa3b2a4e7752e8bcc4b845
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 29 08:50:35 2016 +0200
loplugin:nullptr
Change-Id: I318a669d8b6b26c179111f887e13da784385a4ac
diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx b/sc/source/ui/view/gridwin_dbgutil.cxx
index b891ff9..70816f3 100644
--- a/sc/source/ui/view/gridwin_dbgutil.cxx
+++ b/sc/source/ui/view/gridwin_dbgutil.cxx
@@ -75,7 +75,7 @@ void ScGridWindow::dumpCellProperties()
OString aOutputFile("dump.xml");
xmlTextWriterPtr writer = xmlNewTextWriterFilename( aOutputFile.getStr(), 0 );
- xmlTextWriterStartDocument( writer, NULL, NULL, NULL );
+ xmlTextWriterStartDocument( writer, nullptr, nullptr, nullptr );
pPatternAttr->GetItemSet().dumpAsXml(writer);
commit 1a3ace4d098eaea7cae26311330046cd900e21af
Author: Noel Grandin <noel at peralex.com>
Date: Mon Feb 29 08:03:43 2016 +0200
loplugin:unuseddefaultparam in sw (part2)
Change-Id: I7eefd83d7f84c0a6301fd3ba37d77463d809e5f9
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 6ed4db6..f4144ee 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -579,25 +579,16 @@ protected:
/**
Set if this node is a phantom.
-
- @param bPhantom - true this node is a phantom
- - false this node is a phantom
*/
- void SetPhantom(bool bPhantom = true);
+ void SetPhantom();
/**
Return if phantoms are counted.
-
- @retval true phantoms are counted
- @retval false else
*/
virtual bool IsCountPhantoms() const = 0;
/**
Return if all descendants of this node are phantoms.
-
- @retval true all descendants are phantoms
- @retval false else
*/
bool HasOnlyPhantoms() const;
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 66cb66b..4dedce7 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -177,7 +177,7 @@ public:
bool IsEmbeddedLoadSave() const { return m_bEmbeddedLoadSave; }
void SetEmbeddedLoadSave( bool bFlag ) { m_bEmbeddedLoadSave = bFlag; }
- static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
+ static void ShowDBObj( SwView& rView, const SwDBData& rData);
// Table modi.
bool IsInsTableFormatNum(bool bHTML) const;
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index 5a4d762..f241da5 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -42,7 +42,7 @@ public:
void Invert();
// Combine adjacent rectangles.
- void Compress( bool bFuzzy = true );
+ void Compress();
inline const SwRect &GetOrigin() const { return m_aOrigin; }
inline void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index dd41708..17ef7f4 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -181,7 +181,7 @@ public:
void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable );
void SetTableLines( const SwTable &rTable );
//Add an input param to identify if acc table should be disposed
- void DelFrames ( SwTable &rTable, bool bAccTableDispose = false );
+ void DelFrames ( SwTable &rTable );
void MakeFrames( SwTable &rTable );
void MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber,
const bool bBehind );
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 62b99e4..b28c082 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -35,8 +35,7 @@ public:
virtual ~SwTextAnnotationField();
- ::sw::mark::IMark* GetAnnotationMark(
- SwDoc* pDoc = nullptr ) const;
+ ::sw::mark::IMark* GetAnnotationMark() const;
};
#endif
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 5015496..61e89be 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -157,8 +157,7 @@ namespace SwUnoCursorHelper
const SfxItemPropertySet & rPropSet,
const OUString & rPropertyName,
const css::uno::Any & rValue,
- const SetAttrMode nAttrMode = SetAttrMode::DEFAULT,
- const bool bTableMode = false)
+ const SetAttrMode nAttrMode = SetAttrMode::DEFAULT)
throw (css::beans::UnknownPropertyException,
css::beans::PropertyVetoException,
css::lang::IllegalArgumentException,
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index b9a88ba..7358b62 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -261,9 +261,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// methods for searching
// set search context
- SAL_DLLPRIVATE bool SearchAndWrap(bool bApi = false);
- SAL_DLLPRIVATE bool SearchAll(sal_uInt16* pFound = nullptr);
- SAL_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions );
+ SAL_DLLPRIVATE bool SearchAndWrap(bool bApi = false);
+ SAL_DLLPRIVATE bool SearchAll();
+ SAL_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions );
SAL_DLLPRIVATE void Replace();
bool IsDocumentBorder();
@@ -598,7 +598,7 @@ public:
bool IsPasteSpecialAllowed();
// Enable mail merge - mail merge field dialog enabled
- void EnableMailMerge(bool bEnable = true);
+ void EnableMailMerge();
//apply Accessiblity options
void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions);
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index a6863fe..eb8899b 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -725,9 +725,9 @@ bool SwNumberTreeNode::IsValid(const SwNumberTreeNode * pChild) const
}
-void SwNumberTreeNode::SetPhantom(bool _bPhantom)
+void SwNumberTreeNode::SetPhantom()
{
- mbPhantom = _bPhantom;
+ mbPhantom = true;
}
bool SwNumberTreeNode::HasOnlyPhantoms() const
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 54d361e9..baf8e33 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -123,7 +123,7 @@ SwCache::~SwCache()
delete *it;
}
-void SwCache::Flush( const sal_uInt8 )
+void SwCache::Flush()
{
INCREMENT( m_nFlushCnt );
SwCacheObj *pObj = pRealFirst;
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index 922c1c9..551df25 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -141,7 +141,7 @@ inline SwTwips CalcArea( const SwRect &rRect )
}
// combine all adjacent rectangles
-void SwRegionRects::Compress( bool bFuzzy )
+void SwRegionRects::Compress()
{
for (size_type i = 0; i < size(); )
{
@@ -170,7 +170,7 @@ void SwRegionRects::Compress( bool bFuzzy )
// paints), the area of the union can be a little bit larger:
// ( 9622 * 141.5 = 1361513 ~= a quarter (1/4) centimeter wider
// than the width of a A4 page
- const long nFuzzy = bFuzzy ? 1361513 : 0;
+ const long nFuzzy = 1361513;
SwRect aUnion( (*this)[i] );
aUnion.Union( (*this)[j] );
SwRect aInter( (*this)[i] );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index cd25942..8f042a4 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -345,10 +345,9 @@ _HashStr::_HashStr( const OUString& rName, const OUString& rText,
}
/// Look up the Name, if it is present, return its String, otherwise return an empty String
-OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName,
- sal_uInt16* pPos )
+OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName )
{
- SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize, pPos );
+ SwHash* pFnd = Find( comphelper::string::strip(rName, ' '), ppTable, nSize );
if( pFnd )
return static_cast<_HashStr*>(pFnd)->aSetStr;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 98859a8..e942770 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -719,26 +719,15 @@ SwTOXBaseSection::~SwTOXBaseSection()
delete *it;
}
-bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
+bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos ) const
{
bool bRet = false;
const SwSectionNode* pSectNd = GetFormat()->GetSectionNode();
if( pSectNd )
{
- SwContentNode* pCNd;
- sal_Int32 nC = 0;
- if( bAtStart )
- {
- rPos.nNode = *pSectNd;
- pCNd = pSectNd->GetDoc()->GetNodes().GoNext( &rPos.nNode );
- }
- else
- {
- rPos.nNode = *pSectNd->EndOfSectionNode();
- pCNd = SwNodes::GoPrevious( &rPos.nNode );
- if( pCNd ) nC = pCNd->Len();
- }
- rPos.nContent.Assign( pCNd, nC );
+ rPos.nNode = *pSectNd;
+ SwContentNode* pCNd = pSectNd->GetDoc()->GetNodes().GoNext( &rPos.nNode );
+ rPos.nContent.Assign( pCNd, 0 );
bRet = true;
}
return bRet;
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 15ae0f2..f6e3a40 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1332,13 +1332,11 @@ static void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd,
static void lcl_CpyBoxes( sal_uInt16 nStt, sal_uInt16 nEnd,
SwTableBoxes& rBoxes,
- SwTableLine* pInsLine,
- sal_uInt16 nPos = USHRT_MAX )
+ SwTableLine* pInsLine )
{
for( sal_uInt16 n = nStt; n < nEnd; ++n )
rBoxes[n]->SetUpper( pInsLine );
- if( USHRT_MAX == nPos )
- nPos = pInsLine->GetTabBoxes().size();
+ sal_uInt16 nPos = pInsLine->GetTabBoxes().size();
pInsLine->GetTabBoxes().insert( pInsLine->GetTabBoxes().begin() + nPos,
rBoxes.begin() + nStt, rBoxes.begin() + nEnd );
rBoxes.erase( rBoxes.begin() + nStt, rBoxes.begin() + nEnd );
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 94970d1..fdebdc7 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2138,9 +2138,7 @@ inline void UnsetFollow( SwFlowFrame *pTab )
pTab->m_pPrecede = nullptr;
}
-//When bAccTableDispose is FALSE,the acc table should not be disposed.
-//void _FndBox::DelFrames( SwTable &rTable )
-void _FndBox::DelFrames( SwTable &rTable, bool bAccTableDispose )
+void _FndBox::DelFrames( SwTable &rTable )
{
// All lines between pLineBefore and pLineBehind should be cut
// from the layout and erased.
@@ -2258,7 +2256,7 @@ void _FndBox::DelFrames( SwTable &rTable, bool bAccTableDispose )
static_cast<SwTabFrame*>(pTabFrame)->SetFollowFlowLine( false );
}
//Set acc table dispose state
- pFrame->SetAccTableDispose( bAccTableDispose );
+ pFrame->SetAccTableDispose( false/*bAccTableDispose*/ );
pFrame->Cut();
//Set acc table dispose state to default value.
pFrame->SetAccTableDispose( true );
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 884af8c..19e35fa 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -77,11 +77,9 @@ public:
bool IsOnlyTextBlock( sal_uInt16 nIdx ) const;
void SetIsTextOnly( const OUString& rShort, bool bNewValue );
- virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen = false ) override;
+ virtual sal_uLong GetMacroTable( sal_uInt16, SvxMacroTableDtor& rMacroTable ) override;
virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
- const SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen = false ) override;
+ const SvxMacroTableDtor& rMacroTable ) override;
virtual bool PutMuchEntries( bool bOn ) override;
public:
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 2e18078..807ff64 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -373,7 +373,7 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & ) override;
};
-void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = nullptr );
+void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx );
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 47531e2..c3df4d1 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -126,8 +126,7 @@ struct SwCalcFieldType : public SwHash
};
// search for the string that was saved under rName in the hash table
-OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName,
- sal_uInt16* pPos = nullptr );
+OUString LookString( SwHash** ppTable, sal_uInt16 nSize, const OUString& rName );
const int GETFLD_ALL = 3; // combine flags via OR
const int GETFLD_CALC = 1;
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index bc9c543..937691c 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -80,7 +80,7 @@ public:
const SwTOXSortTabBases& GetTOXSortTabBases() const { return aSortArr; }
- bool SetPosAtStartEnd( SwPosition& rPos, bool bAtStart = true ) const;
+ bool SetPosAtStartEnd( SwPosition& rPos ) const;
};
struct SwDefTOXBase_Impl
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 14ccafe..e902fb6 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -341,8 +341,8 @@ public:
SwHistory( sal_uInt16 nInitSz = 0 );
~SwHistory();
- // delete History from nStart to array end
- void Delete( sal_uInt16 nStart = 0 );
+ // delete History
+ void Delete();
// call and delete all objects between nStart and array end
bool Rollback( SwDoc* pDoc, sal_uInt16 nStart = 0 );
// call all objects between nStart and TmpEnd; store nStart as TmpEnd
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 4184cb7..7c39a52 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -81,7 +81,7 @@ public:
SwSectionFrame* FindMaster() const;
SwContentFrame *FindLastContent( sal_uInt8 nMode = 0 );
- inline const SwContentFrame *FindLastContent( sal_uInt8 nMode = 0 ) const;
+ inline const SwContentFrame *FindLastContent() const;
inline SwSection* GetSection() { return m_pSection; }
inline const SwSection* GetSection() const { return m_pSection; }
inline void ColLock() { mbColLocked = true; }
@@ -121,16 +121,12 @@ public:
* Returns the size delta that the section would like to be
* greater if it has undersized TextFrames in it.
*
- * If we don't pass a @param bOverSize or false, the return value
- * is > 0 for undersized Frames, or 0 otherwise.
- * If @param bOverSize == true, we can also get a negative return value,
- * if the SectionFrame is not completely filled, which happens often for
- * e.g. SectionFrames with Follows.
+ * The return value is > 0 for undersized Frames, or 0 otherwise.
*
* If necessary the undersized-flag is corrected.
* We need this in the FormatWidthCols to "deflate" columns there.
*/
- SwTwips Undersize(bool bOverSize = false);
+ SwTwips Undersize();
SwTwips CalcUndersize() const;
/// Adapt size to surroundings
@@ -174,9 +170,9 @@ inline SwSectionFrame *SwSectionFrame::GetFollow()
{
return static_cast<SwSectionFrame*>(SwFlowFrame::GetFollow());
}
-inline const SwContentFrame *SwSectionFrame::FindLastContent( sal_uInt8 nMode ) const
+inline const SwContentFrame *SwSectionFrame::FindLastContent() const
{
- return const_cast<SwSectionFrame*>(this)->FindLastContent( nMode );
+ return const_cast<SwSectionFrame*>(this)->FindLastContent();
}
#endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 53127ee..1ca4b52 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -115,11 +115,9 @@ public:
virtual bool IsOnlyTextBlock( const OUString& rShort ) const;
- virtual sal_uLong GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen = false );
+ virtual sal_uLong GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable );
virtual sal_uLong SetMacroTable( sal_uInt16 nIdx,
- const SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen = false );
+ const SvxMacroTableDtor& rMacroTable );
virtual bool PutMuchEntries( bool bOn );
};
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index a905c32..7d22b7c 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -93,7 +93,7 @@ public:
/// The dtor will free all objects still in the vector
~SwCache();
- void Flush( const sal_uInt8 nPercent = 100 );
+ void Flush();
//bToTop == false -> No LRU resorting!
SwCacheObj *Get( const void *pOwner, const bool bToTop = true );
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 6702f8f..3a08805 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -214,7 +214,7 @@ public:
void SetTopRule();
- SwRect GetFrame( const SwRect &rPortion, bool bTop = true ) const;
+ SwRect GetFrame( const SwRect &rPortion ) const;
bool IsOn() const;
/**
@@ -354,9 +354,9 @@ inline void SwTextFly::SetNextTop( long nNew ) const
const_cast<SwTextFly*>(this)->nNextTop = nNew;
}
-inline SwRect SwTextFly::GetFrame( const SwRect &rRect, bool bTop ) const
+inline SwRect SwTextFly::GetFrame( const SwRect &rRect ) const
{
- return bOn ? _GetFrame( rRect, bTop ) : SwRect();
+ return bOn ? _GetFrame( rRect, true/*bTop*/ ) : SwRect();
}
inline void SwTextFly::SetIgnoreCurrentFrame( bool bNew )
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index c9bf717..8d5555d 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2498,11 +2498,11 @@ SwTwips SwSectionFrame::CalcUndersize() const
return InnerHeight() - (Prt().*fnRect->fnGetHeight)();
}
-SwTwips SwSectionFrame::Undersize(bool bOverSize)
+SwTwips SwSectionFrame::Undersize()
{
const auto nRet = CalcUndersize();
m_bUndersized = (nRet > 0);
- return (nRet <= 0 && !bOverSize) ? 0 : nRet;
+ return nRet <= 0 ? 0 : nRet;
}
void SwSectionFrame::CalcFootnoteContent()
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 889be6a..278b063 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -157,8 +157,7 @@ const struct SvEventDescription aAutotextEvents[] =
};
sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
- SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen )
+ SvxMacroTableDtor& rMacroTable )
{
// set current auto text
aShort = aNames[nIdx]->aShort;
@@ -168,11 +167,8 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
sal_uLong nRet = 0;
// open stream in proper sub-storage
- if( !bFileAlreadyOpen )
- {
- CloseFile();
- nRet = OpenFile();
- }
+ CloseFile();
+ nRet = OpenFile();
if ( 0 == nRet )
{
try
@@ -516,8 +512,7 @@ void SwXMLTextBlocks::WriteInfo()
sal_uLong SwXMLTextBlocks::SetMacroTable(
sal_uInt16 nIdx,
- const SvxMacroTableDtor& rMacroTable,
- bool bFileAlreadyOpen )
+ const SvxMacroTableDtor& rMacroTable )
{
// set current autotext
aShort = aNames[nIdx]->aShort;
@@ -538,11 +533,8 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
return ERR_SWG_WRITE_ERROR;
// open stream in proper sub-storage
- if( !bFileAlreadyOpen )
- {
- CloseFile(); // close (it may be open in read-only-mode)
- nRes = OpenFile ( false );
- }
+ CloseFile(); // close (it may be open in read-only-mode)
+ nRes = OpenFile ( false );
if ( 0 == nRes )
{
@@ -608,12 +600,9 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
if ( xTmpTrans.is() )
xTmpTrans->commit();
- if ( !bFileAlreadyOpen )
- {
- uno::Reference < embed::XTransactedObject > xTrans( xBlkRoot, uno::UNO_QUERY );
- if ( xTrans.is() )
- xTrans->commit();
- }
+ uno::Reference < embed::XTransactedObject > xTrans( xBlkRoot, uno::UNO_QUERY );
+ if ( xTrans.is() )
+ xTrans->commit();
xRoot = nullptr;
}
@@ -622,8 +611,7 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
nRes = ERR_SWG_WRITE_ERROR;
}
- if( !bFileAlreadyOpen )
- CloseFile();
+ CloseFile();
}
else
nRes = ERR_SWG_WRITE_ERROR;
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index 316b308..b7557eb 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -217,12 +217,12 @@ bool SwImpBlocks::IsOnlyTextBlock( const OUString& ) const
return false;
}
-sal_uLong SwImpBlocks::GetMacroTable( sal_uInt16, SvxMacroTableDtor&, bool )
+sal_uLong SwImpBlocks::GetMacroTable( sal_uInt16, SvxMacroTableDtor& )
{
return 0;
}
-sal_uLong SwImpBlocks::SetMacroTable( sal_uInt16 , const SvxMacroTableDtor& , bool )
+sal_uLong SwImpBlocks::SetMacroTable( sal_uInt16 , const SvxMacroTableDtor& )
{
return 0;
}
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 29018d0..19e58a3 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -123,7 +123,7 @@ public:
inline bool HasContent() const { return m_bContent; }
inline void SetRedline( const bool bNew = true ) { m_bRedline = bNew; }
inline bool HasRedline() const { return m_bRedline; }
- inline void SetForcedLeftMargin( const bool bNew = true ) { m_bForcedLeftMargin = bNew; }
+ inline void SetForcedLeftMargin() { m_bForcedLeftMargin = true; }
inline bool HasForcedLeftMargin() const { return m_bForcedLeftMargin; }
inline void SetHanging( const bool bNew = true ) { m_bHanging = bNew; }
inline void SetUnderscore( const bool bNew = true ) { m_bUnderscore = bNew; }
@@ -277,21 +277,21 @@ public:
bool UpdateQuoVadis( const OUString &rQuo );
// Flags
- inline void SetFly( const bool bNew = true ) { m_bFlys = bNew; }
+ inline void SetFly() { m_bFlys = true; }
inline bool HasFly() const { return m_bFlys; }
// Preps
- inline void SetPrep( const bool bNew = true ) { m_bPrep = bNew; }
+ inline void SetPrep() { m_bPrep = true; }
inline bool IsPrep() const { return m_bPrep; }
- inline void SetPrepWidows( const bool bNew = true ) { m_bPrepWidows = bNew; }
+ inline void SetPrepWidows() { m_bPrepWidows = true; }
inline bool IsPrepWidows() const { return m_bPrepWidows; }
inline void SetPrepMustFit( const bool bNew = true ) { m_bPrepMustFit = bNew; }
inline bool IsPrepMustFit() const { return m_bPrepMustFit; }
- inline void SetPrepAdjust( const bool bNew = true ) { m_bPrepAdjust = bNew; }
+ inline void SetPrepAdjust() { m_bPrepAdjust = true; }
inline bool IsPrepAdjust() const { return m_bPrepAdjust; }
inline void SetFollowField( const bool bNew = true ) { m_bFollowField = bNew; }
inline bool IsFollowField() const { return m_bFollowField; }
- inline void SetFixLineHeight( const bool bNew = true ) { m_bFixLineHeight = bNew; }
+ inline void SetFixLineHeight() { m_bFixLineHeight = true; }
inline bool IsFixLineHeight() const { return m_bFixLineHeight; }
inline void SetFootnoteNum( const bool bNew = true ) { m_bFootnoteNum = bNew; }
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index a86a5a2..2e895c9 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -626,8 +626,7 @@ SwTextAnnotationField::~SwTextAnnotationField()
{
}
-::sw::mark::IMark* SwTextAnnotationField::GetAnnotationMark(
- SwDoc* pDoc ) const
+::sw::mark::IMark* SwTextAnnotationField::GetAnnotationMark() const
{
const SwPostItField* pPostItField = dynamic_cast<const SwPostItField*>(GetFormatField().GetField());
OSL_ENSURE( pPostItField != nullptr, "<SwTextAnnotationField::GetAnnotationMark()> - field missing" );
@@ -636,10 +635,7 @@ SwTextAnnotationField::~SwTextAnnotationField()
return nullptr;
}
- if ( pDoc == nullptr )
- {
- pDoc = static_cast<const SwPostItFieldType*>(pPostItField->GetTyp())->GetDoc();
- }
+ SwDoc* pDoc = static_cast<const SwPostItFieldType*>(pPostItField->GetTyp())->GetDoc();
OSL_ENSURE( pDoc != nullptr, "<SwTextAnnotationField::GetAnnotationMark()> - missing document" );
if ( pDoc == nullptr )
{
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4147b5d..fb4235c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2918,8 +2918,7 @@ static void Replace0xFF(
OUStringBuffer & rText,
sal_Int32 & rTextStt,
sal_Int32 nEndPos,
- bool const bExpandFields,
- bool const bExpandFootnote = true )
+ bool const bExpandFields )
{
if (rNode.GetpSwpHints())
{
@@ -2952,7 +2951,7 @@ static void Replace0xFF(
case RES_TXTATR_FTN:
rText.remove(nPos, 1);
- if( bExpandFields && bExpandFootnote )
+ if( bExpandFields )
{
const SwFormatFootnote& rFootnote = pAttr->GetFootnote();
OUString sExpand;
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 8cc2f39..d96423c 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -145,8 +145,7 @@ lcl_MaskRedlines( const SwTextNode& rNode, OUStringBuffer& rText,
static bool
lcl_MaskRedlinesAndHiddenText( const SwTextNode& rNode, OUStringBuffer& rText,
sal_Int32 nStt, sal_Int32 nEnd,
- const sal_Unicode cChar = CH_TXTATR_INWORD,
- bool bCheckShowHiddenChar = true )
+ const sal_Unicode cChar = CH_TXTATR_INWORD )
{
sal_Int32 nRedlinesMasked = 0;
sal_Int32 nHiddenCharsMasked = 0;
@@ -165,7 +164,7 @@ lcl_MaskRedlinesAndHiddenText( const SwTextNode& rNode, OUStringBuffer& rText,
// If called from word count, we want to mask the hidden ranges even
// if they are visible:
- if ( !bCheckShowHiddenChar || bHideHidden )
+ if ( bHideHidden )
{
nHiddenCharsMasked =
SwScriptInfo::MaskHiddenRanges( rNode, rText, nStt, nEnd, cChar );
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index fd439e7..cdf6e98 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -1167,9 +1167,9 @@ bool SwHistory::TmpRollback( SwDoc* pDoc, sal_uInt16 nStart, bool bToFirst )
return true;
}
-void SwHistory::Delete( sal_uInt16 nStart )
+void SwHistory::Delete()
{
- for ( sal_uInt16 n = Count(); n > nStart; )
+ for ( sal_uInt16 n = Count(); n > 0; )
{
delete m_SwpHstry[ --n ];
m_SwpHstry.erase( m_SwpHstry.begin() + n );
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index d13cad24..b2f8564 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -3123,7 +3123,7 @@ void SwUndoMergeTable::SaveFormula( SwHistory& rHistory )
pHistory->Move( 0, &rHistory );
}
-void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos )
+void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx )
{
size_t nO = rArr.size();
size_t nU = 0;
@@ -3147,8 +3147,6 @@ void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pIn
}
}
rArr.insert( rArr.begin() + nU, nIdx );
- if( pInsPos )
- *pInsPos = nU;
}
#if OSL_DEBUG_LEVEL > 0
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index f30d1c1..22aa10a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1769,7 +1769,7 @@ void SwUnoCursorHelper::SetPropertyValue(
SwPaM& rPaM, const SfxItemPropertySet& rPropSet,
const OUString& rPropertyName,
const uno::Any& rValue,
- const SetAttrMode nAttrMode, const bool bTableMode)
+ const SetAttrMode nAttrMode)
throw (beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -1777,7 +1777,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
uno::Sequence< beans::PropertyValue > aValues(1);
aValues[0].Name = rPropertyName;
aValues[0].Value = rValue;
- SetPropertyValues(rPaM, rPropSet, aValues, nAttrMode, bTableMode);
+ SetPropertyValues(rPaM, rPropSet, aValues, nAttrMode);
}
// FN_UNO_PARA_STYLE is known to set attributes for nodes, inside
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 518d2a9..817a90b 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -535,7 +535,7 @@ void SwHTMLWriter::OutCSS1_SfxItemSet( const SfxItemSet& rItemSet,
}
}
-void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
+void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc )
{
m_bFirstCSS1Rule = true;
@@ -604,7 +604,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
{
const SwTextFormatColl* pColl = (*pDoc->GetTextFormatColls())[i];
sal_uInt16 nPoolId = pColl->GetPoolFormatId();
- if( !bUsed || nPoolId == RES_POOLCOLL_TEXT ||
+ if( nPoolId == RES_POOLCOLL_TEXT ||
pDoc->IsUsed( *pColl ) )
OutCSS1_SwFormat( *this, *pColl, &pDoc->getIDocumentStylePoolAccess(), m_pTemplate );
}
@@ -615,7 +615,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed )
{
const SwCharFormat *pCFormat = (*pDoc->GetCharFormats())[i];
sal_uInt16 nPoolId = pCFormat->GetPoolFormatId();
- if( !bUsed || nPoolId == RES_POOLCHR_INET_NORMAL ||
+ if( nPoolId == RES_POOLCHR_INET_NORMAL ||
nPoolId == RES_POOLCHR_INET_VISIT ||
pDoc->IsUsed( *pCFormat ) )
OutCSS1_SwFormat( *this, *pCFormat, &pDoc->getIDocumentStylePoolAccess(), m_pTemplate );
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index fcc108d..bdd1bdf 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -2238,7 +2238,7 @@ void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,
nLower = rULSpace.GetLower();
}
-void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
+void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext )
{
_HTMLAttrs &rAttrs = pContext->GetAttrs();
for( auto pAttr : rAttrs )
@@ -2258,9 +2258,6 @@ void SwHTMLParser::EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove )
EndAttr( pAttr );
}
-
- if( bRemove && !rAttrs.empty() )
- rAttrs.clear();
}
void SwHTMLParser::InsertParaAttrs( const SfxItemSet& rItemSet )
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index 633afe6..b1191a3 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -75,8 +75,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
sal_Int16 eVertOri,
sal_Int16 eHoriOri,
SfxItemSet& rCSS1ItemSet,
- SvxCSS1PropertyInfo& rCSS1PropInfo,
- bool bHidden )
+ SvxCSS1PropertyInfo& rCSS1PropInfo )
{
// always on top of text.
// but in invisible layer. <ConnectToLayout> will move the object
@@ -180,8 +179,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
text::HoriOrientation::LEFT == eHoriOri )
{
aAnchor.SetType( FLY_AT_PARA );
- aFrameSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT
- : SURROUND_RIGHT) );
+ aFrameSet.Put( SwFormatSurround(SURROUND_RIGHT) );
// #i26791# - direct positioning for <SwDoc::Insert(..)>
pNewDrawObj->SetRelativePos( Point(nLeftSpace, nUpperSpace) );
}
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index eaea436..4485acd 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -128,8 +128,7 @@ public:
~CSS1Expression();
- inline void Set( CSS1Token eTyp, const OUString &rVal, double nVal,
- sal_Unicode cO = 0 );
+ inline void Set( CSS1Token eTyp, const OUString &rVal, double nVal );
CSS1Token GetType() const { return eType; }
const OUString& GetString() const { return aValue; }
@@ -146,9 +145,9 @@ public:
};
inline void CSS1Expression::Set( CSS1Token eTyp, const OUString &rVal,
- double nVal, sal_Unicode cO )
+ double nVal )
{
- cOp = cO; eType = eTyp; aValue = rVal; nValue = nVal; pNext = nullptr;
+ cOp = 0; eType = eTyp; aValue = rVal; nValue = nVal; pNext = nullptr;
}
inline sal_uInt32 CSS1Expression::GetULength() const
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 3095745..e127c5b 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -3371,8 +3371,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab,
}
}
-void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
- bool bSetNewStart )
+void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab )
{
// preliminary paragraph attributes are not allowed here, they could
// be set here and then the pointers become invalid!
@@ -3388,10 +3387,6 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
{
OSL_ENSURE(!*pHTMLAttributes, "Die Attribut-Tabelle ist nicht leer!");
- const SwPosition *pPos = m_pPam->GetPoint();
- const SwNodeIndex& rSttPara = pPos->nNode;
- const sal_Int32 nSttCnt = pPos->nContent.GetIndex();
-
*pHTMLAttributes = *pSaveAttributes;
_HTMLAttr *pAttr = *pHTMLAttributes;
@@ -3400,13 +3395,6 @@ void SwHTMLParser::RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
OSL_ENSURE( !pAttr->GetPrev() || !pAttr->GetPrev()->ppHead,
"Previous-Attribut hat noch einen Header" );
pAttr->SetHead(pHTMLAttributes);
- if( bSetNewStart )
- {
- pAttr->nSttPara = rSttPara;
- pAttr->nEndPara = rSttPara;
- pAttr->nSttContent = nSttCnt;
- pAttr->nEndContent = nSttCnt;
- }
pAttr = pAttr->GetNext();
}
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index d9d0ee4..599d90f 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -111,7 +111,7 @@ public:
sal_Int32 GetEndCnt() const { return nEndContent; }
bool IsLikePara() const { return bLikePara; }
- void SetLikePara( bool bPara=true ) { bLikePara = bPara; }
+ void SetLikePara() { bLikePara = true; }
SfxPoolItem& GetItem() { return *pItem; }
const SfxPoolItem& GetItem() const { return *pItem; }
@@ -510,12 +510,11 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
bool bChkEmpty=true );
void DeleteAttr( _HTMLAttr* pAttr );
- void EndContextAttrs( _HTMLAttrContext *pContext, bool bRemove=false );
+ void EndContextAttrs( _HTMLAttrContext *pContext );
void SaveAttrTab( _HTMLAttrTable& rNewAttrTab );
void SplitAttrTab( const SwPosition& rNewPos );
void SplitAttrTab( _HTMLAttrTable& rNewAttrTab, bool bMoveEndBack = true );
- void RestoreAttrTab( _HTMLAttrTable& rNewAttrTab,
- bool bSetNewStart = false );
+ void RestoreAttrTab( _HTMLAttrTable& rNewAttrTab );
void InsertAttr( const SfxPoolItem& rItem, bool bLikePara = false,
bool bInsAtStart=false );
void InsertAttrs( _HTMLAttrs& rAttrs );
@@ -767,9 +766,8 @@ private:
sal_Int16 eVertOri,
sal_Int16 eHoriOri,
SfxItemSet& rCSS1ItemSet,
- SvxCSS1PropertyInfo& rCSS1PropInfo,
- bool bHidden=false );
- css::uno::Reference< css::drawing::XShape > InsertControl(
+ SvxCSS1PropertyInfo& rCSS1PropInfo );
+ css::uno::Reference< css::drawing::XShape > InsertControl(
const css::uno::Reference< css::form::XFormComponent > & rFormComp,
const css::uno::Reference< css::beans::XPropertySet > & rFCompPropSet,
const Size& rSize,
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 2968d9f..247b342 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -434,7 +434,7 @@ public:
void OutAndSetDefList( sal_uInt16 nNewLvl );
- void OutStyleSheet( const SwPageDesc& rPageDesc, bool bUsed=true );
+ void OutStyleSheet( const SwPageDesc& rPageDesc );
inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
const sal_Char *pVal );
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index d9d52fb..ad02fe8 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -364,7 +364,7 @@ SwChapterNumRules* SwModule::GetChapterNumRules()
return m_pChapterNumRules;
}
-void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData, bool /*bOnlyIfAvailable*/)
+void SwModule::ShowDBObj(SwView& rView, const SwDBData& rData)
{
Reference<XFrame> xFrame = rView.GetViewFrame()->GetFrame().GetFrameInterface();
Reference<XDispatchProvider> xDP(xFrame, uno::UNO_QUERY);
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 84f06ec9..11fe98d 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2280,9 +2280,9 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe
return nFound;
}
-void SwView::EnableMailMerge(bool bEnable )
+void SwView::EnableMailMerge()
{
- m_bInMailMerge = bEnable;
+ m_bInMailMerge = true;
SfxBindings& rBind = GetViewFrame()->GetBindings();
rBind.Invalidate(FN_INSERT_FIELD_DATA_ONLY);
rBind.Update(FN_INSERT_FIELD_DATA_ONLY);
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index d0989d6..0c16fc6 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -666,7 +666,7 @@ bool SwView::SearchAndWrap(bool bApi)
return m_bFound;
}
-bool SwView::SearchAll(sal_uInt16* pFound)
+bool SwView::SearchAll()
{
SwWait aWait( *GetDocShell(), true );
m_pWrtShell->StartAllAction();
@@ -685,8 +685,6 @@ bool SwView::SearchAll(sal_uInt16* pFound)
}
m_bExtra = false;
sal_uInt16 nFound = (sal_uInt16)FUNC_Search( aOpts );
- if(pFound)
- *pFound = nFound;
m_bFound = 0 != nFound;
m_pWrtShell->EndAllAction();
commit 2ac1c2f75e5f020fbb8c2c98b00ef32faa4770aa
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 26 15:25:53 2016 +0200
loplugin:unuseddefaultparam in sw (part1)
Change-Id: I08b57f3b30e2f1892da54965a0f53de00363b8bd
diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx
index 583fa77..31823fe 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -295,7 +295,7 @@ void SwFltControlStack::DeleteAndDestroy(Entries::size_type nCnt)
// type. This makes them disappear from the doc structure. Only
// attributes from the same paragraph as rPos are removed. Used for
// graphic apos -> images.
-void SwFltControlStack::StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId)
+void SwFltControlStack::StealAttr(const SwNodeIndex& rNode)
{
size_t nCnt = m_Entries.size();
@@ -303,8 +303,7 @@ void SwFltControlStack::StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId)
{
nCnt --;
SwFltStackEntry& rEntry = *m_Entries[nCnt];
- if (rEntry.m_aPtPos.m_nNode.GetIndex()+1 == rNode.GetIndex() &&
- (!nAttrId || nAttrId == rEntry.pAttr->Which()))
+ if (rEntry.m_aPtPos.m_nNode.GetIndex()+1 == rNode.GetIndex())
{
DeleteAndDestroy(nCnt); // loesche aus dem Stack
}
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 9395e49..1eacca5 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -520,10 +520,9 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
const OUString& rAlternateText,
- sal_uInt32 nFrameOpts,
- const OString &rEndTags )
+ sal_uInt32 nFrameOpts )
{
- OString sRetEndTags(rEndTags);
+ OString sRetEndTags;
OStringBuffer sOut;
const SfxPoolItem* pItem;
const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
@@ -796,11 +795,10 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
{
sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_linebreak).
append(' ').append(OOO_STRING_SVTOOLS_HTML_O_clear).
- append("=\"").append(pStr).append("\">").append(rEndTags);
+ append("=\"").append(pStr).append("\">");
sRetEndTags = sOut.makeStringAndClear();
}
}
- assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
return sRetEndTags;
}
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index bdadc0f..2968d9f 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -464,7 +464,7 @@ public:
// Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
// rEndTags anhaengen
OString OutFrameFormatOptions( const SwFrameFormat& rFrameFormat, const OUString& rAltText,
- sal_uInt32 nFrameOpts, const OString& rEndTags = OString() );
+ sal_uInt32 nFrameOpts );
void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrameOpts);
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index d4eab5a..c83c360 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -174,7 +174,7 @@ public:
virtual SwFltStackEntry* SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, bool bTstEnde=true, long nHand = LONG_MAX, bool consumedByField=false);
- void StealAttr(const SwNodeIndex& rNode, sal_uInt16 nAttrId = 0);
+ void StealAttr(const SwNodeIndex& rNode);
void MarkAllAttrsOld();
void KillUnlockedAttrs(const SwPosition& pPos);
SfxPoolItem* GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = nullptr);
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index a3157b6..951e6e7 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -440,9 +440,6 @@ namespace sw
@param rTextNd
The TextNode we want to ranges from
- @param nStart
- The position in the TextNode to start processing from
-
@return STL container of CharRuns which describe the shared
direction, script and optionally script of the contiguous sequences
of characters
@@ -452,8 +449,7 @@ namespace sw
@see #i22537# for example
*/
- CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd,
- sal_Int32 nStart = 0);
+ CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd);
}
}
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index 828c4f9..49f4a19 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -33,7 +33,7 @@ typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
- bool bDeep, bool bTstForDefault = true );
+ bool bDeep );
/* Funktionspointer auf die Node-Write-Funktionen */
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 0339b1e..6eca856 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -40,8 +40,7 @@ Writer& Out( const SwAttrFnTab pTab, const SfxPoolItem& rHt, Writer & rWrt )
}
Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
- const SfxItemSet& rSet, bool bDeep,
- bool bTstForDefault )
+ const SfxItemSet& rSet, bool bDeep )
{
// at first give the own attributes out
const SfxItemPool& rPool = *rSet.GetPool();
@@ -89,11 +88,10 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
while( nWhich )
{
if( SfxItemState::SET == pSet->GetItemState( nWhich, bDeep, &pItem ) &&
- ( !bTstForDefault || (
- *pItem != rPool.GetDefaultItem( nWhich )
+ ( *pItem != rPool.GetDefaultItem( nWhich )
|| ( pSet->GetParent() &&
*pItem != pSet->GetParent()->Get( nWhich ))
- )))
+ ))
{
if( nullptr != ( pOut = pTab[ nWhich - RES_CHRATR_BEGIN] ))
{
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index c0e1e97..0ccfe9c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -160,7 +160,7 @@ void DocxExport::AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sa
m_pAttrOutput->WriteBookmarks_Impl( aStarts, aEnds );
}
-void DocxExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
+void DocxExport::AppendBookmark( const OUString& rName )
{
std::vector< OUString > aStarts;
std::vector< OUString > aEnds;
diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx
index 42eaeca..30fe795 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -131,7 +131,7 @@ public:
virtual void AppendBookmarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override;
+ virtual void AppendBookmark( const OUString& rName ) override;
virtual void AppendAnnotationMarks( const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen ) override;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index fabc821..8292557 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -128,7 +128,7 @@ void RtfExport::AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_
m_pAttrOutput->WriteBookmarks_Impl(aStarts, aEnds);
}
-void RtfExport::AppendBookmark(const OUString& rName, bool /*bSkip*/)
+void RtfExport::AppendBookmark(const OUString& rName)
{
std::vector<OUString> aStarts;
std::vector<OUString> aEnds;
diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx
index dae04b5..845dfc7 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -83,7 +83,7 @@ public:
virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override;
- virtual void AppendBookmark(const OUString& rName, bool bSkip = false) override;
+ virtual void AppendBookmark(const OUString& rName) override;
virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32 nLen) override;
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index aeeced9..c25dbf9 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -516,8 +516,7 @@ namespace sw
return nA < nB;
}
- CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd,
- sal_Int32 nTextStart)
+ CharRuns GetPseudoCharRuns(const SwTextNode& rTextNd)
{
const OUString &rText = rTextNd.GetText();
@@ -657,7 +656,7 @@ namespace sw
}
aRunChanges.erase(std::remove_if(aRunChanges.begin(),
- aRunChanges.end(), myImplHelpers::IfBeforeStart(nTextStart)), aRunChanges.end());
+ aRunChanges.end(), myImplHelpers::IfBeforeStart(0/*nTextStart*/)), aRunChanges.end());
return aRunChanges;
}
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c6e6d18..f621e9c 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1503,9 +1503,9 @@ void WW8Export::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
m_pBkmks->MoveFieldMarks(nFrom, nTo);
}
-void WW8Export::AppendBookmark( const OUString& rName, bool bSkip )
+void WW8Export::AppendBookmark( const OUString& rName )
{
- sal_uLong nSttCP = Fc2Cp( Strm().Tell() ) + ( bSkip? 1: 0 );
+ sal_uLong nSttCP = Fc2Cp( Strm().Tell() );
m_pBkmks->Append( nSttCP, rName );
}
@@ -1680,7 +1680,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
}
void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
- sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen)
+ sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf)
{
sal_uInt16 n, nCount = static_cast< sal_uInt16 >(rStrings.size());
if( nCount )
@@ -1696,8 +1696,6 @@ void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
const OUString& rNm = rStrings[n];
SwWW8Writer::WriteShort( rStrm, rNm.getLength() );
SwWW8Writer::WriteString16(rStrm, rNm, false);
- if( nExtraLen )
- SwWW8Writer::FillCount(rStrm, nExtraLen);
}
rlcbSttbf = rStrm.Tell() - rfcSttbf;
}
@@ -1793,14 +1791,14 @@ void SwWW8Writer::WriteString8(SvStream& rStrm, const OUString& rStr,
rStrm.Write(&aBytes[0], aBytes.size());
}
-void WW8Export::WriteStringAsPara( const OUString& rText, sal_uInt16 nStyleId )
+void WW8Export::WriteStringAsPara( const OUString& rText )
{
if( !rText.isEmpty() )
OutSwString(rText, 0, rText.getLength());
WriteCR(); // CR thereafter
ww::bytes aArr;
- SwWW8Writer::InsUInt16( aArr, nStyleId );
+ SwWW8Writer::InsUInt16( aArr, 0/*nStyleId*/ );
if( m_bOutTable )
{ // Tab-Attr
// sprmPFInTable
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 10e639b..ee140b5 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -677,7 +677,7 @@ public:
virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) = 0;
+ virtual void AppendBookmark( const OUString& rName ) = 0;
virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) = 0;
@@ -1037,7 +1037,7 @@ public:
tools::SvRef<SotStorage> xObjStg, OUString &rStorageName, SwOLENode *pOLENd);
virtual void AppendBookmarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override;
- virtual void AppendBookmark( const OUString& rName, bool bSkip = false ) override;
+ virtual void AppendBookmark( const OUString& rName ) override;
virtual void AppendAnnotationMarks( const SwTextNode& rNd, sal_Int32 nAktPos, sal_Int32 nLen ) override;
@@ -1049,7 +1049,7 @@ public:
void MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo);
void WriteAsStringTable(const ::std::vector<OUString>&, sal_Int32& rfcSttbf,
- sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen = 0);
+ sal_Int32& rlcbSttbf);
virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
@@ -1107,7 +1107,7 @@ public:
void InsUInt16( sal_uInt16 n ) { SwWW8Writer::InsUInt16( *pO, n ); }
void InsUInt32( sal_uInt32 n ) { SwWW8Writer::InsUInt32( *pO, n ); }
- void WriteStringAsPara( const OUString& rText, sal_uInt16 nStyleId = 0 );
+ void WriteStringAsPara( const OUString& rText );
/// Setup the exporter.
WW8Export( SwWW8Writer *pWriter,
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index effdf1a..fc39df1 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -683,9 +683,9 @@ public:
virtual WW8_FC Where() override;
// returns reference descriptors
- const void* GetData( long nIdx = -1 ) const
+ const void* GetData() const
{
- return pRef ? pRef->GetData( -1L == nIdx ? pRef->GetIdx() : nIdx ) : nullptr;
+ return pRef ? pRef->GetData( pRef->GetIdx() ) : nullptr;
}
virtual void GetSprms(WW8PLCFxDesc* p) override;
diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx
index 3fffd77..53f48c56 100644
--- a/sw/source/filter/xml/xmlitmap.hxx
+++ b/sw/source/filter/xml/xmlitmap.hxx
@@ -66,8 +66,7 @@ public:
virtual ~SvXMLItemMapEntries();
SvXMLItemMapEntry* getByName( sal_uInt16 nNameSpace,
- const OUString& rString,
- SvXMLItemMapEntry* pStartAt = nullptr ) const;
+ const OUString& rString ) const;
SvXMLItemMapEntry& getByIndex( sal_uInt16 nIndex ) const;
sal_uInt16 getCount() const;
diff --git a/sw/source/filter/xml/xmlitmpr.cxx b/sw/source/filter/xml/xmlitmpr.cxx
index 87f3b4d..bd4f109 100644
--- a/sw/source/filter/xml/xmlitmpr.cxx
+++ b/sw/source/filter/xml/xmlitmpr.cxx
@@ -49,12 +49,9 @@ SvXMLItemMapEntries::~SvXMLItemMapEntries()
}
SvXMLItemMapEntry* SvXMLItemMapEntries::getByName( sal_uInt16 nNameSpace,
- const OUString& rString,
- SvXMLItemMapEntry* pStartAt /* = NULL */ ) const
+ const OUString& rString ) const
{
- SvXMLItemMapEntry* pMap =
- (pStartAt && (pStartAt->eLocalName!=XML_TOKEN_INVALID)) ?
- &(pStartAt[1]) : mpImpl->mpEntries;
+ SvXMLItemMapEntry* pMap = mpImpl->mpEntries;
while( pMap && (pMap->eLocalName != XML_TOKEN_INVALID) )
{
if( pMap->nNameSpace == nNameSpace &&
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index e778659..80326ed 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void
// Internal: Perform functions through the Dispatcher
bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
sal_uInt16 nId, const OUString &rStr, const OUString& rRefStr, sal_uInt16 nFamily,
- sal_uInt16 nMask, const sal_uInt16* pModifier)
+ sal_uInt16 nMask)
{
SfxDispatcher &rDispatcher = *SfxViewShell::Current()->GetDispatcher();
@@ -366,10 +366,9 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl(
pItems[ nCount++ ] = nullptr;
- sal_uInt16 nModi = pModifier ? *pModifier : 0;
const SfxPoolItem* mpItem = rDispatcher.Execute(
nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
- pItems, nModi );
+ pItems );
if ( !mpItem )
return false;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index fddd157..4edd8f2 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -278,10 +278,9 @@ void SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
}
}
-void SwFieldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
- const ListBox* pLst3 )
+void SwFieldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2 )
{
- const ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 };
+ const ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, nullptr };
const ListBox** ppLB = aLBArr;
for( int i = 0; i < coLBCount; ++i, ++ppLB )
@@ -291,12 +290,12 @@ void SwFieldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
m_aLstStrArr[ i ].clear();
}
-void SwFieldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
+void SwFieldPage::RestorePos(ListBox* pLst1, ListBox* pLst2)
{
sal_Int32 nPos = 0;
- ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 };
+ ListBox* aLBArr [ 2 ] = { pLst1, pLst2 };
ListBox** ppLB = aLBArr;
- for( int i = 0; i < coLBCount; ++i, ++ppLB )
+ for( int i = 0; i < 2; ++i, ++ppLB )
if( (*ppLB) && (*ppLB)->GetEntryCount() && !m_aLstStrArr[ i ].isEmpty() &&
LISTBOX_ENTRY_NOTFOUND !=
( nPos = (*ppLB)->GetEntryPos(m_aLstStrArr[ i ] ) ) )
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 273d9d1..ac0a155 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -61,10 +61,8 @@ protected:
void Init();
void SavePos( const ListBox* pLst1,
- const ListBox* pLst2 = nullptr,
- const ListBox* pLst3 = nullptr);
- void RestorePos( ListBox* pLst1, ListBox* pLst2 = nullptr,
- ListBox* pLst3 = nullptr );
+ const ListBox* pLst2 = nullptr);
+ void RestorePos( ListBox* pLst1, ListBox* pLst2 = nullptr );
void EnableInsert(bool bEnable = true);
inline bool IsFieldEdit() const { return m_bFieldEdit; }
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 272e789..cee23c3 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -926,14 +926,11 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, StandardHdl, Button*, void)
}
#ifdef DBG_UTIL
-void SwNumPositionTabPage::SetModified(bool bRepaint)
+void SwNumPositionTabPage::SetModified()
{
bModified = true;
- if(bRepaint)
- {
- m_pPreviewWIN->SetLevel(nActNumLvl);
- m_pPreviewWIN->Invalidate();
- }
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
#endif
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 9fd1325..97f59f5 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -290,9 +290,9 @@ void SwAddressPreview::SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns)
UpdateScrollBar();
}
-void SwAddressPreview::EnableScrollBar(bool bEnable)
+void SwAddressPreview::EnableScrollBar()
{
- pImpl->bEnableScrollBar = bEnable;
+ pImpl->bEnableScrollBar = true;
}
void SwAddressPreview::UpdateScrollBar()
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 6dbd5ea..3976cbf 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1554,38 +1554,21 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
return bRet;
}
-SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
- const Point* pPt )
+SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh )
{
SotExchangeDest nRet = SotExchangeDest::NONE;
- ObjCntType eOType;
- if( pPt )
- {
- SdrObject *pObj = nullptr;
- eOType = rSh.GetObjCntType( *pPt, pObj );
- }
- else
- eOType = rSh.GetObjCntTypeOfSelection();
+ ObjCntType eOType = rSh.GetObjCntTypeOfSelection();
switch( eOType )
{
case OBJCNT_GRF:
{
bool bIMap, bLink;
- if( pPt )
- {
- bIMap = nullptr != rSh.GetFormatFromObj( *pPt )->GetURL().GetMap();
- OUString aDummy;
- rSh.GetGrfAtPos( *pPt, aDummy, bLink );
- }
- else
- {
- bIMap = nullptr != rSh.GetFlyFrameFormat()->GetURL().GetMap();
- OUString aDummy;
- rSh.GetGrfNms( &aDummy, nullptr );
- bLink = !aDummy.isEmpty();
- }
+ bIMap = nullptr != rSh.GetFlyFrameFormat()->GetURL().GetMap();
+ OUString aDummy;
+ rSh.GetGrfNms( &aDummy, nullptr );
+ bLink = !aDummy.isEmpty();
if( bLink && bIMap )
nRet = SotExchangeDest::DOC_LNKD_GRAPH_W_IMAP;
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index beab06b..b8aed6c 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -257,11 +257,11 @@ void SwFieldMgr::RemoveFieldType(sal_uInt16 nResId, const OUString& rName )
pSh->RemoveFieldType(nResId, rName);
}
-size_t SwFieldMgr::GetFieldTypeCount(sal_uInt16 nResId) const
+size_t SwFieldMgr::GetFieldTypeCount() const
{
SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell();
OSL_ENSURE(pSh, "no SwWrtShell found");
- return pSh ? pSh->GetFieldTypeCount(nResId) : 0;
+ return pSh ? pSh->GetFieldTypeCount() : 0;
}
SwFieldType* SwFieldMgr::GetFieldType(sal_uInt16 nResId, size_t nField) const
@@ -1651,7 +1651,7 @@ void SwFieldMgr::SetMacroPath(const OUString& rPath)
}
}
-sal_uLong SwFieldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal)
+sal_uLong SwFieldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter)
{
double fValue;
short nDefFormat;
@@ -1691,9 +1691,6 @@ sal_uLong SwFieldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumbe
break;
}
- if (pVal)
- *pVal = fValue;
-
return pFormatter->GetStandardFormat(nDefFormat, GetCurrLanguage());
}
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 87e8a3f..ba0c9ad 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -180,8 +180,7 @@ void SwFlyFrameAttrMgr::InsertFlyFrame()
// Not-allowed values of the enumeration type get corrected.
void SwFlyFrameAttrMgr::InsertFlyFrame(RndStdIds eAnchorType,
const Point &rPos,
- const Size &rSize,
- bool bAbs )
+ const Size &rSize )
{
OSL_ENSURE( eAnchorType == FLY_AT_PAGE ||
eAnchorType == FLY_AT_PARA ||
@@ -189,10 +188,7 @@ void SwFlyFrameAttrMgr::InsertFlyFrame(RndStdIds eAnchorType,
eAnchorType == FLY_AT_FLY ||
eAnchorType == FLY_AS_CHAR, "invalid frame type" );
- if ( bAbs )
- SetAbsPos( rPos );
- else
- SetPos( rPos );
+ SetPos( rPos );
SetSize( rSize );
SetAnchor( eAnchorType );
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index c9bfb46..389a3bc 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -66,7 +66,7 @@ public:
void InsertSymbol(SfxRequest& rReq);
- void ExecSearch(SfxRequest&, bool bNoMessage = false);
+ void ExecSearch(SfxRequest&);
void StateSearch(SfxItemSet &);
virtual ::svl::IUndoManager*
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index d73c78d..d80a034 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -148,8 +148,8 @@ public:
// previous and next of the same type
bool GoNextPrev( bool bNext = true, SwFieldType* pTyp = nullptr );
- bool GoNext( SwFieldType* pTyp = nullptr ) { return GoNextPrev( true, pTyp ); }
- bool GoPrev( SwFieldType* pTyp = nullptr ) { return GoNextPrev( false, pTyp ); }
+ bool GoNext() { return GoNextPrev(); }
+ bool GoPrev() { return GoNextPrev( false ); }
bool IsDBNumeric(const OUString& rDBName, const OUString& rTableQryName,
bool bIsTable, const OUString& rFieldName);
@@ -158,7 +158,7 @@ public:
bool CanInsertRefMark( const OUString& rStr );
// access to field types via ResId
- size_t GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX) const;
+ size_t GetFieldTypeCount() const;
SwFieldType* GetFieldType(sal_uInt16 nResId, size_t nField = 0) const;
SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
@@ -187,7 +187,7 @@ public:
sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode = false) const;
OUString GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
- sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = nullptr);
+ sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter);
// turn off evaluation of expression fields for insertation
// of many expression fields (see labels)
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index c37c3bd..676449f 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -108,8 +108,7 @@ public:
void InsertFlyFrame();
void InsertFlyFrame(RndStdIds eAnchorType,
const Point &rPos,
- const Size &rSize,
- bool bAbsPos = false);
+ const Size &rSize);
// check and change metrics
void ValidateMetrics(SvxSwFrameValidation& rVal,
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 97fc259..cc2f3f6 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -103,8 +103,8 @@ public:
SfxChildWinInfo* );
virtual ~SwInputChild();
SFX_DECL_CHILDWINDOW_WITHID( SwInputChild );
- void SetFormula( const OUString& rFormula, bool bDelSel = true )
- { static_cast<SwInputWindow*>(GetWindow())->SetFormula( rFormula, bDelSel ); }
+ void SetFormula( const OUString& rFormula )
+ { static_cast<SwInputWindow*>(GetWindow())->SetFormula( rFormula ); }
const SwView* GetView() const
{ return static_cast<SwInputWindow*>(GetWindow())->GetView();}
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index b8613a7..36012db 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -103,7 +103,7 @@ public:
// set the number of rows and columns of addresses
void SetLayout(sal_uInt16 nRows, sal_uInt16 nColumns);
- void EnableScrollBar(bool bEnable = true);
+ void EnableScrollBar();
// fill the actual data into a string (address block or greeting)
static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem& rConfigItem,
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index fb5880b..9ec51ae 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -120,15 +120,12 @@ public:
void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
void SetWrtShell(SwWrtShell* pSh);
#ifdef DBG_UTIL
- void SetModified(bool bRepaint = true);
+ void SetModified();
#else
- void SetModified(bool bRepaint = true)
+ void SetModified()
{ bModified = true;
- if(bRepaint)
- {
- m_pPreviewWIN->SetLevel(nActNumLvl);
- m_pPreviewWIN->Invalidate();
- }
+ m_pPreviewWIN->SetLevel(nActNumLvl);
+ m_pPreviewWIN->Invalidate();
}
#endif
};
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 6b794a7..daa0b89 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -63,8 +63,7 @@ class SwParagraphNumTabPage : public SfxTabPage
protected:
static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
- sal_uInt16 nFamily, sal_uInt16 nMask = 0,
- const sal_uInt16* pModifier = nullptr );
+ sal_uInt16 nFamily, sal_uInt16 nMask = 0 );
public:
SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index 6e69899..b035555 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -54,7 +54,7 @@ public:
void SetLoseFocusHdl(const Link<Control&,void>& rLink) { m_pField->SetLoseFocusHdl(rLink); }
void SetMetric(FieldUnit eUnit) { ::SetMetric(*m_pField, eUnit); }
void Enable(bool bEnable = true, bool bChild = true) { m_pField->Enable(bEnable, bChild); }
- void Disable(bool bChild = true) { m_pField->Disable(bChild); }
+ void Disable() { m_pField->Disable(); }
bool HasFocus() const { return m_pField->HasFocus(); }
void SetAccessibleName(const OUString& rName) { m_pField->SetAccessibleName(rName); }
void SetText(const OUString& rStr) { m_pField->SetText(rStr); }
@@ -65,7 +65,7 @@ public:
void SetMetricFieldMin(sal_Int64 nNewMin) { m_pField->SetMin(nNewMin); }
void SetMetricFieldMax(sal_Int64 nNewMax) { m_pField->SetMax(nNewMax); }
- void SetValue(sal_Int64 nNewValue, FieldUnit eInUnit = FUNIT_NONE) { m_pField->SetValue(nNewValue, eInUnit); }
+ void SetValue(sal_Int64 nNewValue) { m_pField->SetValue(nNewValue, FUNIT_NONE); }
void SetLast(sal_Int64 nNewLast) { m_pField->SetLast(nNewLast); }
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 4537551..9a92d4b 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -190,7 +190,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
bool mbResetFormDesignMode:1;
bool mbFormDesignModeToReset:1;
- SAL_DLLPRIVATE void Init(const SwViewOption* = nullptr);
+ SAL_DLLPRIVATE void Init();
SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
SAL_DLLPRIVATE void _CreateScrollbar( bool bHori);
@@ -239,7 +239,7 @@ public:
void DocSzChgd(const Size& rNewSize);
- void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
+ void SetVisArea( const Rectangle& );
void ScrollViewSzChg();
void ScrollDocSzChg();
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 852fbe6..804311f 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -149,7 +149,7 @@ public:
SwTransferable( SwWrtShell& );
virtual ~SwTransferable();
- static SotExchangeDest GetSotDestination( const SwWrtShell& rSh, const Point* = nullptr );
+ static SotExchangeDest GetSotDestination( const SwWrtShell& rSh );
// set properties on the document, like PageMargin, VisArea.
// And set real Size
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 299dbb0..636a4d4 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -189,11 +189,10 @@ public:
bool IsUpdateFields()const {return eFieldUpdateFlags != AUTOUPD_OFF; }
SwFieldUpdateFlags GetFieldUpdateFlags()const {return eFieldUpdateFlags;}
- void SetFieldUpdateFlags(SwFieldUpdateFlags eSet, bool bNoModify = false)
+ void SetFieldUpdateFlags(SwFieldUpdateFlags eSet)
{
eFieldUpdateFlags = eSet;
- if(!bNoModify)
- aContentConfig.SetModified();
+ aContentConfig.SetModified();
}
void SetUpdateCharts(bool bSet, bool bNoModify = false)
@@ -221,33 +220,30 @@ public:
aLayoutConfig.SetModified();
}
- bool IsHScrollMetric()const {return bIsHScrollMetricSet;}
+ bool IsHScrollMetric()const {return bIsHScrollMetricSet;}
FieldUnit GetHScrollMetric() const { return bIsHScrollMetricSet ? eHScrollMetric : eUserMetric;}
- void SetHScrollMetric(FieldUnit eSet, bool bNoModify = false)
+ void SetHScrollMetric(FieldUnit eSet)
{
eHScrollMetric = eSet; bIsHScrollMetricSet = true;
- if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
- bool IsVScrollMetric()const {return bIsVScrollMetricSet;}
+ bool IsVScrollMetric()const {return bIsVScrollMetricSet;}
FieldUnit GetVScrollMetric() const { return bIsVScrollMetricSet ? eVScrollMetric : eUserMetric;}
- void SetVScrollMetric(FieldUnit eSet, bool bNoModify = false)
+ void SetVScrollMetric(FieldUnit eSet)
{
eVScrollMetric = eSet; bIsVScrollMetricSet = true;
- if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
bool IsApplyCharUnit() const
{
return bApplyCharUnit;
}
- void SetApplyCharUnit(bool bSet, bool bNoModify = false)
+ void SetApplyCharUnit(bool bSet)
{
bApplyCharUnit = bSet;
- if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
sal_Int32 GetDefTab() const { return nDefTab;}
@@ -259,7 +255,7 @@ public:
}
//default page mode for text grid
- bool IsSquaredPageMode() const {return bIsSquaredPageMode;}
+ bool IsSquaredPageMode() const {return bIsSquaredPageMode;}
void SetDefaultPageMode( bool bVal, bool bNoModify = false )
{
bIsSquaredPageMode = bVal;
@@ -267,12 +263,11 @@ public:
aLayoutConfig.SetModified();
}
- bool IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
- void SetAlignMathObjectsToBaseline( bool bVal, bool bNoModify = false )
+ bool IsAlignMathObjectsToBaseline() const { return bIsAlignMathObjectsToBaseline; }
+ void SetAlignMathObjectsToBaseline( bool bVal )
{
bIsAlignMathObjectsToBaseline = bVal;
- if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
};
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index e6c0775..73715d1 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -878,9 +878,9 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
}
}
-void SwAnnotationShell::ExecSearch(SfxRequest& rReq, bool bNoMessage)
+void SwAnnotationShell::ExecSearch(SfxRequest& rReq)
{
- rView.ExecSearch(rReq,bNoMessage);
+ rView.ExecSearch(rReq);
}
void SwAnnotationShell::StateSearch(SfxItemSet &rSet)
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index dde7d2b..782b127 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1117,7 +1117,7 @@ void SwPagePreview::StateUndo(SfxItemSet& rSet)
}
}
-void SwPagePreview::Init(const SwViewOption * pPrefs)
+void SwPagePreview::Init()
{
if ( GetViewShell()->HasDrawView() )
GetViewShell()->GetDrawView()->SetAnimationEnabled( false );
@@ -1128,8 +1128,7 @@ void SwPagePreview::Init(const SwViewOption * pPrefs)
// the handler, because the shell is unknown to the SFX management
// within the CTOR phase.
- if( !pPrefs )
- pPrefs = SW_MOD()->GetUsrPref(false);
+ const SwViewOption * pPrefs = SW_MOD()->GetUsrPref(false);
mbHScrollbarEnabled = pPrefs->IsViewHScrollBar();
mbVScrollbarEnabled = pPrefs->IsViewVScrollBar();
@@ -1371,7 +1370,7 @@ void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize )
*pVScrollbar, *pHScrollbar, *pScrollFill );
}
-void SwPagePreview::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
+void SwPagePreview::SetVisArea( const Rectangle &rRect )
{
const Point aTopLeft(AlignToPixel(rRect.TopLeft()));
const Point aBottomRight(AlignToPixel(rRect.BottomRight()));
@@ -1414,7 +1413,7 @@ void SwPagePreview::SetVisArea( const Rectangle &rRect, bool bUpdateScrollbar )
// Set at View-Win the current size
aVisArea = aLR;
pViewWin->SetWinSize( aLR.GetSize() );
- ChgPage( SwPagePreviewWin::MV_NEWWINSIZE, bUpdateScrollbar );
+ ChgPage( SwPagePreviewWin::MV_NEWWINSIZE );
pViewWin->Invalidate();
}
commit 83911dd753fbfd0328bae2dfa37d19f514d4b2f9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 26 14:48:09 2016 +0200
loplugin:unuseddefaultparam in ucb
Change-Id: Ie0ea0b4dc13271a2bde5e3843bb3f8042ab880b4
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index bf74e2a..b8e6bce 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -378,10 +378,9 @@ public:
RegexpMap & operator =(RegexpMap const & rOther);
- void add(OUString const & rKey, Val const & rValue, bool bOverwrite,
- OUString * pReverse = nullptr);
+ void add(OUString const & rKey, Val const & rValue, bool bOverwrite);
- iterator find(OUString const & rKey, OUString * pReverse = nullptr);
+ iterator find(OUString const & rKey);
void erase(iterator const & rPos);
@@ -396,7 +395,7 @@ public:
size_type size() const;
Val const * map(OUString const & rString,
- OUString * pTranslation = nullptr, bool * pTranslated = nullptr)
+ OUString * pTranslation = nullptr)
const;
private:
@@ -428,7 +427,7 @@ RegexpMap< Val > & RegexpMap< Val >::operator =(RegexpMap const & rOther)
template< typename Val >
void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue,
- bool bOverwrite, rtl::OUString * pReverse)
+ bool bOverwrite)
{
Regexp aRegexp(Regexp::parse(rKey));
@@ -463,20 +462,13 @@ void RegexpMap< Val >::add(rtl::OUString const & rKey, Val const & rValue,
rTheList.push_back(Entry< Val >(aRegexp, rValue));
}
-
- if (pReverse)
- *pReverse = aRegexp.getRegexp(true);
}
template< typename Val >
-typename RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey,
- rtl::OUString * pReverse)
+typename RegexpMap< Val >::iterator RegexpMap< Val >::find(rtl::OUString const & rKey)
{
Regexp aRegexp(Regexp::parse(rKey));
- if (pReverse)
- *pReverse = aRegexp.getRegexp(true);
-
if (aRegexp.isDefault())
{
if (m_pImpl->m_pDefault)
@@ -554,8 +546,7 @@ typename RegexpMap< Val >::size_type RegexpMap< Val >::size() const
template< typename Val >
Val const * RegexpMap< Val >::map(rtl::OUString const & rString,
- rtl::OUString * pTranslation,
- bool * pTranslated) const
+ rtl::OUString * pTranslation) const
{
for (int n = Regexp::KIND_DOMAIN; n >= Regexp::KIND_PREFIX; --n)
{
@@ -564,12 +555,12 @@ Val const * RegexpMap< Val >::map(rtl::OUString const & rString,
typename List< Val >::const_iterator aEnd(rTheList.end());
for (typename List< Val >::const_iterator aIt(rTheList.begin()); aIt != aEnd;
++aIt)
- if (aIt->m_aRegexp.matches(rString, pTranslation, pTranslated))
+ if (aIt->m_aRegexp.matches(rString, pTranslation, nullptr))
return &aIt->m_aValue;
}
if (m_pImpl->m_pDefault
&& m_pImpl->m_pDefault->m_aRegexp.matches(rString, pTranslation,
- pTranslated))
+ nullptr))
return &m_pImpl->m_pDefault->m_aValue;
return 0;
}
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index 1b1bb43..34a9a06 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -214,8 +214,7 @@ const PropertyValue * ContentProperties::get(
// static
void ContentProperties::UCBNamesToDAVNames(
const uno::Sequence< beans::Property > & rProps,
- std::vector< OUString > & propertyNames,
- bool bIncludeUnmatched /* = true */ )
+ std::vector< OUString > & propertyNames )
{
// Assemble list of DAV properties to obtain from server.
@@ -291,8 +290,7 @@ void ContentProperties::UCBNamesToDAVNames(
}
else
{
- if ( bIncludeUnmatched )
- propertyNames.push_back( rProp.Name );
+ propertyNames.push_back( rProp.Name );
}
}
}
@@ -301,8 +299,7 @@ void ContentProperties::UCBNamesToDAVNames(
// static
void ContentProperties::UCBNamesToHTTPNames(
const uno::Sequence< beans::Property > & rProps,
- std::vector< OUString > & propertyNames,
- bool bIncludeUnmatched /* = true */ )
+ std::vector< OUString > & propertyNames )
{
// Assemble list of HTTP header names to obtain from server.
@@ -336,8 +333,7 @@ void ContentProperties::UCBNamesToHTTPNames(
}
else
{
- if ( bIncludeUnmatched )
- propertyNames.push_back( rProp.Name );
+ propertyNames.push_back( rProp.Name );
}
}
}
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
index e3f6bf0..3150f85 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx
@@ -99,25 +99,23 @@ public:
// Maps the UCB property names contained in rProps with their DAV property
// counterparts, if possible. All unmappable properties will be included
- // unchanged in resulting vector unless bIncludeUnmatched is set to false.
+ // unchanged in resulting vector.
// The vector filles by this method can directly be handed over to
// DAVResourceAccess::PROPFIND. The result from PROPFIND
// (vector< DAVResource >) can be used to create a ContentProperties
// instance which can map DAV properties back to UCB properties.
static void UCBNamesToDAVNames( const css::uno::Sequence< css::beans::Property > & rProps,
- std::vector< OUString > & resources,
- bool bIncludeUnmatched = true );
+ std::vector< OUString > & resources );
// Maps the UCB property names contained in rProps with their HTTP header
// counterparts, if possible. All unmappable properties will be included
- // unchanged in resulting vector unless bIncludeUnmatched is set to false.
+ // unchanged in resulting vector.
// The vector filles by this method can directly be handed over to
// DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >)
// can be used to create a ContentProperties instance which can map header
// names back to UCB properties.
static void UCBNamesToHTTPNames( const css::uno::Sequence< css::beans::Property > & rProps,
- std::vector< OUString > & resources,
- bool bIncludeUnmatched = true );
+ std::vector< OUString > & resources );
// return true, if all properties contained in rProps are contained in
// this ContentProperties instance. Otherwiese, false will be returned.
diff --git a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
index 10b4cec..3a2e566 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx
@@ -61,7 +61,7 @@ using namespace webdav_ucp;
bool ContentProvider::getProperty(
- const OUString & rPropName, beans::Property & rProp, bool bStrict )
+ const OUString & rPropName, beans::Property & rProp )
{
if ( !m_pProps )
{
@@ -269,9 +269,6 @@ bool ContentProvider::getProperty(
}
else
{
- if ( bStrict )
- return false;
-
// All unknown props are treated as:
rProp = beans::Property(
rPropName,
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index 2cb16a4..60ba57d 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -118,8 +118,7 @@ public:
// Non-interface methods.
bool getProperty( const OUString & rPropName,
- css::beans::Property & rProp,
- bool bStrict = false );
+ css::beans::Property & rProp );
};
}
commit 1110346b3b8e57a190366aabebb62e53c6ab6d01
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 26 14:44:03 2016 +0200
loplugin:unuseddefaultparam in unotools
Change-Id: Icb2dc74263026d90b7998b3fd880fd5d2c67a3b7
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index d46ecda..264842d 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -279,7 +279,7 @@ namespace utl
given node path does not exist) are still asserted.</p>
*/
static OConfigurationTreeRoot tryCreateWithComponentContext( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true );
+ const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE );
/** commit all changes made on the subtree the object is the root for<p/>
All changes made on any OConfigurationNode object retrieved (maybe indirect) from this root
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index a372429..4b388b7 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -173,10 +173,7 @@ public:
static FontSubstConfiguration& get();
- const FontNameAttr* getSubstInfo(
- const OUString& rFontName,
- const LanguageTag& rLanguageTag = LanguageTag( OUString( "en"))
- ) const;
+ const FontNameAttr* getSubstInfo( const OUString& rFontName ) const;
static void getMapName( const OUString& rOrgName, OUString& rShortName, OUString& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, ImplFontAttrs& rType );
};
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index d808073..df8003b 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -57,13 +57,11 @@ public:
};
-// with bPerfect set the converter will only try and convert symbols which have
-// perfect mappings to the windows symbols fonts. With it not set, it will
-// allow somewhat more dubious transformations that are nevertheless
-// recognizably similar. Even in this mode there will be characters that fail.
+// The converter will allow somewhat dubious mappings to the the windows symbols fonts,
+// that are nevertheless recognizably similar. Even in this mode there will be characters that fail.
// The users of this might want to make a distinction between failed characters
// which were inside and those outside the unicode private area.
-UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
+UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont();
#endif // INCLUDED_UNOTOOLS_FONTCVT_HXX
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 1b25c54..e7cd434 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -57,7 +57,7 @@ UNOTOOLS_DLLPUBLIC css::uno::Any GetProperty(
UNOTOOLS_DLLPUBLIC bool MakeFolder(
ucbhelper::Content & parent, OUString const & title,
- ucbhelper::Content & result, bool exclusive = false);
+ ucbhelper::Content & result);
/// like mkdir -p
UNOTOOLS_DLLPUBLIC bool ensureFolder(
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 47e34bc..2e8308b 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -52,14 +52,11 @@ namespace utl
class UNOTOOLS_DLLPUBLIC UcbStreamHelper : public SvStream
{
public:
+ static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode );
static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- UcbLockBytesHandler* pHandler=nullptr );
+ css::uno::Reference < css::task::XInteractionHandler > );
static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- css::uno::Reference < css::task::XInteractionHandler >,
- UcbLockBytesHandler* pHandler=nullptr );
- static SvStream* CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- bool bFileExists,
- UcbLockBytesHandler* pHandler=nullptr );
+ bool bFileExists );
static SvStream* CreateStream( css::uno::Reference < css::io::XInputStream > xStream );
static SvStream* CreateStream( css::uno::Reference < css::io::XStream > xStream );
static SvStream* CreateStream( css::uno::Reference < css::io::XInputStream > xStream, bool bCloseStream );
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index e1b31cc..8279732 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -551,13 +551,13 @@ namespace utl
}
OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext,
- const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , bool _bLazyWrite )
+ const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode )
{
OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" );
try
{
Reference< XMultiServiceFactory > xConfigFactory = theDefaultProvider::get( rxContext );
- return createWithProvider( xConfigFactory, _rPath, _nDepth, _eMode, _bLazyWrite );
+ return createWithProvider( xConfigFactory, _rPath, _nDepth, _eMode );
}
catch(const Exception&)
{
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 2b5105a..e310b6a 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -1099,8 +1099,7 @@ void FontSubstConfiguration::readLocaleSubst( const OUString& rBcp47 ) const
}
}
-const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontName,
- const LanguageTag& rLanguageTag ) const
+const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontName ) const
{
if( rFontName.isEmpty() )
return nullptr;
@@ -1111,7 +1110,7 @@ const FontNameAttr* FontSubstConfiguration::getSubstInfo( const OUString& rFontN
FontNameAttr aSearchAttr;
aSearchAttr.Name = aSearchFont;
- LanguageTag aLanguageTag( rLanguageTag);
+ LanguageTag aLanguageTag("en");
if( aLanguageTag.isSystemLocale() )
aLanguageTag = SvtSysLocale().GetUILanguageTag();
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index f60d285..9188293 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1238,9 +1238,9 @@ OUString StarSymbolToMSMultiFontImpl::ConvertChar(sal_Unicode &rChar)
return sRet;
}
-StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly)
+StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont()
{
- return new StarSymbolToMSMultiFontImpl(bPerfectOnly);
+ return new StarSymbolToMSMultiFontImpl(false/*bPerfectOnly*/);
}
sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 5519419..427cad2 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -225,7 +225,7 @@ bool utl::UCBContentHelper::Kill(OUString const & url) {
bool utl::UCBContentHelper::MakeFolder(
ucbhelper::Content & parent, OUString const & title,
- ucbhelper::Content & result, bool exclusive)
+ ucbhelper::Content & result)
{
bool exists = false;
try {
@@ -276,7 +276,7 @@ bool utl::UCBContentHelper::MakeFolder(
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
}
- if (exists && !exclusive) {
+ if (exists) {
INetURLObject o(parent.getURL());
o.Append(title);
result = content(o);
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 4025b77..07421c5 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -138,24 +138,21 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
return pStream;
}
-SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- UcbLockBytesHandler* pHandler )
+SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode )
{
- return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, true /* bEnsureFileExists */ );
+ return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), nullptr, true /* bEnsureFileExists */ );
}
SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- Reference < XInteractionHandler > xInteractionHandler,
- UcbLockBytesHandler* pHandler )
+ Reference < XInteractionHandler > xInteractionHandler )
{
- return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, true /* bEnsureFileExists */ );
+ return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, nullptr, true /* bEnsureFileExists */ );
}
SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
- bool bFileExists,
- UcbLockBytesHandler* pHandler )
+ bool bFileExists )
{
- return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, !bFileExists );
+ return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), nullptr, !bFileExists );
}
SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream )
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index c72df2d..04e0f7f 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -375,8 +375,7 @@ public:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list