summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlcss1.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-01-13 13:43:57 +0200
committerNoel Grandin <noel@peralex.com>2016-01-13 13:59:52 +0200
commit2b4fd256e9f8594c31e7e8045dccae5afdc62e16 (patch)
tree09d248841a5f0765516a7cf82b72cec529287eb7 /sw/source/filter/html/htmlcss1.cxx
parent20b0c8fc3bb5bcf4ae8ba81c88aaa5726dbcf9e2 (diff)
loplugin:unusedmethods unused return value in sw/
Change-Id: Iaec71124b04ed678686d646df3ff0892585d3d50
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
-rw-r--r--sw/source/filter/html/htmlcss1.cxx33
1 files changed, 13 insertions, 20 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index 291856442520..fcc108dcf9f7 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -689,12 +689,12 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript,
}
}
-bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
+void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
SfxItemSet& rItemSet,
SvxCSS1PropertyInfo& rPropInfo )
{
if( !bIsNewDoc )
- return true;
+ return;
CSS1SelectorType eSelType = pSelector->GetType();
const CSS1Selector *pNext = pSelector->GetNext();
@@ -737,7 +737,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( CSS1_SELTYPE_ELEMENT != eSelType &&
CSS1_SELTYPE_ELEM_CLASS != eSelType)
- return true;
+ return;
// Token und Class zu dem Selektor holen
OUString aToken2;
@@ -759,7 +759,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( !pNext )
{
InsertTag( aToken2, rItemSet, rPropInfo );
- return false;
+ return;
}
else if( pNext && CSS1_SELTYPE_PSEUDO == eNextType )
{
@@ -796,7 +796,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
{
InsertTag( sTmp, rItemSet, rPropInfo );
}
- return false;
+ return;
}
}
break;
@@ -835,7 +835,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
GetTextCollFromPool( RES_POOLCOLL_STANDARD ),
rItemSet, rPropInfo, this );
- return false;
+ return;
}
break;
}
@@ -862,7 +862,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
SetCharFormatAttrs( GetCharFormatFromPool(nPoolFormatId),
aScriptItemSet);
}
- return false;
+ return;
}
}
@@ -928,7 +928,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( CSS1_SELTYPE_ELEMENT==eSelType && !pNext )
{
InsertTag( aToken2, rItemSet, rPropInfo );
- return false;
+ return;
}
else if( CSS1_SELTYPE_ELEMENT==eSelType && pNext &&
(CSS1_SELTYPE_ELEMENT==eNextType ||
@@ -964,7 +964,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
InsertTag( sTmp, aScriptItemSet, rPropInfo );
}
- return false;
+ return;
}
}
}
@@ -1069,17 +1069,15 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
pColl->SetFormatAttr( aDrop );
}
}
-
- return false;
}
- return true;
+ return;
}
// Jetzt werden die Selektoten verarbeitet, die zu einer Zechenvorlage
// gehoehren. Zusammengesetzte gibt es hier allerdings nich nicht.
if( pNext )
- return true;
+ return;
SwCharFormat *pCFormat = GetChrFormat( static_cast< sal_uInt16 >(nToken2), aEmptyOUStr );
if( pCFormat )
@@ -1110,10 +1108,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
pParentCFormat ? &pParentCFormat->GetAttrSet() : nullptr );
SetCharFormatAttrs( pCFormat, aScriptItemSet );
}
- return false;
}
-
- return true;
}
sal_uInt32 SwCSS1Parser::GetFontHeight( sal_uInt16 nSize ) const
@@ -2194,11 +2189,11 @@ bool SwHTMLParser::GetMarginsFromContext( sal_uInt16& nLeft,
return false;
}
-bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
+void SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
sal_uInt16& nRight,
short& nIndent ) const
{
- bool bRet = GetMarginsFromContext( nLeft, nRight, nIndent );
+ GetMarginsFromContext( nLeft, nRight, nIndent );
const SwHTMLNumRuleInfo& rInfo = const_cast<SwHTMLParser*>(this)->GetNumInfo();
if( rInfo.GetDepth() )
{
@@ -2208,8 +2203,6 @@ bool SwHTMLParser::GetMarginsFromContextWithNumBul( sal_uInt16& nLeft,
nLeft = nLeft + rNumFormat.GetAbsLSpace();
nIndent = rNumFormat.GetFirstLineOffset();
}
-
- return bRet;
}
void SwHTMLParser::GetULSpaceFromContext( sal_uInt16& nUpper,