[Libreoffice-commits] core.git: 2 commits - desktop/source include/sal sw/source

[Libreoffice Gerrit user]

 desktop/source/deployment/registry/package/dp_package.cxx |    2 -
 include/sal/log-areas.dox                                 |    1 
 sw/source/core/bastyp/calc.cxx                            |   16 ++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit d00513ab7d0b36819a5c9f8154d2fcd18d8e6197
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Dec 11 10:45:23 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Dec 11 15:15:40 2018 +0100

    Add some logging to sw calc
    
    Change-Id: I4cadbb928ab0fbb407e9d569e77e6c20229e1810
    Reviewed-on: https://gerrit.libreoffice.org/64940
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 1468680d065e..aa9c3e3ccd09 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -509,6 +509,7 @@ certain functionality.
 
 @li @c sw
 @li @c sw.a11y - accessibility
+ at li @c sw.calc - formula calculation
 @li @c sw.core - Writer core
 @li @c sw.createcopy
 @li @c sw.doc
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index d678e0b87965..d58ee08bdacc 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -1033,25 +1033,32 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
     switch (m_eCurrOper)
     {
         case CALC_SIN:
+            SAL_INFO("sw.calc", "sin");
             return StdFunc(&sin, false);
             break;
         case CALC_COS:
+            SAL_INFO("sw.calc", "cos");
             return StdFunc(&cos, false);
             break;
         case CALC_TAN:
+            SAL_INFO("sw.calc", "tan");
             return StdFunc(&tan, false);
             break;
         case CALC_ATAN:
+            SAL_INFO("sw.calc", "atan");
             return StdFunc(&atan, false);
             break;
         case CALC_ASIN:
+            SAL_INFO("sw.calc", "asin");
             return StdFunc(&asin, true);
             break;
         case CALC_ACOS:
+            SAL_INFO("sw.calc", "acos");
             return StdFunc(&acos, true);
             break;
         case CALC_NOT:
         {
+            SAL_INFO("sw.calc", "not");
             GetToken();
             SwSbxValue nErg = Prim();
             if( SbxSTRING == nErg.GetType() )
@@ -1079,6 +1086,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_NUMBER:
         {
+            SAL_INFO("sw.calc", "number: " << m_nNumberValue.GetDouble());
             SwSbxValue nErg;
             if( GetToken() == CALC_PHD )
             {
@@ -1101,6 +1109,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_NAME:
         {
+            SAL_INFO("sw.calc", "name");
             SwSbxValue nErg;
             switch(SwCalcOper eOper = GetToken())
             {
@@ -1126,6 +1135,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_MINUS:
         {
+            SAL_INFO("sw.calc", "-");
             SwSbxValue nErg;
             GetToken();
             nErg.PutDouble( -(Prim().GetDouble()) );
@@ -1134,6 +1144,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_LP:
         {
+            SAL_INFO("sw.calc", "(");
             GetToken();
             SwSbxValue nErg = Expr();
             if( m_eCurrOper != CALC_RP )
@@ -1150,6 +1161,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_MEAN:
         {
+            SAL_INFO("sw.calc", "mean");
             m_nListPor = 1;
             GetToken();
             SwSbxValue nErg = Expr();
@@ -1161,6 +1173,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_SQRT:
         {
+            SAL_INFO("sw.calc", "sqrt");
             GetToken();
             SwSbxValue nErg = Prim();
             if( nErg.GetDouble() < 0 )
@@ -1175,6 +1188,7 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         case CALC_MIN:
         case CALC_MAX:
         {
+            SAL_INFO("sw.calc", "sum/date/min/max");
             GetToken();
             SwSbxValue nErg = Expr();
             return nErg;
@@ -1182,12 +1196,14 @@ SwSbxValue SwCalc::PrimFunc(bool &rChkPow)
         }
         case CALC_ENDCALC:
         {
+            SAL_INFO("sw.calc", "endcalc");
             SwSbxValue nErg;
             nErg.Clear();
             return nErg;
             break;
         }
         default:
+            SAL_INFO("sw.calc", "syntax error");
             m_eError = SwCalcError::Syntax;
             break;
     }
commit f611179ac6bf85d3c9d9a30d525447c54743bb6d
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Dec 4 10:53:43 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Dec 11 15:15:28 2018 +0100

    Expand warning (mention file path)
    
    Change-Id: Ib97d0da4c52215009dd2142908168c68ea0aebcb
    Reviewed-on: https://gerrit.libreoffice.org/64939
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index f76a8df08a47..ec2ffa5b3bec 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1457,7 +1457,7 @@ void BackendImpl::PackageImpl::scanBundle(
         }
         else
         {
-            SAL_WARN("desktop.deployment", "manifest.xml contains a duplicate entry!");
+            SAL_WARN("desktop.deployment", "manifest.xml contains a duplicate entry (from " << url << ")");
         }
     }