GNOME.org
 

ooo-build r14431 - trunk/patches/dev300

Author: kyoshida
Date: Wed Oct 29 21:22:12 2008
New Revision: 14431
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14431&view=rev

Log:
tabs to whitespace

Modified:
   trunk/patches/dev300/calc-formula-asian-phonetic.diff

Modified: trunk/patches/dev300/calc-formula-asian-phonetic.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-asian-phonetic.diff	(original)
+++ trunk/patches/dev300/calc-formula-asian-phonetic.diff	Wed Oct 29 21:22:12 2008
@@ -2038,7 +2038,7 @@
  	const SvXMLTokenMap& GetDetectiveElemTokenMap();
 diff --git sc/source/filter/xml/xmlrubyi.cxx sc/source/filter/xml/xmlrubyi.cxx
 new file mode 100644
-index 0000000..98414d5
+index 0000000..571243d
 --- /dev/null
 +++ sc/source/filter/xml/xmlrubyi.cxx
 @@ -0,0 +1,207 @@
@@ -2115,143 +2115,143 @@
 +using namespace xmloff::token;
 +
 +ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-+									  USHORT nPrfx,
-+									  const ::rtl::OUString& rLName,
-+									  const ::com::sun::star::uno::Reference<
-+									  ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+									  ScXMLTextPContext* pTempTextContext) :
-+	SvXMLImportContext( rImport, nPrfx, rLName ),
-+	pCellContext( NULL ),
-+	pTextContext( pTempTextContext )
-+{
-+	sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-+	const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-+	for( sal_Int16 i=0; i < nAttrCount; ++i )
-+	{
-+		const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-+		rtl::OUString aLocalName;
-+		USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-+					   sAttrName, &aLocalName ));
-+		const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-+
-+		switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-+		{
-+		case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-+			sStyleName = sValue;
-+			break;
-+		}
-+	}
++                                      USHORT nPrfx,
++                                      const ::rtl::OUString& rLName,
++                                      const ::com::sun::star::uno::Reference<
++                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
++                                      ScXMLTextPContext* pTempTextContext) :
++    SvXMLImportContext( rImport, nPrfx, rLName ),
++    pCellContext( NULL ),
++    pTextContext( pTempTextContext )
++{
++    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
++    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
++    for( sal_Int16 i=0; i < nAttrCount; ++i )
++    {
++        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
++        rtl::OUString aLocalName;
++        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
++                       sAttrName, &aLocalName ));
++        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
++
++        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
++        {
++        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
++            sStyleName = sValue;
++            break;
++        }
++    }
 +}
 +
 +ScXMLRubyContext::ScXMLRubyContext( ScXMLImport& rImport,
-+									  USHORT nPrfx,
-+									  const ::rtl::OUString& rLName,
-+									  const ::com::sun::star::uno::Reference<
-+									  ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+									  ScXMLTableRowCellContext* pTempContext) :
-+	SvXMLImportContext( rImport, nPrfx, rLName ),
-+	pCellContext( pTempContext ),
-+	pTextContext( NULL )
-+{
-+	sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
-+	const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
-+	for( sal_Int16 i=0; i < nAttrCount; ++i )
-+	{
-+		const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
-+		rtl::OUString aLocalName;
-+		USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
-+					   sAttrName, &aLocalName ));
-+		const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
-+
-+		switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
-+		{
-+		case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
-+			sStyleName = sValue;
-+			break;
-+		}
-+	}
++                                      USHORT nPrfx,
++                                      const ::rtl::OUString& rLName,
++                                      const ::com::sun::star::uno::Reference<
++                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
++                                      ScXMLTableRowCellContext* pTempContext) :
++    SvXMLImportContext( rImport, nPrfx, rLName ),
++    pCellContext( pTempContext ),
++    pTextContext( NULL )
++{
++    sal_Int16 nAttrCount(xTempAttrList.is() ? xTempAttrList->getLength() : 0);
++    const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableRowCellElemTextRubyAttrTokenMap();
++    for( sal_Int16 i=0; i < nAttrCount; ++i )
++    {
++        const rtl::OUString& sAttrName(xTempAttrList->getNameByIndex( i ));
++        rtl::OUString aLocalName;
++        USHORT nPrefix(GetScImport().GetNamespaceMap().GetKeyByAttrName(
++                       sAttrName, &aLocalName ));
++        const rtl::OUString& sValue(xTempAttrList->getValueByIndex( i ));
++
++        switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
++        {
++        case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_ATTR_STYLE_NAME:
++            sStyleName = sValue;
++            break;
++        }
++    }
 +}
 +
 +SvXMLImportContext *ScXMLRubyContext::CreateChildContext( USHORT nPrefix,
-+											const ::rtl::OUString& rLName,
-+											const ::com::sun::star::uno::Reference<
-+									  	::com::sun::star::xml::sax::XAttributeList>& xAttrList )
-+{
-+	SvXMLImportContext *pContext(NULL);
-+
-+	const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextRubyTokenMap();
-+	switch( rTokenMap.Get( nPrefix, rLName ) )
-+	{
-+	case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE:
-+		pContext = new ScXMLRubyBaseContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-+		break;
-+	case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT:
-+		pContext = new ScXMLRubyTextContext( GetScImport(), nPrefix, rLName, xAttrList, this);
-+		break;
-+	}
++                                            const ::rtl::OUString& rLName,
++                                            const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList )
++{
++    SvXMLImportContext *pContext(NULL);
 +
-+	if( !pContext )
-+		pContext = new SvXMLImportContext( GetScImport(), nPrefix, rLName );
++    const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowCellElemTextRubyTokenMap();
++    switch( rTokenMap.Get( nPrefix, rLName ) )
++    {
++    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_BASE:
++        pContext = new ScXMLRubyBaseContext( GetScImport(), nPrefix, rLName, xAttrList, this);
++        break;
++    case XML_TOK_TABLE_ROW_CELL_TEXT_RUBY_TEXT:
++        pContext = new ScXMLRubyTextContext( GetScImport(), nPrefix, rLName, xAttrList, this);
++        break;
++    }
 +
-+	return pContext;
++    if( !pContext )
++        pContext = new SvXMLImportContext( GetScImport(), nPrefix, rLName );
++
++    return pContext;
 +}
 +
 +void ScXMLRubyContext::EndElement()
 +{
-+	if ( pTextContext )
-+		pTextContext->AddRubyText( sBaseText.makeStringAndClear(), sRubyText.makeStringAndClear() );
-+	else if ( pCellContext )
-+		pCellContext->SetPhoneticText( sRubyText.makeStringAndClear() );
++    if ( pTextContext )
++        pTextContext->AddRubyText( sBaseText.makeStringAndClear(), sRubyText.makeStringAndClear() );
++    else if ( pCellContext )
++        pCellContext->SetPhoneticText( sRubyText.makeStringAndClear() );
 +}
 +
 +void ScXMLRubyContext::AddBaseText( const ::rtl::OUString& rText )
 +{
-+	sBaseText.append( rText );
++    sBaseText.append( rText );
 +}
 +
 +void ScXMLRubyContext::AddRubyText( const ::rtl::OUString& rText )
 +{
-+	sRubyText.append( rText );
++    sRubyText.append( rText );
 +}
 +
 +ScXMLRubyBaseContext::ScXMLRubyBaseContext( ScXMLImport& rImport,
-+									  USHORT nPrfx,
-+									  const ::rtl::OUString& rLName,
-+									  const ::com::sun::star::uno::Reference<
-+									  ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+									  ScXMLRubyContext* pTempRubyContext) :
-+	SvXMLImportContext( rImport, nPrfx, rLName ),
-+	pRubyContext( pTempRubyContext )
++                                      USHORT nPrfx,
++                                      const ::rtl::OUString& rLName,
++                                      const ::com::sun::star::uno::Reference<
++                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
++                                      ScXMLRubyContext* pTempRubyContext) :
++    SvXMLImportContext( rImport, nPrfx, rLName ),
++    pRubyContext( pTempRubyContext )
 +{
-+	// here are no attributes
++    // here are no attributes
 +}
 +
 +void ScXMLRubyBaseContext::Characters( const ::rtl::OUString& rChars )
 +{
-+	pRubyContext->AddBaseText( rChars );
++    pRubyContext->AddBaseText( rChars );
 +}
 +
 +ScXMLRubyTextContext::ScXMLRubyTextContext( ScXMLImport& rImport,
-+									  USHORT nPrfx,
-+									  const ::rtl::OUString& rLName,
-+									  const ::com::sun::star::uno::Reference<
-+									  ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
-+									  ScXMLRubyContext* pTempRubyContext) :
-+	SvXMLImportContext( rImport, nPrfx, rLName ),
-+	pRubyContext( pTempRubyContext )
++                                      USHORT nPrfx,
++                                      const ::rtl::OUString& rLName,
++                                      const ::com::sun::star::uno::Reference<
++                                      ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList,
++                                      ScXMLRubyContext* pTempRubyContext) :
++    SvXMLImportContext( rImport, nPrfx, rLName ),
++    pRubyContext( pTempRubyContext )
 +{
-+	// here are no attributes
++    // here are no attributes
 +}
 +
 +void ScXMLRubyTextContext::Characters( const ::rtl::OUString& rChars )
 +{
-+	pRubyContext->AddRubyText( rChars );
++    pRubyContext->AddRubyText( rChars );
 +}
 +
 +
 diff --git sc/source/filter/xml/xmlrubyi.hxx sc/source/filter/xml/xmlrubyi.hxx
 new file mode 100644
-index 0000000..5af457e
+index 0000000..ada14fc
 --- /dev/null
 +++ sc/source/filter/xml/xmlrubyi.hxx
 @@ -0,0 +1,191 @@
@@ -2304,72 +2304,72 @@
 + */
 +class ScXMLRubyContext : public SvXMLImportContext
 +{
-+	rtl::OUString		sStyleName;
-+	rtl::OUStringBuffer	sBaseText;
-+	rtl::OUStringBuffer	sRubyText;
-+	ScXMLTextPContext*	pTextContext;
-+	ScXMLTableRowCellContext*	pCellContext;
++    rtl::OUString       sStyleName;
++    rtl::OUStringBuffer sBaseText;
++    rtl::OUStringBuffer sRubyText;
++    ScXMLTextPContext*  pTextContext;
++    ScXMLTableRowCellContext*   pCellContext;
 +
-+	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
++    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
++    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 +
 +public:
 +
-+	/**
-+	 * A constructor of ScXMLRubyContext.
-+	 * @param rImport a reference of ScXMLImport.
-+	 * @param nPrfx the number of the element prefix.
-+	 * @param rLName the string of the element.
-+	 * @param xAttrList attribute list of the element.
-+	 * @param pContext a pointer of ScXMLTextPContext.
-+	 */
-+	ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-+						const ::rtl::OUString& rLName,
-+						const ::com::sun::star::uno::Reference<
-+										::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+						ScXMLTextPContext* pContext);
-+	/**
-+	 * A constructor of ScXMLRubyContext.
-+	 * @param rImport a reference of ScXMLImport.
-+	 * @param nPrfx the number of the element prefix.
-+	 * @param rLName the string of the element.
-+	 * @param xAttrList attribute list of the element.
-+	 * @param pContext a pointer of ScXMLTableRowCellContext.
-+	 */
-+	ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
-+						const ::rtl::OUString& rLName,
-+						const ::com::sun::star::uno::Reference<
-+										::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+						ScXMLTableRowCellContext* pContext);
-+
-+	virtual ~ScXMLRubyContext() {};
-+
-+	/**
-+	 * Create a childs element context. By default, the import's
-+	 * CreateContext method is called to create a new default context.
-+	 * @return a new default context.
-+	 */
-+	virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
-+									 const ::rtl::OUString& rLocalName,
-+									 const ::com::sun::star::uno::Reference<
-+									  	::com::sun::star::xml::sax::XAttributeList>& xAttrList );
-+	/**
-+	 * EndElement is called before a context will be destructed, but
-+	 * after a elements context has been parsed. It may be used for actions
-+	 * that require virtual methods. The default is to do nothing.
-+	 */
-+	virtual void EndElement();
-+
-+	/**
-+	 * Adds string into cell string as base string of phonetic infrmation
-+	 * @param rText the base string.
-+	 */
-+	void AddBaseText(const ::rtl::OUString& rText);
-+	/**
-+	 * Adds string into cell string as phonetic text
-+	 * @param rText the phonetic text.
-+	 */
-+	void AddRubyText(const ::rtl::OUString& rText);
++    /**
++     * A constructor of ScXMLRubyContext.
++     * @param rImport a reference of ScXMLImport.
++     * @param nPrfx the number of the element prefix.
++     * @param rLName the string of the element.
++     * @param xAttrList attribute list of the element.
++     * @param pContext a pointer of ScXMLTextPContext.
++     */
++    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
++                        const ::rtl::OUString& rLName,
++                        const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
++                        ScXMLTextPContext* pContext);
++    /**
++     * A constructor of ScXMLRubyContext.
++     * @param rImport a reference of ScXMLImport.
++     * @param nPrfx the number of the element prefix.
++     * @param rLName the string of the element.
++     * @param xAttrList attribute list of the element.
++     * @param pContext a pointer of ScXMLTableRowCellContext.
++     */
++    ScXMLRubyContext( ScXMLImport& rImport, USHORT nPrfx,
++                        const ::rtl::OUString& rLName,
++                        const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
++                        ScXMLTableRowCellContext* pContext);
++
++    virtual ~ScXMLRubyContext() {};
++
++    /**
++     * Create a childs element context. By default, the import's
++     * CreateContext method is called to create a new default context.
++     * @return a new default context.
++     */
++    virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix,
++                                     const ::rtl::OUString& rLocalName,
++                                     const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
++    /**
++     * EndElement is called before a context will be destructed, but
++     * after a elements context has been parsed. It may be used for actions
++     * that require virtual methods. The default is to do nothing.
++     */
++    virtual void EndElement();
++
++    /**
++     * Adds string into cell string as base string of phonetic infrmation
++     * @param rText the base string.
++     */
++    void AddBaseText(const ::rtl::OUString& rText);
++    /**
++     * Adds string into cell string as phonetic text
++     * @param rText the phonetic text.
++     */
++    void AddRubyText(const ::rtl::OUString& rText);
 +};
 +
 +/**
@@ -2377,35 +2377,35 @@
 + */
 +class ScXMLRubyBaseContext : public SvXMLImportContext
 +{
-+	ScXMLRubyContext*	pRubyContext;
++    ScXMLRubyContext*   pRubyContext;
 +
-+	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
++    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
++    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 +
 +public:
 +
-+	/**
-+	 * A constructor of ScXMLRubyBaseContext.
-+	 * @param rImport a reference of ScXMLImport.
-+	 * @param nPrfx the number of the element prefix.
-+	 * @param rLName the string of the element.
-+	 * @param xAttrList attribute list of the element.
-+	 * @param pContext a pointer of ScXMLRubyContext.
-+	 */
-+	ScXMLRubyBaseContext( ScXMLImport& rImport, USHORT nPrfx,
-+						const ::rtl::OUString& rLName,
-+						const ::com::sun::star::uno::Reference<
-+										::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+						ScXMLRubyContext* pContext);
-+
-+	virtual ~ScXMLRubyBaseContext() {};
-+
-+	/**
-+	 * This method is called for all characters that are contained in the
-+	 * current element. The default is to ignore them.
-+	 * @param rChars the character reference
-+	 */ 
-+	virtual void Characters( const ::rtl::OUString& rChars );
++    /**
++     * A constructor of ScXMLRubyBaseContext.
++     * @param rImport a reference of ScXMLImport.
++     * @param nPrfx the number of the element prefix.
++     * @param rLName the string of the element.
++     * @param xAttrList attribute list of the element.
++     * @param pContext a pointer of ScXMLRubyContext.
++     */
++    ScXMLRubyBaseContext( ScXMLImport& rImport, USHORT nPrfx,
++                        const ::rtl::OUString& rLName,
++                        const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
++                        ScXMLRubyContext* pContext);
++
++    virtual ~ScXMLRubyBaseContext() {};
++
++    /**
++     * This method is called for all characters that are contained in the
++     * current element. The default is to ignore them.
++     * @param rChars the character reference
++     */ 
++    virtual void Characters( const ::rtl::OUString& rChars );
 +};
 +
 +
@@ -2414,35 +2414,35 @@
 + */
 +class ScXMLRubyTextContext : public SvXMLImportContext
 +{
-+	ScXMLRubyContext*	pRubyContext;
++    ScXMLRubyContext*   pRubyContext;
 +
-+	const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
-+	ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
++    const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
++    ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
 +
 +public:
 +
-+	/**
-+	 * A constructor of ScXMLRubyTextContext.
-+	 * @param rImport a reference of ScXMLImport.
-+	 * @param nPrfx the number of the element prefix.
-+	 * @param rLName the string of the element.
-+	 * @param xAttrList attribute list of the element.
-+	 * @param pContext a pointer of ScXMLRubyContext.
-+	 */
-+	ScXMLRubyTextContext( ScXMLImport& rImport, USHORT nPrfx,
-+						const ::rtl::OUString& rLName,
-+						const ::com::sun::star::uno::Reference<
-+										::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-+						ScXMLRubyContext* pContext);
-+
-+	virtual ~ScXMLRubyTextContext() {};
-+
-+	/**
-+	 * This method is called for all characters that are contained in the
-+	 * current element. The default is to ignore them.
-+	 * @param rChars the character reference
-+	 */ 
-+	virtual void Characters( const ::rtl::OUString& rChars );
++    /**
++     * A constructor of ScXMLRubyTextContext.
++     * @param rImport a reference of ScXMLImport.
++     * @param nPrfx the number of the element prefix.
++     * @param rLName the string of the element.
++     * @param xAttrList attribute list of the element.
++     * @param pContext a pointer of ScXMLRubyContext.
++     */
++    ScXMLRubyTextContext( ScXMLImport& rImport, USHORT nPrfx,
++                        const ::rtl::OUString& rLName,
++                        const ::com::sun::star::uno::Reference<
++                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
++                        ScXMLRubyContext* pContext);
++
++    virtual ~ScXMLRubyTextContext() {};
++
++    /**
++     * This method is called for all characters that are contained in the
++     * current element. The default is to ignore them.
++     * @param rChars the character reference
++     */ 
++    virtual void Characters( const ::rtl::OUString& rChars );
 +};
 +
 +#endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]