Kaydet (Commit) a808497d authored tarafından Thomas Arnhold's avatar Thomas Arnhold

drop prefix from ::css

as css is already ::com::sun::star

Change-Id: I86b43843e4b74f990b6e05dee37184a002072d12
üst 83810a61
...@@ -202,7 +202,7 @@ public: ...@@ -202,7 +202,7 @@ public:
private: private:
OUString m_sUserDir; OUString m_sUserDir;
css::uno::Reference< ::css::configuration::backend::XLayer> m_xLayer; css::uno::Reference< css::configuration::backend::XLayer> m_xLayer;
void migrateJavarc(); void migrateJavarc();
typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;
......
...@@ -117,7 +117,7 @@ namespace javaunohelper { ...@@ -117,7 +117,7 @@ namespace javaunohelper {
} }
css::uno::Reference< css::uno::XComponentContext > install_vm_singleton( css::uno::Reference< css::uno::XComponentContext > install_vm_singleton(
css::uno::Reference< ::css::uno::XComponentContext > const & xContext, css::uno::Reference< css::uno::XComponentContext > const & xContext,
::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access ) ::rtl::Reference< ::jvmaccess::UnoVirtualMachine > const & vm_access )
{ {
css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) ); css::uno::Reference< css::lang::XSingleComponentFactory > xFac( new SingletonFactory( vm_access ) );
......
...@@ -248,7 +248,7 @@ public: ...@@ -248,7 +248,7 @@ public:
virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException) ; virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException) ;
void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const ::css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
......
...@@ -97,8 +97,8 @@ public: ...@@ -97,8 +97,8 @@ public:
*/ */
void NotifyListeners ( void NotifyListeners (
const ::rtl::OUString& rsEventType, const ::rtl::OUString& rsEventType,
const ::css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId, const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
const ::css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject); const css::uno::Reference<css::drawing::framework::XResource>& rxResourceObject);
/** Call all listeners and inform them that the /** Call all listeners and inform them that the
ConfigurationController is being disposed. When this method returns ConfigurationController is being disposed. When this method returns
......
...@@ -40,7 +40,7 @@ namespace sd { namespace framework { ...@@ -40,7 +40,7 @@ namespace sd { namespace framework {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper1 <
::css::drawing::framework::XConfigurationChangeListener css::drawing::framework::XConfigurationChangeListener
> ToolBarModuleInterfaceBase; > ToolBarModuleInterfaceBase;
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper1 <
::css::drawing::framework::XConfigurationChangeListener css::drawing::framework::XConfigurationChangeListener
> ViewTabBarModuleInterfaceBase; > ViewTabBarModuleInterfaceBase;
} // end of anonymous namespace. } // end of anonymous namespace.
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper2 < typedef ::cppu::WeakComponentImplHelper2 <
::css::drawing::framework::XConfigurationController, css::drawing::framework::XConfigurationController,
::css::lang::XInitialization css::lang::XInitialization
> ConfigurationControllerInterfaceBase; > ConfigurationControllerInterfaceBase;
} // end of anonymous namespace. } // end of anonymous namespace.
......
...@@ -80,7 +80,7 @@ public: ...@@ -80,7 +80,7 @@ public:
(when the sd modules is unloaded) is done by a) calling dispose() (when the sd modules is unloaded) is done by a) calling dispose()
when the XComponent is supported and by b) releasing the reference. when the XComponent is supported and by b) releasing the reference.
*/ */
void AddResource (const ::css::uno::Reference<css::uno::XInterface>& rxResource); void AddResource (const css::uno::Reference<css::uno::XInterface>& rxResource);
protected: protected:
friend class ::SdModule; friend class ::SdModule;
......
...@@ -61,16 +61,16 @@ public: ...@@ -61,16 +61,16 @@ public:
// XSlideRenderer // XSlideRenderer
virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview ( virtual css::uno::Reference<css::awt::XBitmap> SAL_CALL createPreview (
const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
const css::awt::Size& rMaximumPreviewPixelSize, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor) sal_Int16 nSuperSampleFactor)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas ( virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL createPreviewForCanvas (
const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
const css::awt::Size& rMaximumPreviewPixelSize, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor, sal_Int16 nSuperSampleFactor,
const ::css::uno::Reference<css::rendering::XCanvas>& rxCanvas) const css::uno::Reference<css::rendering::XCanvas>& rxCanvas)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual css::awt::Size SAL_CALL calculatePreviewSize ( virtual css::awt::Size SAL_CALL calculatePreviewSize (
...@@ -82,7 +82,7 @@ private: ...@@ -82,7 +82,7 @@ private:
PreviewRenderer maPreviewRenderer; PreviewRenderer maPreviewRenderer;
BitmapEx CreatePreview ( BitmapEx CreatePreview (
const ::css::uno::Reference<css::drawing::XDrawPage>& rxSlide, const css::uno::Reference<css::drawing::XDrawPage>& rxSlide,
const css::awt::Size& rMaximumPreviewPixelSize, const css::awt::Size& rMaximumPreviewPixelSize,
sal_Int16 nSuperSampleFactor) sal_Int16 nSuperSampleFactor)
throw (css::uno::RuntimeException); throw (css::uno::RuntimeException);
......
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
const ::std::vector<css::uno::Any>&) > ItemProcessor; const ::std::vector<css::uno::Any>&) > ItemProcessor;
typedef ::boost::function<void( typedef ::boost::function<void(
const ::rtl::OUString&, const ::rtl::OUString&,
const ::css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor; const css::uno::Reference<css::beans::XPropertySet>&) > PropertySetProcessor;
/** Execute a functor for all elements of the given container. /** Execute a functor for all elements of the given container.
@param rxContainer @param rxContainer
......
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
private: private:
::rtl::OUString msEventType; ::rtl::OUString msEventType;
::css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController; css::uno::Reference<css::drawing::framework::XConfigurationController> mxConfigurationController;
Predicate maPredicate; Predicate maPredicate;
Action maAction; Action maAction;
......
...@@ -54,7 +54,7 @@ PresenterSprite::~PresenterSprite (void) ...@@ -54,7 +54,7 @@ PresenterSprite::~PresenterSprite (void)
} }
void PresenterSprite::SetFactory ( void PresenterSprite::SetFactory (
const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory) const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory)
{ {
if (mxSpriteFactory != rxSpriteFactory) if (mxSpriteFactory != rxSpriteFactory)
{ {
...@@ -65,7 +65,7 @@ void PresenterSprite::SetFactory ( ...@@ -65,7 +65,7 @@ void PresenterSprite::SetFactory (
} }
} }
::css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void)
{ {
ProvideSprite(); ProvideSprite();
if (mxSprite.is()) if (mxSprite.is())
......
...@@ -45,9 +45,9 @@ public: ...@@ -45,9 +45,9 @@ public:
It is also used to call updateScreen() at (wrapped by the Update() method). It is also used to call updateScreen() at (wrapped by the Update() method).
*/ */
void SetFactory ( void SetFactory (
const ::css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory);
::css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); css::uno::Reference<css::rendering::XCanvas> GetCanvas (void);
void Show (void); void Show (void);
void Hide (void); void Hide (void);
...@@ -58,8 +58,8 @@ public: ...@@ -58,8 +58,8 @@ public:
void Update (void); void Update (void);
private: private:
::css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory;
::css::uno::Reference<css::rendering::XCustomSprite> mxSprite; css::uno::Reference<css::rendering::XCustomSprite> mxSprite;
css::geometry::RealSize2D maSize; css::geometry::RealSize2D maSize;
css::geometry::RealPoint2D maLocation; css::geometry::RealPoint2D maLocation;
bool mbIsVisible; bool mbIsVisible;
......
...@@ -64,7 +64,7 @@ namespace sdext { namespace presenter { ...@@ -64,7 +64,7 @@ namespace sdext { namespace presenter {
PresenterTextView::PresenterTextView ( PresenterTextView::PresenterTextView (
const Reference<XComponentContext>& rxContext, const Reference<XComponentContext>& rxContext,
const Reference<rendering::XCanvas>& rxCanvas, const Reference<rendering::XCanvas>& rxCanvas,
const ::boost::function<void(const ::css::awt::Rectangle&)>& rInvalidator) const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator)
: mxCanvas(rxCanvas), : mxCanvas(rxCanvas),
mbDoOuput(true), mbDoOuput(true),
mxBreakIterator(), mxBreakIterator(),
......
...@@ -222,7 +222,7 @@ public: ...@@ -222,7 +222,7 @@ public:
PresenterTextView ( PresenterTextView (
const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
const ::boost::function<void(const ::css::awt::Rectangle&)>& rInvalidator); const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator);
void SetText (const css::uno::Reference<css::text::XText>& rxText); void SetText (const css::uno::Reference<css::text::XText>& rxText);
void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster);
...@@ -267,7 +267,7 @@ private: ...@@ -267,7 +267,7 @@ private:
SharedPresenterTextCaret mpCaret; SharedPresenterTextCaret mpCaret;
double mnLeftOffset; double mnLeftOffset;
double mnTopOffset; double mnTopOffset;
const ::boost::function<void(const ::css::awt::Rectangle&)> maInvalidator; const ::boost::function<void(const css::awt::Rectangle&)> maInvalidator;
bool mbIsFormatPending; bool mbIsFormatPending;
sal_Int32 mnCharacterCount; sal_Int32 mnCharacterCount;
::boost::function<void(void)> maTextChangeBroadcaster; ::boost::function<void(void)> maTextChangeBroadcaster;
......
...@@ -211,7 +211,7 @@ private: ...@@ -211,7 +211,7 @@ private:
const bool bMouseDown=false); const bool bMouseDown=false);
void ProcessEntry ( void ProcessEntry (
const ::css::uno::Reference<css::beans::XPropertySet>& rProperties, const css::uno::Reference<css::beans::XPropertySet>& rProperties,
Context& rContext); Context& rContext);
/** This method throws a DisposedException when the object has already been /** This method throws a DisposedException when the object has already been
......
...@@ -68,7 +68,7 @@ class PresenterWindowManager ...@@ -68,7 +68,7 @@ class PresenterWindowManager
{ {
public: public:
PresenterWindowManager ( PresenterWindowManager (
const ::css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer,
const ::rtl::Reference<PresenterController>& rpPresenterController); const ::rtl::Reference<PresenterController>& rpPresenterController);
virtual ~PresenterWindowManager (void); virtual ~PresenterWindowManager (void);
......
...@@ -625,8 +625,8 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const css::document::EventObject ...@@ -625,8 +625,8 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const css::document::EventObject
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const ::css::document::DocumentEvent& _Event ) void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const css::document::DocumentEvent& _Event )
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
implts_notifyJobExecution(css::document::EventObject(_Event.Source, _Event.EventName)); implts_notifyJobExecution(css::document::EventObject(_Event.Source, _Event.EventName));
implts_checkAndExecuteEventBindings(_Event); implts_checkAndExecuteEventBindings(_Event);
......
...@@ -34,10 +34,10 @@ MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId ) ...@@ -34,10 +34,10 @@ MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId )
} }
// virtual // virtual
::css::uno::Reference< ::css::awt::XWindowPeer > css::uno::Reference< css::awt::XWindowPeer >
MultiLineEdit::GetComponentInterface(sal_Bool bCreate) MultiLineEdit::GetComponentInterface(sal_Bool bCreate)
{ {
::css::uno::Reference< ::css::awt::XWindowPeer > xPeer( css::uno::Reference< css::awt::XWindowPeer > xPeer(
VclMultiLineEdit::GetComponentInterface(false)); VclMultiLineEdit::GetComponentInterface(false));
if (!xPeer.is() && bCreate) if (!xPeer.is() && bCreate)
{ {
......
...@@ -36,7 +36,7 @@ namespace svt ...@@ -36,7 +36,7 @@ namespace svt
{ {
} }
::css::uno::Reference< ::css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext() css::uno::Reference< css::accessibility::XAccessibleContext > TextWindowPeer::CreateAccessibleContext()
{ {
return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext( return m_pFactoryAccess->getFactory().createAccessibleTextWindowContext(
this, m_rEngine, m_rView, m_bCompoundControlChild this, m_rEngine, m_rView, m_bCompoundControlChild
......
...@@ -146,7 +146,7 @@ public: ...@@ -146,7 +146,7 @@ public:
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
virtual void SAL_CALL virtual void SAL_CALL
impl_notify( const ::css::ucb::ListEvent& Changes ) impl_notify( const css::ucb::ListEvent& Changes )
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
}; };
...@@ -179,7 +179,7 @@ public: ...@@ -179,7 +179,7 @@ public:
// XDynamicResultSetListener // XDynamicResultSetListener
//----------------------------------------------------------------- //-----------------------------------------------------------------
virtual void SAL_CALL virtual void SAL_CALL
notify( const ::css::ucb::ListEvent& Changes ) notify( const css::ucb::ListEvent& Changes )
throw( css::uno::RuntimeException ); throw( css::uno::RuntimeException );
//----------------------------------------------------------------- //-----------------------------------------------------------------
......
...@@ -55,15 +55,15 @@ ...@@ -55,15 +55,15 @@
namespace { namespace {
class Service: public ::cppu::WeakImplHelper1< ::css::lang::XMain > { class Service: public ::cppu::WeakImplHelper1< css::lang::XMain > {
public: public:
explicit Service( explicit Service(
::css::uno::Reference< ::css::uno::XComponentContext > const & context): css::uno::Reference< css::uno::XComponentContext > const & context):
context_(context) {} context_(context) {}
virtual ::sal_Int32 SAL_CALL run( virtual ::sal_Int32 SAL_CALL run(
::css::uno::Sequence< ::rtl::OUString > const &) css::uno::Sequence< ::rtl::OUString > const &)
throw (::css::uno::RuntimeException); throw (css::uno::RuntimeException);
private: private:
Service(Service &); // not defined Service(Service &); // not defined
...@@ -72,14 +72,14 @@ private: ...@@ -72,14 +72,14 @@ private:
virtual ~Service() {} virtual ~Service() {}
void test( void test(
::css::uno::Reference< test::types::XTest > const & test, css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name); ::rtl::OUString const & name);
::css::uno::Reference< ::css::uno::XComponentContext > context_; css::uno::Reference< css::uno::XComponentContext > context_;
}; };
::sal_Int32 Service::run(::css::uno::Sequence< ::rtl::OUString > const &) ::sal_Int32 Service::run(css::uno::Sequence< ::rtl::OUString > const &)
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
osl_getThreadIdentifier(0); // check for sal osl_getThreadIdentifier(0); // check for sal
(new salhelper::SimpleReferenceObject)->release(); // check for salhelper (new salhelper::SimpleReferenceObject)->release(); // check for salhelper
...@@ -129,19 +129,19 @@ private: ...@@ -129,19 +129,19 @@ private:
}; };
for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) { for (::std::size_t i = 0; i < SAL_N_ELEMENTS(services); ++i) {
::rtl::OUString name(::rtl::OUString::createFromAscii(services[i])); ::rtl::OUString name(::rtl::OUString::createFromAscii(services[i]));
::css::uno::Reference< ::css::uno::XInterface > instance; css::uno::Reference< css::uno::XInterface > instance;
try { try {
instance = context_->getServiceManager()->createInstanceWithContext( instance = context_->getServiceManager()->createInstanceWithContext(
name, context_); name, context_);
} catch (::css::uno::RuntimeException &) { } catch (css::uno::RuntimeException &) {
throw; throw;
} catch (::css::uno::Exception &) { } catch (css::uno::Exception &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
::rtl::OUString("error creating instance"), ::rtl::OUString("error creating instance"),
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
} }
if (!instance.is()) { if (!instance.is()) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
"no instance: " + name, "no instance: " + name,
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
} }
...@@ -153,9 +153,9 @@ private: ...@@ -153,9 +153,9 @@ private:
::rtl::OUStringBuffer b; ::rtl::OUStringBuffer b;
b.append("/singletons/"); b.append("/singletons/");
b.append(singletons[i]); b.append(singletons[i]);
::css::uno::Reference< ::css::uno::XInterface > instance( css::uno::Reference< css::uno::XInterface > instance(
context_->getValueByName(b.makeStringAndClear()), context_->getValueByName(b.makeStringAndClear()),
::css::uno::UNO_QUERY_THROW); css::uno::UNO_QUERY_THROW);
} }
test( test(
::test::types::CppTest::create(context_), ::test::types::CppTest::create(context_),
...@@ -167,7 +167,7 @@ private: ...@@ -167,7 +167,7 @@ private:
} }
void Service::test( void Service::test(
::css::uno::Reference< test::types::XTest > const & test, css::uno::Reference< test::types::XTest > const & test,
::rtl::OUString const & name) ::rtl::OUString const & name)
{ {
bool ok = false; bool ok = false;
...@@ -177,7 +177,7 @@ void Service::test( ...@@ -177,7 +177,7 @@ void Service::test(
ok = true; ok = true;
} }
if (!ok) { if (!ok) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
(name (name
+ ::rtl::OUString(".throwException failed")), + ::rtl::OUString(".throwException failed")),
static_cast< ::cppu::OWeakObject * >(this)); static_cast< ::cppu::OWeakObject * >(this));
...@@ -186,16 +186,16 @@ void Service::test( ...@@ -186,16 +186,16 @@ void Service::test(
namespace CppMain { namespace CppMain {
::css::uno::Reference< ::css::uno::XInterface > create( css::uno::Reference< css::uno::XInterface > create(
::css::uno::Reference< ::css::uno::XComponentContext > const & context) css::uno::Reference< css::uno::XComponentContext > const & context)
SAL_THROW((::css::uno::Exception)) SAL_THROW((css::uno::Exception))
{ {
try { try {
return static_cast< ::cppu::OWeakObject * >(new Service(context)); return static_cast< ::cppu::OWeakObject * >(new Service(context));
} catch (::std::bad_alloc &) { } catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
::rtl::OUString("std::bad_alloc"), ::rtl::OUString("std::bad_alloc"),
::css::uno::Reference< ::css::uno::XInterface >()); css::uno::Reference< css::uno::XInterface >());
} }
} }
...@@ -203,8 +203,8 @@ OUString getImplementationName() { ...@@ -203,8 +203,8 @@ OUString getImplementationName() {
return OUString("test.cpp.cppmain.Component"); return OUString("test.cpp.cppmain.Component");
} }
::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
return ::css::uno::Sequence< ::rtl::OUString >(); return css::uno::Sequence< ::rtl::OUString >();
} }
} }
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
Service() {} Service() {}
virtual ::test::types::Data SAL_CALL getData() virtual ::test::types::Data SAL_CALL getData()
throw (::css::uno::RuntimeException) throw (css::uno::RuntimeException)
{ {
return ::test::types::Data(OUString("Hello"), 42); return ::test::types::Data(OUString("Hello"), 42);
} }
...@@ -60,16 +60,16 @@ private: ...@@ -60,16 +60,16 @@ private:
namespace CppServer { namespace CppServer {
::css::uno::Reference< ::css::uno::XInterface > create( css::uno::Reference< css::uno::XInterface > create(
::css::uno::Reference< ::css::uno::XComponentContext > const &) css::uno::Reference< css::uno::XComponentContext > const &)
SAL_THROW((::css::uno::Exception)) SAL_THROW((css::uno::Exception))
{ {
try { try {
return static_cast< ::cppu::OWeakObject * >(new Service); return static_cast< ::cppu::OWeakObject * >(new Service);
} catch (::std::bad_alloc &) { } catch (::std::bad_alloc &) {
throw ::css::uno::RuntimeException( throw css::uno::RuntimeException(
OUString("std::bad_alloc"), OUString("std::bad_alloc"),
::css::uno::Reference< ::css::uno::XInterface >()); css::uno::Reference< css::uno::XInterface >());
} }
} }
...@@ -77,8 +77,8 @@ OUString getImplementationName() { ...@@ -77,8 +77,8 @@ OUString getImplementationName() {
return OUString("test.cpp.cppserver.Component"); return OUString("test.cpp.cppserver.Component");
} }
::css::uno::Sequence< OUString > getSupportedServiceNames() { css::uno::Sequence< OUString > getSupportedServiceNames() {
return ::css::uno::Sequence< OUString >(); return css::uno::Sequence< OUString >();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment