[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 6 commits - connectivity/inc connectivity/source drawinglayer/source

[Noel Power]

 connectivity/inc/connectivity/sqlnode.hxx               |    1 +
 connectivity/source/parse/sqlnode.cxx                   |   10 +++++++++-
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d2d5e0d1e55ee692632aa547f17f6a48179af2b7
Merge: fae626b... 760601c...
Author: Noel Power <noel.power at novell.com>
Date:   Wed Dec 15 11:04:54 2010 +0000

    Merge commit 'ooo/OOO330_m18' into libreoffice-3-3

diff --cc connectivity/source/parse/sqlnode.cxx
index c8b5ff6,1b71a66..b27aa28
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@@ -1427,9 -1425,10 +1427,10 @@@ OSQLParser::OSQLParser(const ::com::sun
              { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
              { OSQLParseNode::character_string_type, "character_string_type" },
              { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
-             { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }
+             { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" },
+             { OSQLParseNode::cast_spec, "cast_spec" }
          };
 -        size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
 +        size_t nRuleMapCount = SAL_N_ELEMENTS( aRuleDescriptions );
          OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
  
          for ( size_t mapEntry = 0; mapEntry < nRuleMapCount; ++mapEntry )
commit 760601cdbae7c063f13902e66ed76c022018d848
Merge: 563edff... b962a16...
Author: obo <obo at openoffice.org>
Date:   Mon Dec 13 08:59:48 2010 +0100

    CWS-TOOLING: integrate CWS dba33m

commit b962a1629955cf00b1cc959f86731e724d6c8e60
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date:   Fri Dec 10 12:42:03 2010 +0100

    dba33m: #i115436# only cast handled

diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index 53145b0..4cdaba4 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -231,6 +231,7 @@ namespace connectivity
             character_string_type,
             other_like_predicate_part_2,
             between_predicate_part_2,
+            cast_spec,
             rule_count,             // letzter_wert
             UNKNOWN_RULE            // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID)
         };
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 6e01f62..1b71a66 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1425,7 +1425,8 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
             { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
             { OSQLParseNode::character_string_type, "character_string_type" },
             { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
-            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }
+            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" },
+            { OSQLParseNode::cast_spec, "cast_spec" }
         };
         size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
         OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
@@ -2524,9 +2525,8 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
                 rString.append(aTmp);
 
             }   break;
-            // fall through
         case SQL_NODE_PUNCTUATION:
-            if ( m_aNodeValue.toChar() == '(' || m_aNodeValue.toChar() == ')') // no spaces in front of '(' or after ')'
+            if ( getParent() && SQL_ISRULE(getParent(),cast_spec) && m_aNodeValue.toChar() == '(' ) // no spaces in front of '('
             {
                 rString.append(m_aNodeValue);
                 break;
commit b8493f6d67c3669c417f54ee937ee55519b1f2dc
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date:   Thu Dec 9 12:54:13 2010 +0100

    dba33m: #i115436# do not insert a space infront of ( and after )

diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 9b9f9fb..6e01f62 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -2511,6 +2511,7 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
             rString.append(m_aNodeValue);
             rString.appendAscii("#");
             break;
+        
         case SQL_NODE_INTNUM:
         case SQL_NODE_APPROXNUM:
             {
@@ -2524,6 +2525,13 @@ void OSQLParseNode::parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNode
 
             }   break;
             // fall through
+        case SQL_NODE_PUNCTUATION:
+            if ( m_aNodeValue.toChar() == '(' || m_aNodeValue.toChar() == ')') // no spaces in front of '(' or after ')'
+            {
+                rString.append(m_aNodeValue);
+                break;
+            }
+            // fall through
         default:
             if (rString.getLength() && m_aNodeValue.toChar() != '.' && m_aNodeValue.toChar() != ':' )
             {
commit 563edff28af92a0051c4451d34f3e274cdd3ae0e
Merge: 2a0abc9... 1f09e2b...
Author: obo <obo at openoffice.org>
Date:   Thu Dec 9 10:48:50 2010 +0100

    CWS-TOOLING: integrate CWS impress205

commit 1f09e2bcaa385df81987af5048bfcb58a69aad8f
Author: sj <sj at openoffice.org>
Date:   Thu Dec 2 14:31:22 2010 +0100

    impress205: #i115825# fixed metatextarray issues

diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 6b1931d..41af340 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2017,7 +2017,7 @@ namespace
 
                     if(nTextLength + nTextIndex > nStringLength)
                     {
-                        nTextLength = nStringLength - nTextIndex;
+                        nTextLength = nTextIndex > nStringLength ? 0 : nStringLength - nTextIndex;
                     }
                     
                     if(nTextLength && rPropertyHolders.Current().getTextColorActive())