INTEGRATION: CWS obo30 (1.6.26); FILE MERGED

2008/06/03 07:54:07 obo 1.6.26.1: #i90100# ambigous Reference during ENABLE_PCH build

1 files changed, 15 insertions, 17 deletions

diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx
index cb7a100ab..888a24792 100644
--- a/forms/source/xforms/submission/serialization_urlencoded.cxx
+++ b/forms/source/xforms/submission/serialization_urlencoded.cxx
@@ -1,13 +1,13 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: serialization_urlencoded.cxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -45,7 +45,6 @@
 
 #include "serialization_urlencoded.hxx"
 
-using namespace rtl;
 using namespace utl;
 using namespace CSS::uno;
 using namespace CSS::io;
@@ -54,8 +53,8 @@ using namespace CSS::xml::dom;
 
 CSerializationURLEncoded::CSerializationURLEncoded()
     : m_aFactory(getProcessServiceFactory())
-    , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance( 
-        OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY))
+    , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance(
+        ::rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY))
 {
 }
 
@@ -67,7 +66,7 @@ CSerializationURLEncoded::CSerializationURLEncoded()
  mark        = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
  unreserved = alphanum | mark
 */
-sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c)       
+sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c)
 {
     //digit?
     if (c >= '0' && c <= '9') return sal_True;
@@ -87,9 +86,9 @@ sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c)
     }
     return sal_False;
 }
-void  CSerializationURLEncoded::encode_and_append(const OUString& aString, OStringBuffer& aBuffer)
+void  CSerializationURLEncoded::encode_and_append(const ::rtl::OUString& aString, ::rtl::OStringBuffer& aBuffer)
 {
-    OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
+    ::rtl::OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8);
     const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() );
     sal_Char tmpChar[4]; tmpChar[3] = 0;
 
@@ -123,22 +122,22 @@ void  CSerializationURLEncoded::encode_and_append(const OUString& aString, OStri
         pString++;
     }
 }
-            
+
 void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
 {
     // serialize recursive
     // every element node E that has a text child T will be serialized in document order
     // <E1>T1<E2>T2</E2></E1><E3>T3</E3> -> E1=T2&E2=T2&E3=T3 (En := local name)
-    
+
     // this node
     Reference< XNodeList > aChildList = aNode->getChildNodes();
     Reference< XNode > aChild;
     // is this an element node?
     if (aNode->getNodeType() == NodeType_ELEMENT_NODE)
     {
-        OUString  aName = aNode->getNodeName();
+        ::rtl::OUString  aName = aNode->getNodeName();
         // find any text children
-        OUStringBuffer aValue;
+        ::rtl::OUStringBuffer aValue;
         Reference< XText > aText;
         for(sal_Int32 i=0; i < aChildList->getLength(); i++)
         {
@@ -153,8 +152,8 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
         // found anything?
         if (aValue.getLength() > 0)
         {
-            OUString aUnencValue = aValue.makeStringAndClear();
-            OStringBuffer aEncodedBuffer;
+            ::rtl::OUString aUnencValue = aValue.makeStringAndClear();
+            ::rtl::OStringBuffer aEncodedBuffer;
             encode_and_append(aName, aEncodedBuffer);
             aEncodedBuffer.append("=");
             encode_and_append(aUnencValue, aEncodedBuffer);
@@ -173,7 +172,7 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode)
         if (aChild.is() && aChild->getNodeType() == NodeType_ELEMENT_NODE)
             serialize_node(aChild);
     }
-    
+
     // siblings...
 //    Reference< XNode > aSibling = aNode->getNextSibling();
 //    if (aSibling.is())
@@ -187,7 +186,7 @@ void CSerializationURLEncoded::serialize_nodeset()
     Reference< XNodeList > aNodeList = m_aXPathObject->getNodeList();
     for (sal_Int32 i=0; i<aNodeList->getLength(); i++)
         serialize_node(aNodeList->item(i));
-    m_aPipe->closeOutput();    
+    m_aPipe->closeOutput();
 }
 */
 
@@ -212,4 +211,3 @@ Reference< XInputStream > CSerializationURLEncoded::getInputStream()
 }
 
 
-