[ooo-build-commit] .: 3 commits - canvas/source sax/source unotools/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Oct 6 03:48:33 PDT 2010


 canvas/source/cairo/cairo_canvashelper.cxx |    1 
 sax/source/tools/fastserializer.cxx        |   66 +--
 unotools/source/config/menuoptions.cxx     |  561 -----------------------------
 3 files changed, 35 insertions(+), 593 deletions(-)

New commits:
commit db06926389e9860898e910dd1802e14e8fdd199c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 09:36:03 2010 +0100

    #i114148# unused copy of menuoptions.cxx, real one is in svtools

diff --git a/unotools/source/config/menuoptions.cxx b/unotools/source/config/menuoptions.cxx
deleted file mode 100644
index 080c511..0000000
--- a/unotools/source/config/menuoptions.cxx
+++ /dev/null
@@ -1,561 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_unotools.hxx"
-#ifndef GCC
-#endif
-
-//_________________________________________________________________________________________________________________
-//	includes
-//_________________________________________________________________________________________________________________
-
-#include <unotools/menuoptions.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <vcl/svapp.hxx>
-
-#include <rtl/logfile.hxx>
-#include "itemholder1.hxx"
-
-//_________________________________________________________________________________________________________________
-//	namespaces
-//_________________________________________________________________________________________________________________
-
-using namespace ::utl					;
-using namespace ::rtl					;
-using namespace ::osl					;
-using namespace ::com::sun::star::uno	;
-
-//_________________________________________________________________________________________________________________
-//	const
-//_________________________________________________________________________________________________________________
-
-#define	ROOTNODE_MENU							OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu"	))
-#define	DEFAULT_DONTHIDEDISABLEDENTRIES			sal_False
-#define	DEFAULT_FOLLOWMOUSE						sal_True
-#define	DEFAULT_MENUICONS						2
-
-#define	PROPERTYNAME_DONTHIDEDISABLEDENTRIES	OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry"	))
-#define	PROPERTYNAME_FOLLOWMOUSE				OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse"				))
-#define PROPERTYNAME_SHOWICONSINMENUES          OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues"        ))
-#define PROPERTYNAME_SYSTEMICONSINMENUES        OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus"     ))
-
-#define	PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	0
-#define	PROPERTYHANDLE_FOLLOWMOUSE				1
-#define PROPERTYHANDLE_SHOWICONSINMENUES        2
-#define PROPERTYHANDLE_SYSTEMICONSINMENUES      3
-
-#define PROPERTYCOUNT                           4
-
-#include <tools/link.hxx>
-#include <tools/list.hxx>
-DECLARE_LIST( LinkList, Link * )
-
-//_________________________________________________________________________________________________________________
-//	private declarations!
-//_________________________________________________________________________________________________________________
-
-class SvtMenuOptions_Impl : public ConfigItem
-{
-    //-------------------------------------------------------------------------------------------------------------
-    //	private member
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-        LinkList    aList;
-        sal_Bool	m_bDontHideDisabledEntries			;	/// cache "DontHideDisabledEntries" of Menu section
-        sal_Bool	m_bFollowMouse						;	/// cache "FollowMouse" of Menu section
-        sal_Int16	m_nMenuIcons						;	/// cache "MenuIcons" of Menu section
-
-    //-------------------------------------------------------------------------------------------------------------
-    //	public methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    public:
-
-        //---------------------------------------------------------------------------------------------------------
-        //	constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
-
-         SvtMenuOptions_Impl();
-        ~SvtMenuOptions_Impl();
-
-        void AddListener( const Link& rLink );
-        void RemoveListener( const Link& rLink );
-
-        //---------------------------------------------------------------------------------------------------------
-        //	overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
-
-        /*-****************************************************************************************************//**
-            @short		called for notify of configmanager
-            @descr		These method is called from the ConfigManager before application ends or from the
-                         PropertyChangeListener if the sub tree broadcasts changes. You must update your
-                        internal values.
-
-            @seealso	baseclass ConfigItem
-
-            @param		"seqPropertyNames" is the list of properties which should be updated.
-            @return		-
-
-            @onerror	-
-        *//*-*****************************************************************************************************/
-
-        virtual void Notify( const Sequence< OUString >& seqPropertyNames );
-
-        /*-****************************************************************************************************//**
-            @short		write changes to configuration
-            @descr		These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of config data.
-
-            @seealso	baseclass ConfigItem
-
-            @param		-
-            @return		-
-
-            @onerror	-
-        *//*-*****************************************************************************************************/
-
-        virtual void Commit();
-
-        //---------------------------------------------------------------------------------------------------------
-        //	public interface
-        //---------------------------------------------------------------------------------------------------------
-
-        /*-****************************************************************************************************//**
-            @short		access method to get internal values
-            @descr		These method give us a chance to regulate acces to ouer internal values.
-                        It's not used in the moment - but it's possible for the feature!
-
-            @seealso	-
-
-            @param		-
-            @return		-
-
-            @onerror	-
-        *//*-*****************************************************************************************************/
-
-        sal_Bool	IsEntryHidingEnabled() const
-                    { return m_bDontHideDisabledEntries; }
-
-        sal_Bool	IsFollowMouseEnabled() const
-                    { return m_bFollowMouse; }
-
-        sal_Int16	GetMenuIconsState() const
-                    { return m_nMenuIcons; }
-
-        void		SetEntryHidingState	( sal_Bool bState )
-                    {
-                        m_bDontHideDisabledEntries = bState;
-                        SetModified();
-                        for ( USHORT n=0; n<aList.Count(); n++ )
-                            aList.GetObject(n)->Call( this );
-                        Commit();
-                    }
-
-        void		SetFollowMouseState	( sal_Bool bState )
-                    {
-                        m_bFollowMouse = bState;
-                        SetModified();
-                        for ( USHORT n=0; n<aList.Count(); n++ )
-                            aList.GetObject(n)->Call( this );
-                        Commit();
-                    }
-
-        void		SetMenuIconsState ( sal_Int16 bState	)
-                    {
-                        m_nMenuIcons = bState;
-                        SetModified();
-                        for ( USHORT n=0; n<aList.Count(); n++ )
-                            aList.GetObject(n)->Call( this );
-                        Commit();
-                    }
-
-    //-------------------------------------------------------------------------------------------------------------
-    //	private methods
-    //-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        /*-****************************************************************************************************//**
-            @short		return list of fix key names of ouer configuration management which represent oue module tree
-            @descr		These methods return a static const list of key names. We need it to get needed values from our
-                        configuration management.
-
-            @seealso	-
-
-            @param		-
-            @return		A list of needed configuration keys is returned.
-
-            @onerror	-
-        *//*-*****************************************************************************************************/
-
-        static Sequence< OUString > impl_GetPropertyNames();
-};
-
-//_________________________________________________________________________________________________________________
-//	definitions
-//_________________________________________________________________________________________________________________
-
-//*****************************************************************************************************************
-//	constructor
-//*****************************************************************************************************************
-SvtMenuOptions_Impl::SvtMenuOptions_Impl()
-    // Init baseclasses first
-    :	ConfigItem					( ROOTNODE_MENU						)
-    // Init member then.
-    ,	m_bDontHideDisabledEntries	( DEFAULT_DONTHIDEDISABLEDENTRIES	)
-    ,	m_bFollowMouse				( DEFAULT_FOLLOWMOUSE				)
-    ,   m_nMenuIcons				( DEFAULT_MENUICONS 				)
-{
-    // Use our static list of configuration keys to get his values.
-    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
-    Sequence< Any >			seqValues	= GetProperties( seqNames )	;
-
-    // Safe impossible cases.
-    // We need values from ALL configuration keys.
-    // Follow assignment use order of values in relation to our list of key names!
-    DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
-
-    sal_Bool bMenuIcons = true;
-    sal_Bool bSystemMenuIcons = true;
-
-    // Copy values from list in right order to ouer internal member.
-    sal_Int32 nPropertyCount	=	seqValues.getLength()	;
-    sal_Int32 nProperty			=	0						;
-    for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
-    {
-        // Safe impossible cases.
-        // Check any for valid value.
-        DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
-        switch( nProperty )
-        {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
-                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
-                                                                seqValues[nProperty] >>= m_bDontHideDisabledEntries;
-                                                            }
-                                                            break;
-
-            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
-                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
-                                                                seqValues[nProperty] >>= m_bFollowMouse;
-                                                            }
-                                                            break;
-            case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
-                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
-                                                                seqValues[nProperty] >>= bMenuIcons;
-                                                            }
-                                                            break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
-                                                                DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
-                                                                seqValues[nProperty] >>= bSystemMenuIcons;
-                                                            }
-                                                            break;
-        }
-    }
-
-    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
-
-    EnableNotification( seqNames );
-}
-
-//*****************************************************************************************************************
-//	destructor
-//*****************************************************************************************************************
-SvtMenuOptions_Impl::~SvtMenuOptions_Impl()
-{
-    // Flush data to configuration!
-    // User has no chance to do that.
-    if( IsModified() == sal_True )
-    {
-        Commit();
-    }
-
-    for ( USHORT n=0; n<aList.Count(); )
-        delete aList.Remove(n);
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
-{
-    // Use given list of updated properties to get his values from configuration directly!
-    Sequence< Any > seqValues = GetProperties( seqPropertyNames );
-    // Safe impossible cases.
-    // We need values from ALL notified configuration keys.
-    DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
-
-    sal_Bool bMenuIcons = true;
-    sal_Bool bSystemMenuIcons = true;
-
-    // Step over list of property names and get right value from coreesponding value list to set it on internal members!
-    sal_Int32 nCount = seqPropertyNames.getLength();
-    for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
-    {
-        if( seqPropertyNames[nProperty] == PROPERTYNAME_DONTHIDEDISABLEDENTRIES )
-        {
-            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
-            seqValues[nProperty] >>= m_bDontHideDisabledEntries;
-        }
-        else if( seqPropertyNames[nProperty] == PROPERTYNAME_FOLLOWMOUSE )
-        {
-            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
-            seqValues[nProperty] >>= m_bFollowMouse;
-        }
-        else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
-        {
-            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
-            seqValues[nProperty] >>= bMenuIcons;
-        }
-        else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
-        {
-            DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
-            seqValues[nProperty] >>= bSystemMenuIcons;
-        }
-
-        #if OSL_DEBUG_LEVEL > 1
-        else DBG_ASSERT( sal_False, "SvtMenuOptions_Impl::Notify()\nUnkown property detected ... I can't handle these!\n" );
-        #endif
-    }
-
-    m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
-
-    for ( USHORT n=0; n<aList.Count(); n++ )
-        aList.GetObject(n)->Call( this );
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-void SvtMenuOptions_Impl::Commit()
-{
-    // Get names of supported properties, create a list for values and copy current values to it.
-    Sequence< OUString >	seqNames	= impl_GetPropertyNames();
-    sal_Int32				nCount		= seqNames.getLength();
-    Sequence< Any >			seqValues	( nCount );
-    for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
-    {
-        switch( nProperty )
-        {
-            case PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES	:	{
-                                                                seqValues[nProperty] <<= m_bDontHideDisabledEntries;
-                                                            }
-                                                            break;
-
-            case PROPERTYHANDLE_FOLLOWMOUSE				:	{
-                                                                seqValues[nProperty] <<= m_bFollowMouse;
-                                                            }
-                                                            break;
-            //Output cache of current setting as possibly modified by System Theme for older version
-            case PROPERTYHANDLE_SHOWICONSINMENUES       :   {
-                                                                seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
-                                                            }
-                                                            break;
-            case PROPERTYHANDLE_SYSTEMICONSINMENUES		:   {
-                                                                seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
-                                                            }
-                                                            break;
-        }
-    }
-    // Set properties in configuration.
-    PutProperties( seqNames, seqValues );
-}
-
-//*****************************************************************************************************************
-//	private method
-//*****************************************************************************************************************
-Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
-{
-    // Build static list of configuration key names.
-    static const OUString pProperties[] =
-    {
-        PROPERTYNAME_DONTHIDEDISABLEDENTRIES	,
-        PROPERTYNAME_FOLLOWMOUSE				,
-        PROPERTYNAME_SHOWICONSINMENUES			,
-        PROPERTYNAME_SYSTEMICONSINMENUES
-    };
-    // Initialize return sequence with these list ...
-    static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
-    // ... and return it.
-    return seqPropertyNames;
-}
-
-void SvtMenuOptions_Impl::AddListener( const Link& rLink )
-{
-    aList.Insert( new Link( rLink ) );
-}
-
-void SvtMenuOptions_Impl::RemoveListener( const Link& rLink )
-{
-    for ( USHORT n=0; n<aList.Count(); n++ )
-    {
-        if ( (*aList.GetObject(n) ) == rLink )
-        {
-            delete aList.Remove(n);
-            break;
-        }
-    }
-}
-
-//*****************************************************************************************************************
-//	initialize static member
-//	DON'T DO IT IN YOUR HEADER!
-//	see definition for further informations
-//*****************************************************************************************************************
-SvtMenuOptions_Impl*	SvtMenuOptions::m_pDataContainer	= NULL	;
-sal_Int32				SvtMenuOptions::m_nRefCount			= 0		;
-
-//*****************************************************************************************************************
-//	constructor
-//*****************************************************************************************************************
-SvtMenuOptions::SvtMenuOptions()
-{
-    // Global access, must be guarded (multithreading!).
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Increase ouer refcount ...
-    ++m_nRefCount;
-    // ... and initialize ouer data container only if it not already!
-    if( m_pDataContainer == NULL )
-    {
-        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
-        m_pDataContainer = new SvtMenuOptions_Impl();
-
-        ItemHolder1::holdConfigItem(E_MENUOPTIONS);
-    }
-}
-
-//*****************************************************************************************************************
-//	destructor
-//*****************************************************************************************************************
-SvtMenuOptions::~SvtMenuOptions()
-{
-    // Global access, must be guarded (multithreading!)
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Decrease ouer refcount.
-    --m_nRefCount;
-    // If last instance was deleted ...
-    // we must destroy ouer static data container!
-    if( m_nRefCount <= 0 )
-    {
-        delete m_pDataContainer;
-        m_pDataContainer = NULL;
-    }
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsEntryHidingEnabled();
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-sal_Bool SvtMenuOptions::IsFollowMouseEnabled() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->IsFollowMouseEnabled();
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-void SvtMenuOptions::SetEntryHidingState( sal_Bool bState )
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    m_pDataContainer->SetEntryHidingState( bState );
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-void SvtMenuOptions::SetFollowMouseState( sal_Bool bState )
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    m_pDataContainer->SetFollowMouseState( bState );
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-sal_Int16 SvtMenuOptions::GetMenuIconsState() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->GetMenuIconsState();
-}
-
-//*****************************************************************************************************************
-//	public method
-//*****************************************************************************************************************
-void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    m_pDataContainer->SetMenuIconsState( bState );
-}
-
-//*****************************************************************************************************************
-//	private method
-//*****************************************************************************************************************
-Mutex& SvtMenuOptions::GetOwnStaticMutex()
-{
-    // Initialize static mutex only for one time!
-    static Mutex* pMutex = NULL;
-    // If these method first called (Mutex not already exist!) ...
-    if( pMutex == NULL )
-    {
-        // ... we must create a new one. Protect follow code with the global mutex -
-        // It must be - we create a static variable!
-        MutexGuard aGuard( Mutex::getGlobalMutex() );
-        // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
-        if( pMutex == NULL )
-        {
-            // Create the new mutex and set it for return on static variable.
-            static Mutex aMutex;
-            pMutex = &aMutex;
-        }
-    }
-    // Return new created or already existing mutex object.
-    return *pMutex;
-}
-
-void SvtMenuOptions::AddListener( const Link& rLink )
-{
-    m_pDataContainer->AddListener( rLink );
-}
-
-void SvtMenuOptions::RemoveListener( const Link& rLink )
-{
-    m_pDataContainer->RemoveListener( rLink );
-}
commit 3c34a95f584e4af60f17a02b1fb40dc6a935d696
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 09:18:56 2010 +0100

    use rtl::ByteSequence instead of Sequence
    
    For trivial pre-main sequences use rtl::ByteSequence instead of uno::Sequence<
    sal_Int8 >, see #i113054#. Advantages are its slightly faster, but more
    importantly uno::Sequence needs the cppu infrastructure to be working during
    destruction, and global uno::Sequences cause difficulties on shutdown, because
    their lifecycle is difficult to control and ensure that they die *before* the
    cppu infrastructure

diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index edff7cb..76f7d75 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -27,6 +27,7 @@
 
 #include "fastserializer.hxx"
 #include <rtl/ustrbuf.hxx>
+#include <rtl/byteseq.hxx>
 
 #include <com/sun/star/xml/Attribute.hpp>
 #include <com/sun/star/xml/FastAttribute.hpp>
@@ -45,6 +46,7 @@ using ::rtl::OUStringToOString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::toUnoSequence;
 using ::com::sun::star::xml::FastAttribute;
 using ::com::sun::star::xml::Attribute;
 using ::com::sun::star::xml::sax::SAXException;
@@ -56,15 +58,15 @@ using ::com::sun::star::io::NotConnectedException;
 using ::com::sun::star::io::IOException;
 using ::com::sun::star::io::BufferSizeExceededException;
 
-static Sequence< sal_Int8 > aClosingBracket((sal_Int8 *)">", 1);
-static Sequence< sal_Int8 > aSlashAndClosingBracket((sal_Int8 *)"/>", 2);
-static Sequence< sal_Int8 > aColon((sal_Int8 *)":", 1);
-static Sequence< sal_Int8 > aOpeningBracket((sal_Int8 *)"<", 1);
-static Sequence< sal_Int8 > aOpeningBracketAndSlash((sal_Int8 *)"</", 2);
-static Sequence< sal_Int8 > aQuote((sal_Int8 *)"\"", 1);
-static Sequence< sal_Int8 > aEqualSignAndQuote((sal_Int8 *)"=\"", 2);
-static Sequence< sal_Int8 > aSpace((sal_Int8 *)" ", 1);
-static Sequence< sal_Int8 > aXmlHeader((sal_Int8*) "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n", 56);
+static rtl::ByteSequence aClosingBracket((const sal_Int8 *)">", 1);
+static rtl::ByteSequence aSlashAndClosingBracket((const sal_Int8 *)"/>", 2);
+static rtl::ByteSequence aColon((const sal_Int8 *)":", 1);
+static rtl::ByteSequence aOpeningBracket((const sal_Int8 *)"<", 1);
+static rtl::ByteSequence aOpeningBracketAndSlash((const sal_Int8 *)"</", 2);
+static rtl::ByteSequence aQuote((const sal_Int8 *)"\"", 1);
+static rtl::ByteSequence aEqualSignAndQuote((const sal_Int8 *)"=\"", 2);
+static rtl::ByteSequence aSpace((const sal_Int8 *)" ", 1);
+static rtl::ByteSequence aXmlHeader((const sal_Int8*) "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n", 56);
 
 #define HAS_NAMESPACE(x) ((x & 0xffff0000) != 0)
 #define NAMESPACE(x) (x >> 16)
@@ -78,7 +80,7 @@ namespace sax_fastparser {
     {
         if (!mxOutputStream.is())
             return;
-        writeBytes(aXmlHeader);
+        writeBytes(toUnoSequence(aXmlHeader));
     }
 
     OUString FastSaxSerializer::escapeXml( const OUString& s )
@@ -120,7 +122,7 @@ namespace sax_fastparser {
     {
         if( HAS_NAMESPACE( nElement ) ) {
             writeBytes(mxFastTokenHandler->getUTF8Identifier(NAMESPACE(nElement)));
-            writeBytes(aColon);
+            writeBytes(toUnoSequence(aColon));
             writeBytes(mxFastTokenHandler->getUTF8Identifier(TOKEN(nElement)));
         } else
             writeBytes(mxFastTokenHandler->getUTF8Identifier(nElement));
@@ -132,12 +134,12 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracket);
+        writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
         writeFastAttributeList(Attribs);
 
-        writeBytes(aClosingBracket);
+        writeBytes(toUnoSequence(aClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs )
@@ -146,19 +148,19 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracket);
+        writeBytes(toUnoSequence(aOpeningBracket));
 
         if (Namespace.getLength())
         {
             write(Namespace);
-            writeBytes(aColon);
+            writeBytes(toUnoSequence(aColon));
         }
         
         write(Name);
         
         writeFastAttributeList(Attribs);
             
-        writeBytes(aClosingBracket);
+        writeBytes(toUnoSequence(aClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::endFastElement( ::sal_Int32 Element )
@@ -167,11 +169,11 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracketAndSlash);
+        writeBytes(toUnoSequence(aOpeningBracketAndSlash));
 
         writeId(Element);
 
-        writeBytes(aClosingBracket);
+        writeBytes(toUnoSequence(aClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::endUnknownElement( const OUString& Namespace, const OUString& Name )
@@ -180,17 +182,17 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracketAndSlash);
+        writeBytes(toUnoSequence(aOpeningBracketAndSlash));
 
         if (Namespace.getLength())
         {
             write(Namespace);
-            writeBytes(aColon);
+            writeBytes(toUnoSequence(aColon));
         }
         
         write(Name);
         
-        writeBytes(aClosingBracket);
+        writeBytes(toUnoSequence(aClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::singleFastElement( ::sal_Int32 Element, const Reference< XFastAttributeList >& Attribs )
@@ -199,12 +201,12 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracket);
+        writeBytes(toUnoSequence(aOpeningBracket));
 
         writeId(Element);
         writeFastAttributeList(Attribs);
 
-        writeBytes(aSlashAndClosingBracket);
+        writeBytes(toUnoSequence(aSlashAndClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::singleUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs )
@@ -213,19 +215,19 @@ namespace sax_fastparser {
         if (!mxOutputStream.is())
             return;
 
-        writeBytes(aOpeningBracket);
+        writeBytes(toUnoSequence(aOpeningBracket));
 
         if (Namespace.getLength())
         {
             write(Namespace);
-            writeBytes(aColon);
+            writeBytes(toUnoSequence(aColon));
         }
         
         write(Name);
 
         writeFastAttributeList(Attribs);
             
-        writeBytes(aSlashAndClosingBracket);
+        writeBytes(toUnoSequence(aSlashAndClosingBracket));
     }
 
     void SAL_CALL FastSaxSerializer::characters( const OUString& aChars )
@@ -255,12 +257,12 @@ namespace sax_fastparser {
         sal_Int32 nAttrLength = aAttrSeq.getLength();
         for (sal_Int32 i = 0; i < nAttrLength; i++)
         {
-            writeBytes(aSpace);
+            writeBytes(toUnoSequence(aSpace));
 
             write(pAttr[i].Name);
-            writeBytes(aEqualSignAndQuote);
+            writeBytes(toUnoSequence(aEqualSignAndQuote));
             write(escapeXml(pAttr[i].Value));
-            writeBytes(aQuote);
+            writeBytes(toUnoSequence(aQuote));
         }
         
         Sequence< FastAttribute > aFastAttrSeq = Attribs->getFastAttributes();
@@ -268,16 +270,16 @@ namespace sax_fastparser {
         sal_Int32 nFastAttrLength = aFastAttrSeq.getLength();
         for (sal_Int32 j = 0; j < nFastAttrLength; j++)
         {
-            writeBytes(aSpace);
+            writeBytes(toUnoSequence(aSpace));
 
             sal_Int32 nToken = pFastAttr[j].Token;
             writeId(nToken);
             
-            writeBytes(aEqualSignAndQuote);
+            writeBytes(toUnoSequence(aEqualSignAndQuote));
     
             write(escapeXml(Attribs->getValue(pFastAttr[j].Token)));
             
-            writeBytes(aQuote);
+            writeBytes(toUnoSequence(aQuote));
         }
     }
 
commit 7fe956c481322d76e174edacdef10b78596dfb10
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 6 08:57:40 2010 +0100

    #i113910# fix frame effect around images in cairo on some drivers

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 04396ba..b0fa96c 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1395,6 +1395,7 @@ namespace cairocanvas
                 ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
                 ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
                  cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
+            cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
             cairo_rectangle( mpCairo.get(), 0, 0, aBitmapSize.Width, aBitmapSize.Height );
             cairo_clip( mpCairo.get() );
 


More information about the ooo-build-commit mailing list