summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-08-16 19:31:02 +0200
committerMichael Stahl <mstahl@redhat.com>2013-08-17 13:16:59 +0000
commit4f144701971532f6790043e00995138c74e6d3fd (patch)
treecddac3c179cfcf8b77c7485848ccc7cfb1e83adb
parentd0fffe44c0ab8ea79cbf3f2ef383a48aa6f492f3 (diff)
SvxRedlinTable::InsertEntry(s): reuse code
Change-Id: I5171d01aa3136286bfb007c71ccfdbd73cda07b9 Reviewed-on: https://gerrit.libreoffice.org/5460 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--svx/source/dialog/ctredlin.cxx24
1 files changed, 2 insertions, 22 deletions
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 272ec7fa81e7..85c0dfe63af0 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -334,28 +334,8 @@ bool SvxRedlinTable::IsValidComment(const String &rCommentStr)
SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,RedlinData *pUserData,
SvTreeListEntry* pParent,sal_uIntPtr nPos)
{
- aEntryColor=GetTextColor();
- if(pUserData!=NULL)
- {
- if(pUserData->bDisabled)
- aEntryColor=Color(COL_GRAY);
- }
-
- XubString aStr= rStr;
-
- XubString aFirstStr( aStr );
- xub_StrLen nEnd = aFirstStr.Search( sal_Unicode( '\t' ) );
- if( nEnd != STRING_NOTFOUND )
- {
- aFirstStr.Erase( nEnd );
- aCurEntry = aStr;
- aCurEntry.Erase( 0, ++nEnd );
- }
- else
- aCurEntry.Erase();
-
- return SvSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
-
+ const Color aColor = (pUserData && pUserData->bDisabled) ? Color(COL_GRAY) : GetTextColor();
+ return InsertEntry(rStr, pUserData, aColor, pParent, nPos);
}
SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,RedlinData *pUserData,const Color& aColor,