strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS obo30 (1.8.40); FILE MERGED

Browse source 
2008/06/06 06:06:45 obo 1.8.40.2: #i90100# EOL missing
2008/05/29 14:43:43 obo 1.8.40.1: #i90100# ambigous Reference during ENABLE_PCH build
This commit is contained in:
Kurt Zenker 2008-06-24 15:55:33 +00:00
parent eda76fa550
commit 190fc8e3c7
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
framework/source/classes/imagewrapper.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: imagewrapper.cxx,v $
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@ -39,7 +39,6 @@
#include <tools/stream.hxx>
#include <cppuhelper/typeprovider.hxx>
using namespace rtl;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
@ -207,3 +206,4 @@ Sequence< sal_Int8 > SAL_CALL ImageWrapper::getImplementationId() throw ( Runtim
}
}

16
framework/source/classes/rootactiontriggercontainer.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: rootactiontriggercontainer.cxx,v $
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@ -42,7 +42,6 @@
#include <cppuhelper/typeprovider.hxx>
using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@ -138,7 +137,7 @@ throw ( Exception, RuntimeException )
else if ( aServiceSpecifier.equalsAscii( SERVICENAME_ACTIONTRIGGERSEPARATOR ))
return (OWeakObject *)( new ActionTriggerSeparatorPropertySet( m_xServiceManager ));
else
throw com::sun::star::uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
throw com::sun::star::uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Unknown service specifier!" )), (OWeakObject *)this );
}
Reference< XInterface > SAL_CALL RootActionTriggerContainer::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const Sequence< Any >& /*Arguments*/ )
@ -152,9 +151,9 @@ throw ( RuntimeException )
{
Sequence< ::rtl::OUString > aSeq( 3 );
aSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER ));
aSeq[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
aSeq[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR ));
aSeq[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGER ));
aSeq[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
aSeq[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERSEPARATOR ));
return aSeq;
}
@ -261,7 +260,7 @@ throw (::com::sun::star::uno::RuntimeException)
::rtl::OUString SAL_CALL RootActionTriggerContainer::getImplementationName()
throw ( RuntimeException )
{
return OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER ));
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER ));
}
sal_Bool SAL_CALL RootActionTriggerContainer::supportsService( const ::rtl::OUString& ServiceName )
@ -278,7 +277,7 @@ throw ( RuntimeException )
{
Sequence< ::rtl::OUString > seqServiceNames( 1 );
seqServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
seqServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_ACTIONTRIGGERCONTAINER ));
return seqServiceNames;
}
@ -366,3 +365,4 @@ void RootActionTriggerContainer::FillContainer()
}
}