summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-20 16:44:51 +0200
committerNoel Grandin <noel@peralex.com>2015-08-21 10:19:43 +0200
commit8d7c62e7d2a7d93b63f6603c3921ebbd4c96d4b7 (patch)
treea086f2c1b03539c6ba4945505053641a7e323fc2
parent81a49f68d61f984503b89e0766bea81ee4733d9c (diff)
loplugin: defaultparams
Change-Id: I7a43882598ab3914f05cac7b24bd44fa72fdac6d
-rw-r--r--sw/source/filter/ww8/docxexport.cxx2
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx10
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx12
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx3
-rw-r--r--sw/source/filter/xml/xmlimp.cxx12
-rw-r--r--sw/source/filter/xml/xmltble.cxx3
11 files changed, 26 insertions, 28 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index de23a27ee345..c7256d7f105d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -382,7 +382,7 @@ OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaTyp
if( lcl_CopyStream( xInStream, xOutStream ) )
sId = m_pFilter->addRelation( GetFS()->getOutputStream(),
- sRelationType, sFileName, false );
+ sRelationType, sFileName );
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index ebbd6f4e5b84..d5773caea722 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -1164,26 +1164,26 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat
OUString dataFileName = "diagrams/data" + OUString::number(diagramCount) + ".xml";
OString dataRelId = OUStringToOString(m_pImpl->m_rExport.GetFilter().addRelation(pFS->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramData",
- dataFileName, false), RTL_TEXTENCODING_UTF8);
+ dataFileName), RTL_TEXTENCODING_UTF8);
// add layout relation
OUString layoutFileName = "diagrams/layout" + OUString::number(diagramCount) + ".xml";
OString layoutRelId = OUStringToOString(m_pImpl->m_rExport.GetFilter().addRelation(pFS->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramLayout",
- layoutFileName, false), RTL_TEXTENCODING_UTF8);
+ layoutFileName), RTL_TEXTENCODING_UTF8);
// add style relation
OUString styleFileName = "diagrams/quickStyle" + OUString::number(diagramCount) + ".xml";
OString styleRelId = OUStringToOString(m_pImpl->m_rExport.GetFilter().addRelation(pFS->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramQuickStyle",
- styleFileName , false), RTL_TEXTENCODING_UTF8);
+ styleFileName), RTL_TEXTENCODING_UTF8);
// add color relation
OUString colorFileName = "diagrams/colors" + OUString::number(diagramCount) + ".xml";
OString colorRelId = OUStringToOString(m_pImpl->m_rExport.GetFilter().addRelation(pFS->getOutputStream(),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/diagramColors",
- colorFileName, false), RTL_TEXTENCODING_UTF8);
+ colorFileName), RTL_TEXTENCODING_UTF8);
OUString drawingFileName;
if (drawingDom.is())
@@ -1192,7 +1192,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat
drawingFileName = "diagrams/drawing" + OUString::number(diagramCount) + ".xml";
OUString drawingRelId = m_pImpl->m_rExport.GetFilter().addRelation(pFS->getOutputStream(),
"http://schemas.microsoft.com/office/2007/relationships/diagramDrawing",
- drawingFileName , false);
+ drawingFileName);
// the data dom contains a reference to the drawing relation. We need to update it with the new generated
// relation value before writing the dom to a file
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 544c094acfd4..a6fdbd6b34f7 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -179,7 +179,7 @@ void SwWW8AttrIter::IterToCurrent()
SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) :
MSWordAttrIter(rWr),
rNd(rTextNd),
- maCharRuns(GetPseudoCharRuns(rTextNd, 0)),
+ maCharRuns(GetPseudoCharRuns(rTextNd)),
pCurRedline(0),
nAktSwPos(0),
nCurRedlinePos(USHRT_MAX),
@@ -2179,7 +2179,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
if ( pFieldmark && pFieldmark->GetFieldname() == ODF_FORMTEXT )
- AppendBookmark( pFieldmark->GetName(), false );
+ AppendBookmark( pFieldmark->GetName() );
ww::eField eFieldId = lcl_getFieldId( pFieldmark );
OUString sCode = lcl_getFieldCode( pFieldmark );
if ( pFieldmark && pFieldmark->GetFieldname() == ODF_UNHANDLED )
@@ -2243,7 +2243,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
OutputField( NULL, eFieldId, OUString(), WRITEFIELD_CLOSE );
if ( pFieldmark && pFieldmark->GetFieldname() == ODF_FORMTEXT )
- AppendBookmark( pFieldmark->GetName(), false );
+ AppendBookmark( pFieldmark->GetName() );
}
else if ( ch == CH_TXT_ATR_FORMELEMENT )
{
@@ -2255,7 +2255,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
pFieldmark->GetFieldname( ) == ODF_FORMCHECKBOX );
if ( isDropdownOrCheckbox )
- AppendBookmark( pFieldmark->GetName(), false );
+ AppendBookmark( pFieldmark->GetName() );
OutputField( NULL, lcl_getFieldId( pFieldmark ),
lcl_getFieldCode( pFieldmark ),
WRITEFIELD_START | WRITEFIELD_CMD_START );
@@ -2263,7 +2263,7 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
WriteFormData( *pFieldmark );
OutputField( NULL, lcl_getFieldId( pFieldmark ), OUString(), WRITEFIELD_CLOSE );
if ( isDropdownOrCheckbox )
- AppendBookmark( pFieldmark->GetName(), false );
+ AppendBookmark( pFieldmark->GetName() );
}
nLen -= ofs;
@@ -2951,7 +2951,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFormat, const Po
{
/* Munge flys in fly into absolutely positioned elements for word 6 */
const SwTextNode* pParTextNode = rAnch.GetContentAnchor()->nNode.GetNode().GetTextNode();
- const SwRect aPageRect = pParTextNode->FindPageFrmRect( false, 0, false );
+ const SwRect aPageRect = pParTextNode->FindPageFrmRect( false, 0 );
aOffset = rFrameFormat.FindLayoutRect().Pos();
aOffset -= aPageRect.Pos();
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index a4bf355d83f2..9894af6de708 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -473,7 +473,7 @@ void MSWordStyles::SetStyleDefaults( const SwFormat& rFormat, bool bPap )
if ( bPap || m_rExport.CollapseScriptsforWordOk(
i18n::ScriptType::LATIN, n) )
{
- m_rExport.AttrOutput().OutputItem( rFormat.GetFormatAttr( n, true ) );
+ m_rExport.AttrOutput().OutputItem( rFormat.GetFormatAttr( n ) );
}
}
}
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index f9f7c6ec676d..d2472d2334f4 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3092,7 +3092,7 @@ static bool lcl_IsAtTextEnd(const SwFormatFootnote& rFootnote)
FindSectionNode();
while( pSectNd && FTNEND_ATPGORDOCEND ==
static_cast<const SwFormatFootnoteEndAtTextEnd&>(pSectNd->GetSection().GetFormat()->
- GetFormatAttr( nWh, true)).GetValue() )
+ GetFormatAttr( nWh)).GetValue() )
pSectNd = pSectNd->StartOfSectionNode()->FindSectionNode();
if (!pSectNd)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 7ff68115e7b5..48852864644b 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2358,7 +2358,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
// rows of a band can be duplicated easy.
pTable = pIo->m_rDoc.InsertTable(
SwInsertTableOptions( tabopts::HEADLINE_NO_BORDER, 0 ),
- *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false, true );
+ *pTmpPos, nBands, nDefaultSwCols, eOri, 0, 0, false );
OSL_ENSURE(pTable && pTable->GetFrameFormat(), "insert table failed");
if (!pTable || !pTable->GetFrameFormat())
@@ -3763,7 +3763,7 @@ bool WW8RStyle::PrepareStyle(SwWW8StyInf &rSI, ww::sti eSti, sal_uInt16 nThisSty
{
pColl->ResetAllFormatAttr(); // #i73790# - method renamed
}
- pColl->SetAuto(false); // suggested by JP
+ pColl->SetAuto(); // suggested by JP
} // but changes the UI
pIo->m_pAktColl = pColl;
rSI.pFormat = pColl; // remember translation WW->SW
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 03b0278f4a8c..22f75da2c2a7 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -395,7 +395,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
//Can't put them in headers/footers :-(
uno::Reference< drawing::XShape > xRef;
OSL_ENSURE(m_pFormImpl, "Impossible");
- if (m_pFormImpl && m_pFormImpl->ReadOCXStream(xSrc1, &xRef, false))
+ if (m_pFormImpl && m_pFormImpl->ReadOCXStream(xSrc1, &xRef))
{
pRet = GetSdrObjectFromXShape(xRef);
OSL_ENSURE(pRet, "Impossible");
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 7e589defde89..b32c7317bff5 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -727,7 +727,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
}
else
{
- rPaM.GetBound(true).nContent.Assign(0, 0);
+ rPaM.GetBound().nContent.Assign(0, 0);
rPaM.GetBound(false).nContent.Assign(0, 0);
}
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 43125f9b8e3c..413ace2629a4 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -174,8 +174,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
while( USHRT_MAX != nIdx )
{
_GetNamespaceMap().Add( pUnknown->GetPrefix( nIdx ),
- pUnknown->GetNamespace( nIdx ),
- XML_NAMESPACE_UNKNOWN );
+ pUnknown->GetNamespace( nIdx ) );
nIdx = pUnknown->GetNextNamespaceIndex( nIdx );
}
bExtended = true;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 981eb59d07b7..6fa4e54c6a2c 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -755,18 +755,18 @@ void SwXMLImport::endDocument()
#if OSL_DEBUG_LEVEL > 0
// !!! This should be impossible !!!!
OSL_ENSURE( pSttNdIdx->GetIndex()+1 !=
- pPaM->GetBound( true ).nNode.GetIndex(),
+ pPaM->GetBound().nNode.GetIndex(),
"PaM.Bound1 point to new node " );
OSL_ENSURE( pSttNdIdx->GetIndex()+1 !=
pPaM->GetBound( false ).nNode.GetIndex(),
"PaM.Bound2 points to new node" );
if( pSttNdIdx->GetIndex()+1 ==
- pPaM->GetBound( true ).nNode.GetIndex() )
+ pPaM->GetBound().nNode.GetIndex() )
{
const sal_Int32 nCntPos =
- pPaM->GetBound( true ).nContent.GetIndex();
- pPaM->GetBound( true ).nContent.Assign( pTextNode,
+ pPaM->GetBound().nContent.GetIndex();
+ pPaM->GetBound().nContent.Assign( pTextNode,
pTextNode->GetText().getLength() + nCntPos );
}
if( pSttNdIdx->GetIndex()+1 ==
@@ -812,7 +812,7 @@ void SwXMLImport::endDocument()
if( pCNd && pCNd->StartOfSectionIndex()+2 <
pCNd->EndOfSectionIndex() )
{
- pPaM->GetBound(true).nContent.Assign( 0, 0 );
+ pPaM->GetBound().nContent.Assign( 0, 0 );
pPaM->GetBound(false).nContent.Assign( 0, 0 );
pDoc->GetNodes().Delete( pPaM->GetPoint()->nNode );
}
@@ -841,7 +841,7 @@ void SwXMLImport::endDocument()
{
pPos->nContent.Assign( 0, 0 );
pPaM->SetMark(); pPaM->DeleteMark();
- pDoc->GetNodes().Delete( pPos->nNode, 1 );
+ pDoc->GetNodes().Delete( pPos->nNode );
pPaM->Move( fnMoveBackward );
}
}
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 26359aec901d..cf41302ba6b2 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -809,8 +809,7 @@ void SwXMLExport::ExportTableBox( const SwTableBox& rBox,
// (export values only if cell contains text;)
XMLNumberFormatAttributesExportHelper::
SetNumberFormatAttributes(
- *this, nNumberFormat, xCell->getValue(),
- true );
+ *this, nNumberFormat, xCell->getValue() );
}
// else: invalid key; ignore