From 16246ed7b280f51a39a01ded24c0d7bd59d59365 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 27 Oct 2015 14:20:54 +0200 Subject: com::sun::star->css in sc Change-Id: I7774890f46f9343e944e34db27af8bce3b1d0915 --- sc/workben/addin.cxx | 32 +++++++++++++------------- sc/workben/addin.hxx | 64 +++++++++++++++++++++++++-------------------------- sc/workben/result.cxx | 4 ++-- sc/workben/result.hxx | 7 +++--- 4 files changed, 53 insertions(+), 54 deletions(-) (limited to 'sc/workben') diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 4ec33382a4f9..7689afe85b86 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -108,7 +108,7 @@ UString ScTestAddIn::getImplementationName_Static() return L"stardiv.StarCalc.ScTestAddIn"; } -::com::sun::star::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() +css::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -310,24 +310,24 @@ void ScTestAddIn::setLocale(const lang::Locale& eLocale) THROWS( (UsrSystemExcep aFuncLoc = eLocale; } -::com::sun::star::lang::Locale SAL_CALL ScTestAddIn::getLocale( ) throw(::com::sun::star::uno::RuntimeException) +css::lang::Locale SAL_CALL ScTestAddIn::getLocale( ) throw(css::uno::RuntimeException) { return aFuncLoc; } // XTestAddIn -sal_Int32 SAL_CALL ScTestAddIn::countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ScTestAddIn::countParams( const css::uno::Sequence< css::uno::Any >& aArgs ) throw(css::uno::RuntimeException) { return aArgs.getLength(); } -double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException) +double SAL_CALL ScTestAddIn::addOne( double fValue ) throw(css::uno::RuntimeException) { return fValue + 1.0; } -OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(css::uno::RuntimeException) { String aRet; String aStrStr = OUStringToString( aStr, CHARSET_SYSTEM ); @@ -337,7 +337,7 @@ OUString SAL_CALL ScTestAddIn::repeatStr( const OUString& aStr, sal_Int32 nCount return StringToOUString( aRet, CHARSET_SYSTEM ); } -OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getDateString( const css::uno::Reference< css::beans::XPropertySet >& xCaller, double fValue ) throw(css::uno::RuntimeException) { uno::Any aDateAny = xCaller->getPropertyValue( L"NullDate" ); { @@ -361,7 +361,7 @@ OUString SAL_CALL ScTestAddIn::getDateString( const ::com::sun::star::uno::Refer return L"**ERROR**"; } -sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ScTestAddIn::getColorValue( const css::uno::Reference< css::table::XCellRange >& xRange ) throw(css::uno::RuntimeException) { uno::Reference xProp( xRange, uno::UNO_QUERY ); if (xProp.is()) @@ -402,7 +402,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, return 0.0; // error } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL ScTestAddIn::transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL ScTestAddIn::transpose( const css::uno::Sequence< css::uno::Sequence< double > >& aMatrix ) throw(css::uno::RuntimeException) { long nRowCount = aMatrix.getLength(); long nColCount = 0; @@ -422,7 +422,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL ScTestAddIn::transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< css::uno::Sequence< sal_Int32 > > SAL_CALL ScTestAddIn::transposeInt( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aMatrix ) throw(css::uno::RuntimeException) { long nRowCount = aMatrix.getLength(); long nColCount = 0; @@ -442,7 +442,7 @@ INT32 lcl_GetLongElement( const uno::Sequence< uno::Sequence >& aMatrix, return aRet; } -OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const css::uno::Any& aFirst, const css::uno::Sequence< css::uno::Any >& aFollow ) throw(css::uno::RuntimeException) { String aSeparator; if ( !aFirst.hasValue() ) // not specified @@ -478,7 +478,7 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su return StringToOUString(aRet, CHARSET_SYSTEM); } -::com::sun::star::uno::Any SAL_CALL ScTestAddIn::getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Any SAL_CALL ScTestAddIn::getStrOrVal( sal_Int32 nFlag ) throw(css::uno::RuntimeException) { uno::Any aRet; @@ -504,7 +504,7 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su return aRet; } -::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Reference< css::sheet::XVolatileResult > SAL_CALL ScTestAddIn::callAsync( const OUString& aString ) throw(css::uno::RuntimeException) { String aStr = OUStringToString( aString, CHARSET_SYSTEM ); char c = (char) aStr; @@ -523,23 +523,23 @@ OUString SAL_CALL ScTestAddIn::repeatMultiple( sal_Int32 nCount, const ::com::su } // XServiceName -OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getServiceName( ) throw(css::uno::RuntimeException) { return SCTESTADDIN_SERVICE; // name of specific AddIn service } // XServiceInfo -OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ScTestAddIn::getImplementationName( ) throw(css::uno::RuntimeException) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ScTestAddIn::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL ScTestAddIn::getSupportedServiceNames( ) throw(css::uno::RuntimeException) { return getSupportedServiceNames_Static(); } diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 04eab3b4d213..5ad56228b099 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -27,19 +27,19 @@ #include -com::sun::star::uno::Reference ScTestAddIn_CreateInstance( - const com::sun::star::uno::Reference& ); +css::uno::Reference ScTestAddIn_CreateInstance( + const css::uno::Reference& ); class ScTestAddIn : public cppu::WeakImplHelper< - com::sun::star::sheet::XAddIn, + css::sheet::XAddIn, stardiv::starcalc::test::XTestAddIn, - com::sun::star::lang::XServiceName, - com::sun::star::lang::XServiceInfo > + css::lang::XServiceName, + css::lang::XServiceInfo > { private: - com::sun::star::uno::Reference xAlphaResult; //! Test - com::sun::star::uno::Reference xNumResult; //! Test - com::sun::star::lang::Locale aFuncLoc; + css::uno::Reference xAlphaResult; //! Test + css::uno::Reference xNumResult; //! Test + css::lang::Locale aFuncLoc; public: ScTestAddIn(); @@ -51,40 +51,40 @@ public: // virtual XIdlClassRef getIdlClass(); static UString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XAddIn - virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticFuntionName( const OUString& aDisplayName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayFunctionName( const OUString& aProgrammaticName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getFunctionDescription( const OUString& aProgrammaticName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayArgumentName( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getArgumentDescription( const OUString& aProgrammaticFunctionName, sal_Int32 nArgument ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getProgrammaticCategoryName( const OUString& aProgrammaticFunctionName ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayCategoryName( const OUString& aProgrammaticFunctionName ) throw(css::uno::RuntimeException); // XLocalizable - virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLocale( const css::lang::Locale& eLocale ) throw(css::uno::RuntimeException); + virtual css::lang::Locale SAL_CALL getLocale( ) throw(css::uno::RuntimeException); // XTestAddIn - virtual sal_Int32 SAL_CALL countParams( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL addOne( double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDateString( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCaller, double fValue ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColorValue( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& xRange ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL transpose( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int32 > >& aMatrix ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const ::com::sun::star::uno::Any& aFirst, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aFollow ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL countParams( const css::uno::Sequence< css::uno::Any >& aArgs ) throw(css::uno::RuntimeException); + virtual double SAL_CALL addOne( double fValue ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL repeatStr( const OUString& aStr, sal_Int32 nCount ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getDateString( const css::uno::Reference< css::beans::XPropertySet >& xCaller, double fValue ) throw(css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColorValue( const css::uno::Reference< css::table::XCellRange >& xRange ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL transpose( const css::uno::Sequence< css::uno::Sequence< double > >& aMatrix ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Sequence< sal_Int32 > > SAL_CALL transposeInt( const css::uno::Sequence< css::uno::Sequence< sal_Int32 > >& aMatrix ) throw(css::uno::RuntimeException); + virtual css::uno::Reference< css::sheet::XVolatileResult > SAL_CALL callAsync( const OUString& aString ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL repeatMultiple( sal_Int32 nCount, const css::uno::Any& aFirst, const css::uno::Sequence< css::uno::Any >& aFollow ) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getStrOrVal( sal_Int32 nFlag ) throw(css::uno::RuntimeException); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); }; #endif diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 2bf201756b35..122c2c876433 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -62,7 +62,7 @@ ScAddInResult::~ScAddInResult() // XVolatileResult -void SAL_CALL ScAddInResult::addResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ScAddInResult::addResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException) { uno::Reference *pObj = new uno::Reference( aListener ); aListeners.Insert( pObj, aListeners.Count() ); @@ -75,7 +75,7 @@ void SAL_CALL ScAddInResult::addResultListener( const ::com::sun::star::uno::Ref } } -void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL ScAddInResult::removeResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException) { acquire(); diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index e887ce69c1bb..7fd7ed989af2 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -30,8 +30,7 @@ typedef boost::ptr_vector*> XResultListenerArr_Impl; -class ScAddInResult : public cppu::WeakImplHelper< - com::sun::star::sheet::XVolatileResult> +class ScAddInResult : public cppu::WeakImplHelper< css::sheet::XVolatileResult> { private: String aArg; @@ -48,8 +47,8 @@ public: virtual ~ScAddInResult(); // XVolatileResult - virtual void SAL_CALL addResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException); + virtual void SAL_CALL removeResultListener( const css::uno::Reference< css::sheet::XResultListener >& aListener ) throw(css::uno::RuntimeException); }; #endif -- cgit v1.2.3