SOURCES: openoffice.org-64bit-inline.diff (NEW) - force inlining o...
baggins
baggins at pld-linux.org
Sun Jan 22 13:14:23 CET 2006
Author: baggins Date: Sun Jan 22 12:14:23 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- force inlining on x8664, and fix non-inlineable code
---- Files affected:
SOURCES:
openoffice.org-64bit-inline.diff (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/openoffice.org-64bit-inline.diff
diff -u /dev/null SOURCES/openoffice.org-64bit-inline.diff:1.1
--- /dev/null Sun Jan 22 13:14:23 2006
+++ SOURCES/openoffice.org-64bit-inline.diff Sun Jan 22 13:14:18 2006
@@ -0,0 +1,2744 @@
+--- cppu/source/uno/assign.hxx.orig 2006-01-16 13:55:04.464641775 +0100
++++ cppu/source/uno/assign.hxx 2006-01-16 13:55:27.213233090 +0100
+@@ -50,7 +50,7 @@
+
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _assignInterface(
++__inline__ __attribute__((always_inline)) void _assignInterface(
+ void ** ppDest, void * pSource,
+ uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ SAL_THROW( () )
+@@ -60,7 +60,7 @@
+ *ppDest = pSource;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void * _queryInterface(
++__inline__ __attribute__((always_inline)) void * _queryInterface(
+ void * pSource,
+ typelib_TypeDescriptionReference * pDestType,
+ uno_QueryInterfaceFunc queryInterface )
+@@ -81,7 +81,7 @@
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+ SAL_THROW( () );
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _assignStruct(
++__inline__ __attribute__((always_inline)) sal_Bool _assignStruct(
+ void * pDest, void * pSource,
+ typelib_CompoundTypeDescription * pTypeDescr,
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+@@ -114,7 +114,7 @@
+ return sal_True;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _assignArray(
++__inline__ __attribute__((always_inline)) sal_Bool _assignArray(
+ void * pDest, void * pSource,
+ typelib_ArrayTypeDescription * pTypeDescr,
+ uno_QueryInterfaceFunc queryInterface, uno_AcquireFunc acquire, uno_ReleaseFunc release )
+@@ -237,7 +237,7 @@
+ return bRet;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _assignData(
++__inline__ __attribute__((always_inline)) sal_Bool _assignData(
+ void * pDest,
+ typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
+ void * pSource,
+--- cppu/source/uno/constr.hxx.orig 2005-09-08 10:50:56.000000000 +0200
++++ cppu/source/uno/constr.hxx 2006-01-16 13:53:47.953833046 +0100
+@@ -46,7 +46,7 @@
+ //##################################################################################################
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _defaultConstructUnion(
++__inline__ __attribute__((always_inline)) void _defaultConstructUnion(
+ void * pMem,
+ typelib_TypeDescription * pTypeDescr )
+ SAL_THROW( () )
+@@ -62,7 +62,7 @@
+ typelib_CompoundTypeDescription * pCompType )
+ SAL_THROW( () );
+ //--------------------------------------------------------------------------------------------------
+-inline void _defaultConstructStruct(
++__inline__ __attribute__((always_inline)) void _defaultConstructStruct(
+ void * pMem,
+ typelib_CompoundTypeDescription * pTypeDescr )
+ SAL_THROW( () )
+@@ -83,7 +83,7 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _defaultConstructArray(
++__inline__ __attribute__((always_inline)) void _defaultConstructArray(
+ void * pMem,
+ typelib_ArrayTypeDescription * pTypeDescr )
+ {
+@@ -164,7 +164,7 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _defaultConstructData(
++__inline__ __attribute__((always_inline)) void _defaultConstructData(
+ void * pMem,
+ typelib_TypeDescriptionReference * pType,
+ typelib_TypeDescription * pTypeDescr )
+--- cppu/source/uno/copy.hxx.orig 2005-09-08 10:51:21.000000000 +0200
++++ cppu/source/uno/copy.hxx 2006-01-16 13:54:50.840880957 +0100
+@@ -47,7 +47,7 @@
+ //##################################################################################################
+
+ //------------------------------------------------------------------------------
+-inline uno_Sequence * allocSeq(
++__inline__ __attribute__((always_inline)) uno_Sequence * allocSeq(
+ sal_Int32 nElementSize, sal_Int32 nElements )
+ {
+ OSL_ASSERT( nElements >= 0 && nElementSize >= 0 );
+@@ -73,7 +73,7 @@
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+ SAL_THROW ( () );
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructStruct(
++__inline__ __attribute__((always_inline)) void _copyConstructStruct(
+ void * pDest, void * pSource,
+ typelib_CompoundTypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -112,7 +112,7 @@
+ }
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructArray(
++__inline__ __attribute__((always_inline)) void _copyConstructArray(
+ void * pDest, void * pSource,
+ typelib_ArrayTypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -146,7 +146,7 @@
+ }
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructUnion(
++__inline__ __attribute__((always_inline)) void _copyConstructUnion(
+ void * pDest, void * pSource,
+ typelib_TypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -178,7 +178,7 @@
+ uno_AcquireFunc acquire, uno_Mapping * mapping );
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructAnyFromData(
++__inline__ __attribute__((always_inline)) void _copyConstructAnyFromData(
+ uno_Any * pDestAny, void * pSource,
+ typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -357,7 +357,7 @@
+ }
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructAny(
++__inline__ __attribute__((always_inline)) void _copyConstructAny(
+ uno_Any * pDestAny, void * pSource,
+ typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -542,7 +542,7 @@
+ }
+ }
+ //------------------------------------------------------------------------------
+-inline uno_Sequence * icopyConstructSequence(
++__inline__ __attribute__((always_inline)) uno_Sequence * icopyConstructSequence(
+ uno_Sequence * pSource,
+ typelib_TypeDescriptionReference * pElementType,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+@@ -751,7 +751,7 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _copyConstructData(
++__inline__ __attribute__((always_inline)) void _copyConstructData(
+ void * pDest, void * pSource,
+ typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
+ uno_AcquireFunc acquire, uno_Mapping * mapping )
+--- cppu/source/uno/destr.hxx.orig 2006-01-16 13:55:47.521404651 +0100
++++ cppu/source/uno/destr.hxx 2006-01-16 13:56:16.955406494 +0100
+@@ -46,7 +46,7 @@
+ //##################################################################################################
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _destructUnion(
++__inline__ __attribute__((always_inline)) void _destructUnion(
+ void * pValue,
+ typelib_TypeDescription * pTypeDescr,
+ uno_ReleaseFunc release )
+@@ -65,7 +65,7 @@
+ uno_ReleaseFunc release )
+ SAL_THROW( () );
+ //--------------------------------------------------------------------------------------------------
+-inline void _destructStruct(
++__inline__ __attribute__((always_inline)) void _destructStruct(
+ void * pValue,
+ typelib_CompoundTypeDescription * pTypeDescr,
+ uno_ReleaseFunc release )
+@@ -88,7 +88,7 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _destructArray(
++__inline__ __attribute__((always_inline)) void _destructArray(
+ void * pValue,
+ typelib_ArrayTypeDescription * pTypeDescr,
+ uno_ReleaseFunc release )
+@@ -118,7 +118,7 @@
+ uno_ReleaseFunc release );
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _destructAny(
++__inline__ __attribute__((always_inline)) void _destructAny(
+ uno_Any * pAny,
+ uno_ReleaseFunc release )
+ SAL_THROW( () )
+@@ -197,7 +197,7 @@
+ ::typelib_typedescriptionreference_release( pType );
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Int32 idestructElements(
++__inline__ __attribute__((always_inline)) sal_Int32 idestructElements(
+ void * pElements, typelib_TypeDescriptionReference * pElementType,
+ sal_Int32 nStartIndex, sal_Int32 nStopIndex,
+ uno_ReleaseFunc release )
+@@ -339,7 +339,7 @@
+ }
+
+ //------------------------------------------------------------------------------
+-inline void idestructSequence(
++__inline__ __attribute__((always_inline)) void idestructSequence(
+ uno_Sequence * pSeq,
+ typelib_TypeDescriptionReference * pType,
+ typelib_TypeDescription * pTypeDescr,
+@@ -371,7 +371,7 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline void _destructData(
++__inline__ __attribute__((always_inline)) void _destructData(
+ void * pValue,
+ typelib_TypeDescriptionReference * pType,
+ typelib_TypeDescription * pTypeDescr,
+--- cppu/source/uno/eq.hxx.orig 2006-01-16 13:56:23.580831253 +0100
++++ cppu/source/uno/eq.hxx 2006-01-16 13:56:42.250392441 +0100
+@@ -53,7 +53,7 @@
+ //##################################################################################################
+
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _equalObject(
++__inline__ __attribute__((always_inline)) sal_Bool _equalObject(
+ void * pI1, void * pI2,
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ SAL_THROW( () )
+@@ -89,7 +89,7 @@
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ SAL_THROW( () );
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _equalStruct(
++__inline__ __attribute__((always_inline)) sal_Bool _equalStruct(
+ void * pDest, void *pSource,
+ typelib_CompoundTypeDescription * pTypeDescr,
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+@@ -126,7 +126,7 @@
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+ SAL_THROW( () );
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _equalSequence(
++__inline__ __attribute__((always_inline)) sal_Bool _equalSequence(
+ uno_Sequence * pDest, uno_Sequence * pSource,
+ typelib_TypeDescriptionReference * pElementType,
+ uno_QueryInterfaceFunc queryInterface, uno_ReleaseFunc release )
+@@ -307,7 +307,7 @@
+ return sal_False;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _equalData(
++__inline__ __attribute__((always_inline)) sal_Bool _equalData(
+ void * pDest,
+ typelib_TypeDescriptionReference * pDestType, typelib_TypeDescription * pDestTypeDescr,
+ void * pSource,
+--- cppu/source/uno/prim.hxx.orig 2006-01-16 13:56:50.243492033 +0100
++++ cppu/source/uno/prim.hxx 2006-01-16 13:57:21.161141190 +0100
+@@ -83,7 +83,7 @@
+ extern typelib_TypeDescriptionReference * g_pVoidType;
+
+ //--------------------------------------------------------------------------------------------------
+-inline void * _map(
++__inline__ __attribute__((always_inline)) void * _map(
+ void * p,
+ typelib_TypeDescriptionReference * pType, typelib_TypeDescription * pTypeDescr,
+ uno_Mapping * mapping )
+@@ -108,7 +108,7 @@
+ return pRet;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () )
++__inline__ __attribute__((always_inline)) void _acquire( void * p, uno_AcquireFunc acquire ) SAL_THROW( () )
+ {
+ if (p)
+ {
+@@ -123,7 +123,7 @@
+ }
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () )
++__inline__ __attribute__((always_inline)) void _release( void * p, uno_ReleaseFunc release ) SAL_THROW( () )
+ {
+ if (p)
+ {
+@@ -139,7 +139,7 @@
+ }
+
+ //------------------------------------------------------------------------------
+-inline sal_uInt32 calcSeqMemSize(
++__inline__ __attribute__((always_inline)) sal_uInt32 calcSeqMemSize(
+ sal_Int32 nElementSize, sal_Int32 nElements )
+ {
+ sal_uInt64 nSize =
+@@ -152,13 +152,13 @@
+ }
+
+ //--------------------------------------------------------------------------------------------------
+-inline uno_Sequence * createEmptySequence() SAL_THROW( () )
++__inline__ __attribute__((always_inline)) uno_Sequence * createEmptySequence() SAL_THROW( () )
+ {
+ ::osl_incrementInterlockedCount( &g_emptySeq.nRefCount );
+ return &g_emptySeq;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline typelib_TypeDescriptionReference * _getVoidType()
++__inline__ __attribute__((always_inline)) typelib_TypeDescriptionReference * _getVoidType()
+ SAL_THROW( () )
+ {
+ if (! g_pVoidType)
+@@ -188,7 +188,7 @@
+ void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * pDestType );
+
+ //--------------------------------------------------------------------------------------------------
+-inline typelib_TypeDescriptionReference * _unionGetSetType(
++__inline__ __attribute__((always_inline)) typelib_TypeDescriptionReference * _unionGetSetType(
+ void * pUnion, typelib_TypeDescription * pTD )
+ SAL_THROW( () )
+ {
+@@ -214,7 +214,7 @@
+ return pRet;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Bool _type_equals(
++__inline__ __attribute__((always_inline)) sal_Bool _type_equals(
+ typelib_TypeDescriptionReference * pType1, typelib_TypeDescriptionReference * pType2 )
+ SAL_THROW( () )
+ {
+--- stoc/source/registry_tdprovider/base.hxx.orig 2006-01-16 14:17:21.542252132 +0100
++++ stoc/source/registry_tdprovider/base.hxx 2006-01-16 14:18:13.507903361 +0100
+@@ -141,7 +141,7 @@
+ extern rtl_StandardModuleCount g_moduleCount;
+
+ //--------------------------------------------------------------------------------------------------
+-inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal )
++__inline__ __attribute__((always_inline)) sal_Int32 getRTValueAsInt32( const RTConstValue & rVal )
+ {
+ switch (rVal.m_type)
+ {
+@@ -160,7 +160,7 @@
+ return 0;
+ }
+ //--------------------------------------------------------------------------------------------------
+-inline Any getRTValue( const RTConstValue & rVal )
++__inline__ __attribute__((always_inline)) Any getRTValue( const RTConstValue & rVal )
+ {
+ switch (rVal.m_type)
+ {
+--- xmlscript/source/xmldlg_imexp/exp_share.hxx.orig 2006-01-16 14:22:43.893650843 +0100
++++ xmlscript/source/xmldlg_imexp/exp_share.hxx 2006-01-16 14:23:53.559096084 +0100
+@@ -71,7 +71,7 @@
+
+ ::rtl::OUString _id;
+
+- inline Style( short all_ ) SAL_THROW( () )
++ __inline__ __attribute__((always_inline)) Style( short all_ ) SAL_THROW( () )
+ : _fontRelief( css::awt::FontRelief::NONE )
+ , _fontEmphasisMark( css::awt::FontEmphasisMark::NONE )
+ , _all( all_ )
+@@ -100,7 +100,7 @@
+ css::uno::Reference< css::beans::XPropertyState > _xPropState;
+
+ public:
+- inline ElementDescriptor(
++ __inline__ __attribute__((always_inline)) ElementDescriptor(
+ css::uno::Reference< css::beans::XPropertySet > const & xProps,
+ css::uno::Reference< css::beans::XPropertyState > const & xPropState,
+ ::rtl::OUString const & name )
+@@ -109,39 +109,39 @@
+ , _xProps( xProps )
+ , _xPropState( xPropState )
+ {}
+- inline ElementDescriptor(
++ __inline__ __attribute__((always_inline)) ElementDescriptor(
+ ::rtl::OUString const & name )
+ SAL_THROW( () )
+ : XMLElement( name )
+ {}
+
+ template<typename T>
+- inline void read(
++ __inline__ __attribute__((always_inline)) void read(
+ ::rtl::OUString const & propName, ::rtl::OUString const & attrName,
+ bool forceAttribute = false );
+
+ //
+ template<typename T>
+- inline bool readProp( T * ret, ::rtl::OUString const & rPropName );
++ __inline__ __attribute__((always_inline)) bool readProp( T * ret, ::rtl::OUString const & rPropName );
+ css::uno::Any readProp( ::rtl::OUString const & rPropName );
+ //
+ void readDefaults( bool supportPrintable = true );
+ //
+ void readStringAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+- inline void readDoubleAttr(
++ __inline__ __attribute__((always_inline)) void readDoubleAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ { read<double>( rPropName, rAttrName ); }
+- inline void readLongAttr(
++ __inline__ __attribute__((always_inline)) void readLongAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName,
+ bool forceAttribute = false )
+ { read<sal_Int32>( rPropName, rAttrName, forceAttribute ); }
+ void readHexLongAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+- inline void readShortAttr(
++ __inline__ __attribute__((always_inline)) void readShortAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ { read<sal_Int32>( rPropName, rAttrName ); }
+- inline void readBoolAttr(
++ __inline__ __attribute__((always_inline)) void readBoolAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName )
+ { read<sal_Bool>( rPropName, rAttrName ); }
+
+@@ -164,7 +164,7 @@
+ void readLineEndFormatAttr(
+ ::rtl::OUString const & rPropName, ::rtl::OUString const & rAttrName );
+ //
+- inline void addBoolAttr(
++ __inline__ __attribute__((always_inline)) void addBoolAttr(
+ ::rtl::OUString const & rAttrName, sal_Bool bValue )
+ { addAttribute( rAttrName, ::rtl::OUString::valueOf(bValue) ); }
+ void addNumberFormatAttr(
+@@ -218,7 +218,7 @@
+ };
+
+ template<typename T>
+-inline void ElementDescriptor::read(
++__inline__ __attribute__((always_inline)) void ElementDescriptor::read(
+ ::rtl::OUString const & propName, ::rtl::OUString const & attrName,
+ bool forceAttribute )
+ {
+@@ -236,7 +236,7 @@
+ }
+
+ template<typename T>
+-inline bool ElementDescriptor::readProp(
++__inline__ __attribute__((always_inline)) bool ElementDescriptor::readProp(
+ T * ret, ::rtl::OUString const & rPropName )
+ {
+ _xProps->getPropertyValue( rPropName ) >>= *ret;
+--- xmlscript/source/xmldlg_imexp/imp_share.hxx.orig 2006-01-16 14:24:07.990666679 +0100
++++ xmlscript/source/xmldlg_imexp/imp_share.hxx 2006-01-16 14:26:13.145925788 +0100
+@@ -59,7 +59,7 @@
+ {
+
+ //
+-inline sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () )
++__inline__ __attribute__((always_inline)) sal_Int32 toInt32( ::rtl::OUString const & rStr ) SAL_THROW( () )
+ {
+ sal_Int32 nVal;
+ if (rStr.getLength() > 2 && rStr[ 0 ] == '0' && rStr[ 1 ] == 'x')
+@@ -69,7 +69,7 @@
+ return nVal;
+ }
+
+-inline bool getBoolAttr(
++__inline__ __attribute__((always_inline)) bool getBoolAttr(
+ sal_Bool * pRet, ::rtl::OUString const & rAttrName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ sal_Int32 nUid )
+@@ -97,7 +97,7 @@
+ return false;
+ }
+
+-inline bool getStringAttr(
++__inline__ __attribute__((always_inline)) bool getStringAttr(
+ ::rtl::OUString * pRet, ::rtl::OUString const & rAttrName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ sal_Int32 nUid )
+@@ -106,7 +106,7 @@
+ return (pRet->getLength() > 0);
+ }
+
+-inline bool getLongAttr(
++__inline__ __attribute__((always_inline)) bool getLongAttr(
+ sal_Int32 * pRet, ::rtl::OUString const & rAttrName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ sal_Int32 nUid )
+@@ -140,7 +140,7 @@
+ sal_Int32 XMLNS_DIALOGS_UID, XMLNS_SCRIPT_UID;
+
+ public:
+- inline bool isEventElement(
++ __inline__ __attribute__((always_inline)) bool isEventElement(
+ sal_Int32 nUid, ::rtl::OUString const & rLocalName )
+ {
+ return ((XMLNS_SCRIPT_UID == nUid &&
+@@ -161,12 +161,12 @@
+ ::rtl::OUString const & rStyleId ) const
+ SAL_THROW( () );
+
+- inline css::uno::Reference< css::uno::XComponentContext >
++ __inline__ __attribute__((always_inline)) css::uno::Reference< css::uno::XComponentContext >
+ const & getComponentContext() SAL_THROW( () ) { return _xContext; }
+ css::uno::Reference< css::util::XNumberFormatsSupplier >
+ const & getNumberFormatsSupplier();
+
+- inline DialogImport(
++ __inline__ __attribute__((always_inline)) DialogImport(
+ css::uno::Reference<css::uno::XComponentContext> const & xContext,
+ css::uno::Reference<css::container::XNameContainer>
+ const & xDialogModel )
+@@ -257,7 +257,7 @@
+ css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+- inline StylesElement(
++ __inline__ __attribute__((always_inline)) StylesElement(
+ ::rtl::OUString const & rLocalName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ ElementBase * pParent, DialogImport * pImport )
+@@ -312,7 +312,7 @@
+ bool importVisualEffectStyle(
+ css::uno::Reference< css::beans::XPropertySet > const & xProps );
+
+- inline StyleElement(
++ __inline__ __attribute__((always_inline)) StyleElement(
+ ::rtl::OUString const & rLocalName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ ElementBase * pParent, DialogImport * pImport )
+@@ -342,7 +342,7 @@
+ css::uno::Reference<css::xml::input::XAttributes> const & xAttributes )
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+- inline MenuPopupElement(
++ __inline__ __attribute__((always_inline)) MenuPopupElement(
+ ::rtl::OUString const & rLocalName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ ElementBase * pParent, DialogImport * pImport )
+@@ -387,7 +387,7 @@
+ ::rtl::OUString _aId;
+
+ public:
+- inline ImportContext(
++ __inline__ __attribute__((always_inline)) ImportContext(
+ DialogImport * pImport,
+ css::uno::Reference< css::beans::XPropertySet > const & xControlModel_,
+ ::rtl::OUString const & id )
+@@ -396,7 +396,7 @@
+ _aId( id )
+ { OSL_ASSERT( _xControlModel.is() ); }
+
+- inline css::uno::Reference< css::beans::XPropertySet > getControlModel()
++ __inline__ __attribute__((always_inline)) css::uno::Reference< css::beans::XPropertySet > getControlModel()
+ { return _xControlModel; }
+
+ void importDefaults(
+@@ -462,7 +462,7 @@
+ class ControlImportContext : public ImportContext
+ {
+ public:
+- inline ControlImportContext(
++ __inline__ __attribute__((always_inline)) ControlImportContext(
+ DialogImport * pImport,
+ ::rtl::OUString const & rId, ::rtl::OUString const & rControlName )
+ : ImportContext(
+@@ -471,7 +471,7 @@
+ pImport->_xDialogModelFactory->createInstance( rControlName ),
+ css::uno::UNO_QUERY_THROW ), rId )
+ {}
+- inline ~ControlImportContext()
++ __inline__ __attribute__((always_inline)) ~ControlImportContext()
+ {
+ _pImport->_xDialogModel->insertByName(
+ _aId, css::uno::makeAny(
+@@ -493,7 +493,7 @@
+ virtual void SAL_CALL endElement()
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+- inline WindowElement(
++ __inline__ __attribute__((always_inline)) WindowElement(
+ ::rtl::OUString const & rLocalName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ ElementBase * pParent, DialogImport * pImport )
+@@ -510,7 +510,7 @@
+ virtual void SAL_CALL endElement()
+ throw (css::xml::sax::SAXException, css::uno::RuntimeException);
+
+- inline EventElement(
++ __inline__ __attribute__((always_inline)) EventElement(
+ sal_Int32 nUid, ::rtl::OUString const & rLocalName,
+ css::uno::Reference< css::xml::input::XAttributes > const & xAttributes,
+ ElementBase * pParent, DialogImport * pImport )
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list