[Libreoffice-commits] core.git: svx/source

[Matteo Casalin]

 svx/source/dialog/ctredlin.cxx |   25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

New commits:
commit cc65e4d2fd1dd0c03cf652b5aada6870e1a939f1
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Fri Aug 16 15:47:44 2013 +0200

    SvxRedlinTable::IsValidEntry/IsValidComment: reuse code
    
    Change-Id: If2d54aeea160b64601c14624f2e00c5234fe4bc9
    Reviewed-on: https://gerrit.libreoffice.org/5457
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 6ccbb8f..62e3f7d 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -305,30 +305,7 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
 sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
                                   const DateTime *pDateTime,const String* pCommentStr)
 {
-    bool nTheFlag=true;
-    if(bAuthor)
-    {
-        nTheFlag = aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL;
-    }
-    if(bDate && nTheFlag)
-    {
-        if(nDaTiMode!=FLT_DATE_NOTEQUAL)
-        {
-            nTheFlag=pDateTime->IsBetween(aDaTiFilterFirst,aDaTiFilterLast);
-        }
-        else
-        {
-            nTheFlag=!(pDateTime->IsBetween(aDaTiFilterFirst,aDaTiFilterLast));
-        }
-    }
-    if(bComment && nTheFlag)
-    {
-        sal_Int32 nStartPos = 0;
-        sal_Int32 nEndPos = pCommentStr->Len();
-
-        nTheFlag=pCommentSearcher->SearchForward( *pCommentStr, &nStartPos, &nEndPos);
-    }
-    return nTheFlag;
+    return IsValidEntry(pAuthorStr, pDateTime) && IsValidComment(pCommentStr);
 }
 
 sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)