[Libreoffice-commits] .: Branch 'feature/killsdf' - 3 commits - l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/po.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c48c4ace3630451c771afa20080f9bfb7ba05c03
Author: Zolnai Tamás <zolnaitamas2000g at gmail.com>
Date:   Sun Nov 18 14:42:04 2012 +0100

    Correct skipping source file line of msgctxt
    
    Change-Id: I7aed7a75c6e9b36efca9837c0137075065bcd1e6

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index df9efe3..648634c 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -252,10 +252,12 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
             m_sMsgStr = lcl_GenNormString(sLine.copy(7));
             pLastMsg = &m_sMsgStr;
         }
-        else if (sLine.startsWith("\"") && pLastMsg &&
-           (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") )
+        else if (sLine.startsWith("\"") && pLastMsg)
         {
-            *pLastMsg += lcl_GenNormString(sLine);
+            if (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"")
+            {
+                *pLastMsg += lcl_GenNormString(sLine);
+            }
         }
         else
             break;
commit d15706ec0ac0e1eaec1b95fe0271d17393915e32
Author: Zolnai Tamás <zolnaitamas2000g at gmail.com>
Date:   Sun Nov 18 14:39:17 2012 +0100

    Revert "Write source file into po entries' msgctxt"
    
    This reverts commit b0f07bbbc4f179d442ff96471669f02e82686657.

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index ce71207..df9efe3 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -255,10 +255,7 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
         else if (sLine.startsWith("\"") && pLastMsg &&
            (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") )
         {
-            if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" )
-            {
-                *pLastMsg += lcl_GenNormString(sLine);
-            }
+            *pLastMsg += lcl_GenNormString(sLine);
         }
         else
             break;
commit ce48aa1488652ba8b24ada4d62b75aacf3ef6717
Author: Zolnai Tamás <zolnaitamas2000g at gmail.com>
Date:   Sun Nov 18 14:38:47 2012 +0100

    Revert "Correct skiping source file line of  msgctxt"
    
    This reverts commit 7f81bbb1c7f090d9e962e5c2cb7b694298bfe1c8.

diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index e59db11..ce71207 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -252,7 +252,8 @@ void GenPoEntry::readFromFile(std::ifstream& rIFStream)
             m_sMsgStr = lcl_GenNormString(sLine.copy(7));
             pLastMsg = &m_sMsgStr;
         }
-        else if (sLine.startsWith("\"") && pLastMsg)
+        else if (sLine.startsWith("\"") && pLastMsg &&
+           (pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\"") )
         {
             if ( pLastMsg != &m_sMsgCtxt || sLine != "\"" + m_sReference + "\\n\"" )
             {