summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/rtfexport.cxx
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2015-06-21 10:44:34 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2015-06-21 12:41:52 +0200
commit61609a62a975e105345fcfbe64c7edff551ee1b3 (patch)
tree3884309b963df30768c9ff47ff8838d369e2363b /sw/source/filter/ww8/rtfexport.cxx
parent11d19a5e35891409da7b9c65c56f26f7d5ae5ad0 (diff)
Remove else after return
Change-Id: I95ed091165e3e60d1b162ec6ddca9dda43f8c439
Diffstat (limited to 'sw/source/filter/ww8/rtfexport.cxx')
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 7a2849d1dc7c..ac6f2f698b14 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -835,8 +835,8 @@ SvStream& RtfExport::Strm()
{
if (m_pStream)
return *m_pStream;
- else
- return m_pWriter->Strm();
+
+ return m_pWriter->Strm();
}
void RtfExport::setStream()
@@ -911,10 +911,12 @@ void RtfExport::InsColor(const Color& rCol)
sal_uInt16 n;
bool bAutoColorInTable = false;
for (RtfColorTable::iterator it=m_aColTable.begin() ; it != m_aColTable.end(); ++it)
+ {
if ((*it).second == rCol)
return; // Already in the table
- else if ((*it).second == COL_AUTO)
+ if ((*it).second == COL_AUTO)
bAutoColorInTable = true;
+ }
if (rCol.GetColor() == COL_AUTO)
// COL_AUTO gets value 0
n = 0;
@@ -1110,12 +1112,10 @@ sal_uInt16 RtfExport::GetRedline(const OUString& rAuthor)
std::map<OUString,sal_uInt16>::iterator i = m_aRedlineTable.find(rAuthor);
if (i != m_aRedlineTable.end())
return i->second;
- else
- {
- int nId = m_aRedlineTable.size();
- m_aRedlineTable.insert(std::pair<OUString,sal_uInt16>(rAuthor,nId));
- return nId;
- }
+
+ int nId = m_aRedlineTable.size();
+ m_aRedlineTable.insert(std::pair<OUString,sal_uInt16>(rAuthor,nId));
+ return nId;
}
const OUString* RtfExport::GetRedline(sal_uInt16 nId)