diff options
| -rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 17 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/scdetect.hxx | 11 |
2 files changed, 13 insertions, 15 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 94c1f7f0d535..782d221daf80 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -74,7 +74,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using ::rtl::OUString; -ScFilterDetect::ScFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& /* xFactory */ ) +ScFilterDetect::ScFilterDetect( const uno::Reference<lang::XMultiServiceFactory>& /*xFactory*/ ) { } @@ -224,11 +224,12 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) return ( 0x0d == nEndFlag ); } -::rtl::OUString SAL_CALL ScFilterDetect::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( ::com::sun::star::uno::RuntimeException ) +::rtl::OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) + throw( uno::RuntimeException ) { - REFERENCE< XInputStream > xStream; - REFERENCE< XContent > xContent; - REFERENCE< XInteractionHandler > xInteraction; + uno::Reference< XInputStream > xStream; + uno::Reference< XContent > xContent; + uno::Reference< XInteractionHandler > xInteraction; String aURL; ::rtl::OUString sTemp; String aTypeName; // a name describing the type (from MediaDescriptor, usually from flat detection) @@ -355,18 +356,18 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) // error during storage creation means _here_ that the medium // is broken, but we can not handle it in medium since unpossibility // to create a storage does not _always_ means that the medium is broken - aMedium.SetError( aMedium.GetLastStorageCreationState(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); + aMedium.SetError(aMedium.GetLastStorageCreationState(), OUString(OSL_LOG_PREFIX)); if ( xInteraction.is() ) { OUString empty; try { InteractiveAppException xException( empty, - REFERENCE< XInterface >(), + uno::Reference< XInterface >(), InteractionClassification_ERROR, aMedium.GetError() ); - REFERENCE< XInteractionRequest > xRequest( + uno::Reference< XInteractionRequest > xRequest( new ucbhelper::SimpleInteractionRequest( makeAny( xException ), ucbhelper::CONTINUATION_APPROVE ) ); xInteraction->handle( xRequest ); diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 872154fa171a..4986885f6452 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -50,22 +50,19 @@ namespace com #include <sfx2/sfxuno.hxx> -#define REFERENCE ::com::sun::star::uno::Reference -#define SEQUENCE ::com::sun::star::uno::Sequence -#define RUNTIME_EXCEPTION ::com::sun::star::uno::RuntimeException - class ScFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { public: - ScFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); - virtual ~ScFilterDetect(); + ScFilterDetect( const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& xFactory ); + virtual ~ScFilterDetect(); SFX_DECL_XSERVICEINFO_NOFACTORY //---------------------------------------------------------------------------------- // XExtendedFilterDetect //---------------------------------------------------------------------------------- - virtual ::rtl::OUString SAL_CALL detect( SEQUENCE< ::com::sun::star::beans::PropertyValue >& lDescriptor ) throw( RUNTIME_EXCEPTION ); + virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) + throw(com::sun::star::uno::RuntimeException); }; #endif |