diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sc/source/ui/vba | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sc/source/ui/vba')
118 files changed, 1462 insertions, 1470 deletions
diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index f61239c37bf3..86943a21d4ac 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -50,7 +50,7 @@ GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) if ( pShell ) xModel.set( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xModelProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( rtl::OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XUnnamedDatabaseRanges > xUnnamedDBRanges( xModelProps->getPropertyValue( OUString("UnnamedDatabaseRanges") ), uno::UNO_QUERY_THROW ); return xUnnamedDBRanges; } @@ -66,7 +66,7 @@ GetAutoFiltRange( ScDocShell* pShell, sal_Int16 nSheet ) throw ( uno::RuntimeExc uno::Reference< sheet::XDatabaseRange > xDBRange( xUnnamedDBRanges->getByTable( nSheet ) , uno::UNO_QUERY_THROW ); sal_Bool bHasAuto = false; uno::Reference< beans::XPropertySet > xProps( xDBRange, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( rtl::OUString("AutoFilter") ) >>= bHasAuto; + xProps->getPropertyValue( OUString("AutoFilter") ) >>= bHasAuto; if ( bHasAuto ) { xDataBaseRange=xDBRange; @@ -80,7 +80,7 @@ ScDocShell* GetDocShellFromRange( const uno::Reference< uno::XInterface >& xRang ScCellRangesBase* pScCellRangesBase = ScCellRangesBase::getImplementation( xRange ); if ( !pScCellRangesBase ) { - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying doc shell uno range object" ), uno::Reference< uno::XInterface >() ); } return pScCellRangesBase->GetDocShell(); } @@ -101,7 +101,7 @@ void implSetZoom( const uno::Reference< frame::XModel >& xModel, sal_Int16 nZoom pViewSh->RefreshZoom(); } -const ::rtl::OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); +const OUString REPLACE_CELLS_WARNING( "ReplaceCellsWarning"); class PasteCellsWarningReseter { @@ -113,7 +113,7 @@ private: comphelper::getProcessComponentContext() ); static uno::Reference<lang::XMultiComponentFactory > xServiceManager( xContext->getServiceManager() ); - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( OUString( "com.sun.star.sheet.GlobalSheetSettings" ) ,xContext ), uno::UNO_QUERY_THROW ); return xProps; } @@ -264,8 +264,8 @@ uno::Reference< XHelperInterface > getUnoSheetModuleObj( const uno::Reference< sheet::XSpreadsheet >& xSheet ) throw ( uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xProps( xSheet, uno::UNO_QUERY_THROW ); - rtl::OUString sCodeName; - xProps->getPropertyValue( rtl::OUString("CodeName") ) >>= sCodeName; + OUString sCodeName; + xProps->getPropertyValue( OUString("CodeName") ) >>= sCodeName; // #TODO #FIXME ideally we should 'throw' here if we don't get a valid parent, but... it is possible // to create a module ( and use 'Option VBASupport 1' ) for a calc document, in this scenario there // are *NO* special document module objects ( of course being able to switch between vba/non vba mode at @@ -327,7 +327,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -338,19 +338,19 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); for ( SCTAB index = 0; index < pDoc->GetTableCount(); index++) { - rtl::OUString aName; + OUString aName; pDoc->GetCodeName( index, aName ); sDocModuleNames.push_back( aName ); } - std::vector<rtl::OUString>::iterator it_end = sDocModuleNames.end(); + std::vector<OUString>::iterator it_end = sDocModuleNames.end(); - for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector<OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -359,9 +359,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 186c7ffd4afb..12208dde8812 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,7 @@ template < typename ImplObject > if ( xTunnel.is() ) pObj = reinterpret_cast<ImplObject*>( xTunnel->getSomething(ImplObject::getUnoTunnelId())); if ( bThrow && !pObj ) - throw css::uno::RuntimeException( rtl::OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); + throw css::uno::RuntimeException( OUString( "Internal error, can't exctract implementation object" ), rxWrapperIf ); return pObj; } // ============================================================================ diff --git a/sc/source/ui/vba/testvba/testvba.cxx b/sc/source/ui/vba/testvba/testvba.cxx index 8e8729a31ae9..05060b6f6f8a 100644 --- a/sc/source/ui/vba/testvba/testvba.cxx +++ b/sc/source/ui/vba/testvba/testvba.cxx @@ -60,7 +60,6 @@ using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::XInterface; using ::com::sun::star::ucb::XSimpleFileAccess3; using ::com::sun::star::document::XTypeDetection; -using ::rtl::OUString; using ::std::auto_ptr; @@ -68,7 +67,7 @@ const OUString EXTN(".xls"); OUString convertToURL( const OUString& rPath ) { - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rPath ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -78,7 +77,7 @@ OUString convertToURL( const OUString& rPath ) { osl::FileBase::getFileURLFromSystemPath( rPath, aURL ); if ( aURL.equals( rPath ) ) - throw uno::RuntimeException( rtl::OUString( "could'nt convert " ).concat( rPath ).concat( rtl::OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "could'nt convert " ).concat( rPath ).concat( OUString( " to a URL, is it a fully qualified path name? " ) ), Reference< uno::XInterface >() ); } return aURL; } @@ -108,55 +107,55 @@ private: Reference< XMultiComponentFactory > mxMCF; Reference< XComponentLoader > mxCompLoader; Reference< XSimpleFileAccess3 > mxSFA; - rtl::OUString msOutDirPath; + OUString msOutDirPath; protected: public: TestVBA( const Reference< XComponentContext >& _xContext, const Reference< XMultiComponentFactory >& _xMCF, const Reference< XComponentLoader >& _xCompLoader, - const rtl::OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), + const OUString& _outDirPath ) : mxContext( _xContext ), mxMCF( _xMCF ), mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) { mxSFA.set( ucb::SimpleFileAccess::create(_xContext) ); } - rtl::OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocation() throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( rtl::OUString( "HelperAPI-test.log" ) ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( OUString( "HelperAPI-test.log" ) ); return sLogLocation; } - rtl::OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) + OUString getLogLocationWithName( OUString fileName ) throw ( beans::UnknownPropertyException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::Exception ) { printf("%s\n", getenv("HOME") ); - printf("file name %s\n", rtl::OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); - rtl::OUString sLogLocation; - Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( rtl::OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); - pathSettings->getPropertyValue( rtl::OUString( "Work" ) ) >>= sLogLocation; - sLogLocation = sLogLocation.concat( rtl::OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ) ); + printf("file name %s\n", OUStringToOString( fileName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sLogLocation; + Reference< XPropertySet > pathSettings( mxMCF->createInstanceWithContext( OUString( "com.sun.star.comp.framework.PathSettings" ), mxContext), uno::UNO_QUERY_THROW ); + pathSettings->getPropertyValue( OUString( "Work" ) ) >>= sLogLocation; + sLogLocation = sLogLocation.concat( OUString( "/" ) ).concat( fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ) ); return sLogLocation; } - void proccessDocument( const rtl::OUString& sUrl ) + void proccessDocument( const OUString& sUrl ) { if ( !mxSFA->isFolder( sUrl ) && sUrl.endsWithIgnoreAsciiCaseAsciiL( ".xls", 4 ) ) { try { - OSL_TRACE( "processing %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); - printf( "processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE( "processing %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf( "processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); // Loading the wanted document Sequence< PropertyValue > propertyValues(1); - propertyValues[0].Name = rtl::OUString( "Hidden" ); + propertyValues[0].Name = OUString( "Hidden" ); propertyValues[0].Value <<= false; - rtl::OUString sfileUrl = convertToURL( sUrl ); - printf( "try to get xDoc %s\n", rtl::OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUString sfileUrl = convertToURL( sUrl ); + printf( "try to get xDoc %s\n", OUStringToOString( sfileUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); Reference< uno::XInterface > xDoc = - mxCompLoader->loadComponentFromURL( sfileUrl, rtl::OUString( "_blank" ), 0, propertyValues); + mxCompLoader->loadComponentFromURL( sfileUrl, OUString( "_blank" ), 0, propertyValues); printf( "got xDoc\n" ); OUString logFileURL = convertToURL( getLogLocation() ); @@ -173,18 +172,18 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) Reference< script::provider::XScript > xScript; try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.TestMacros.Main?language=Basic&location=document")); } catch ( uno::Exception& e ) { try { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMacro.Main?language=Basic&location=document" )); } catch ( uno::Exception& e2 ) { - xScript = xProv->getScript( rtl::OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); + xScript = xProv->getScript( OUString( "vnd.sun.star.script:VBAProject.testMain.Main?language=Basic&location=document" )); } } - OSL_TRACE("Got script for doc %s", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Got script for doc %s", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("get the Script\n"); Sequence< uno::Any > aArgs; Sequence< sal_Int16 > aOutArgsIndex; @@ -193,27 +192,27 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) xScript->invoke(aArgs, aOutArgsIndex, aOutArgs); OUString fileName = sUrl.copy ( sUrl.lastIndexOf( '/' ) ); - OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + rtl::OUString( ".log" ); + OUString newLocation = msOutDirPath + fileName.copy ( 0, fileName.lastIndexOf( EXTN ) ) + OUString( ".log" ); try { printf("move log file\n"); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } catch ( uno::Exception& e ) { logFileURL = convertToURL( getLogLocationWithName( fileName ) ); - printf("move log file from %s\n", rtl::OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("move log file from %s\n", OUStringToOString( logFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); mxSFA->move( logFileURL, newLocation ); - OSL_TRACE("new logfile location is %s ", rtl::OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("new logfile location is %s ", OUStringToOString( newLocation, RTL_TEXTENCODING_UTF8 ).getStr() ); printf("moved to new location\n"); } } catch ( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } // interface is supported, otherwise use XComponent.dispose @@ -241,19 +240,19 @@ mxCompLoader( _xCompLoader ), msOutDirPath( convertToURL( _outDirPath ) ) } catch( uno::Exception& e ) { - std::cerr << "Caught exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } } - printf("complete processing %s\n", rtl::OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("complete processing %s\n", OUStringToOString( sUrl, RTL_TEXTENCODING_UTF8 ).getStr() ); } - void traverse( const rtl::OUString& sFileDirectory ) + void traverse( const OUString& sFileDirectory ) { - rtl::OUString sFileDirectoryURL = convertToURL( sFileDirectory ); + OUString sFileDirectoryURL = convertToURL( sFileDirectory ); if ( !mxSFA->isFolder( sFileDirectoryURL) ) { - throw lang::IllegalArgumentException( rtl::OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); + throw lang::IllegalArgumentException( OUString( "not a directory: ").concat( sFileDirectoryURL ), Reference<uno::XInterface>(), 1 ); } // Getting all files and directories in the current directory Sequence<OUString> entries = mxSFA->getFolderContents( sFileDirectoryURL, false ); @@ -278,7 +277,7 @@ void tryDispose( Reference< uno::XInterface > xIF, const char* sComp ) } catch( uno::Exception& e ) { - std::cerr << "tryDispose caught exception " <<rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl; + std::cerr << "tryDispose caught exception " <<OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << " while disposing " << sComp << std::endl; } } } @@ -314,7 +313,7 @@ int main( int argv, char** argc ) } catch( uno::Exception& e ) { - std::cerr << "Caught Exception " << rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; + std::cerr << "Caught Exception " << OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; } } diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 07e53cb93f03..8ef65b3fb935 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -96,7 +96,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -using ::rtl::OUString; // #TODO is this defined somewhere else? #if ( defined UNX ) //unix @@ -153,8 +152,8 @@ SfxObjectShell* ScVbaApplication::GetDocShell( const uno::Reference< frame::XMod return static_cast< SfxObjectShell* >( excel::getDocShell( xModel ) ); } -::rtl::OUString SAL_CALL -ScVbaApplication::getExactName( const ::rtl::OUString& aApproximateName ) throw (uno::RuntimeException) +OUString SAL_CALL +ScVbaApplication::getExactName( const OUString& aApproximateName ) throw (uno::RuntimeException) { uno::Reference< beans::XExactName > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getExactName( aApproximateName ); @@ -168,7 +167,7 @@ ScVbaApplication::getIntrospection() throw(css::uno::RuntimeException) } uno::Any SAL_CALL -ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::invoke( const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& OutParamIndex, uno::Sequence< uno::Any >& OutParam) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { /* When calling the functions directly at the Application object, no runtime errors are thrown, but the error is inserted into the return value. */ @@ -180,34 +179,34 @@ ScVbaApplication::invoke( const ::rtl::OUString& FunctionName, const uno::Sequen } catch (const uno::Exception&) { - aAny <<= script::BasicErrorException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), 1000, ::rtl::OUString() ); + aAny <<= script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), 1000, OUString() ); } return aAny; } void SAL_CALL -ScVbaApplication::setValue( const ::rtl::OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaApplication::setValue( const OUString& PropertyName, const uno::Any& Value ) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); xWSF->setValue( PropertyName, Value ); } uno::Any SAL_CALL -ScVbaApplication::getValue( const ::rtl::OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaApplication::getValue( const OUString& PropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->getValue( PropertyName ); } sal_Bool SAL_CALL -ScVbaApplication::hasMethod( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasMethod( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasMethod( Name ); } sal_Bool SAL_CALL -ScVbaApplication::hasProperty( const ::rtl::OUString& Name ) throw(uno::RuntimeException) +ScVbaApplication::hasProperty( const OUString& Name ) throw(uno::RuntimeException) { uno::Reference< script::XInvocation > xWSF( new ScVbaWSFunction( this, mxContext ) ); return xWSF->hasProperty( Name ); @@ -259,12 +258,12 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if (!aSelection.is()) { throw uno::RuntimeException( - rtl::OUString("failed to obtain current selection"), + OUString("failed to obtain current selection"), uno::Reference< uno::XInterface >() ); } uno::Reference< lang::XServiceInfo > xServiceInfo( aSelection, uno::UNO_QUERY_THROW ); - rtl::OUString sImplementationName = xServiceInfo->getImplementationName(); + OUString sImplementationName = xServiceInfo->getImplementationName(); if( sImplementationName.equalsIgnoreAsciiCase("com.sun.star.drawing.SvxShapeCollection") ) { @@ -277,15 +276,15 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) if ( ScVbaShape::getType( xShape ) == office::MsoShapeType::msoAutoShape ) { uno::Reference< lang::XServiceInfo > xShapeServiceInfo( xShape, uno::UNO_QUERY_THROW ); - if ( xShapeServiceInfo->supportsService( rtl::OUString( "com.sun.star.drawing.Text" ) ) ) + if ( xShapeServiceInfo->supportsService( OUString( "com.sun.star.drawing.Text" ) ) ) { return uno::makeAny( uno::Reference< msforms::XTextBoxShape >(new ScVbaTextBoxShape( mxContext, xShape, xShapes, xModel ) ) ); } } return uno::makeAny( uno::Reference< msforms::XShape >(new ScVbaShape( this, mxContext, xShape, xShapes, xModel, ScVbaShape::getType( xShape ) ) ) ); } - else if( xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRange") ) || - xServiceInfo->supportsService( rtl::OUString("com.sun.star.sheet.SheetCellRanges") ) ) + else if( xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRange") ) || + xServiceInfo->supportsService( OUString("com.sun.star.sheet.SheetCellRanges") ) ) { uno::Reference< table::XCellRange > xRange( aSelection, ::uno::UNO_QUERY); if ( !xRange.is() ) @@ -299,7 +298,7 @@ ScVbaApplication::getSelection() throw (uno::RuntimeException) } else { - throw uno::RuntimeException( sImplementationName + rtl::OUString( + throw uno::RuntimeException( sImplementationName + OUString( " not supported"), uno::Reference< uno::XInterface >() ); } } @@ -311,10 +310,10 @@ ScVbaApplication::getActiveCell() throw (uno::RuntimeException ) uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW); ScTabViewShell* pViewShell = excel::getCurrentBestViewShell(mxContext); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewShell available"), uno::Reference< uno::XInterface >() ); ScViewData* pTabView = pViewShell->GetViewData(); if ( !pTabView ) - throw uno::RuntimeException( rtl::OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No ViewData available"), uno::Reference< uno::XInterface >() ); sal_Int32 nCursorX = pTabView->GetCurX(); sal_Int32 nCursorY = pTabView->GetCurY(); @@ -350,7 +349,7 @@ ScVbaApplication::WorksheetFunction( ) throw (::com::sun::star::uno::RuntimeExce } uno::Any SAL_CALL -ScVbaApplication::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaApplication::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -402,7 +401,7 @@ ScVbaApplication::getStatusBar() throw (uno::RuntimeException) void SAL_CALL ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; sal_Bool bDefault = false; uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< task::XStatusIndicatorSupplier > xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -424,7 +423,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime } } else - throw uno::RuntimeException( rtl::OUString( "Invalid prarameter. It should be a string or False" ), + throw uno::RuntimeException( OUString( "Invalid prarameter. It should be a string or False" ), uno::Reference< uno::XInterface >() ); } @@ -472,7 +471,7 @@ ScVbaApplication::wait( double time ) throw (uno::RuntimeException) SbxVariableRef aRef = new SbxVariable; aRef->PutDouble( time ); aArgs->Put( aRef, 1 ); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("WaitUntil"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("WaitUntil"), SbxCLASS_METHOD ); if ( pMeth ) { @@ -496,7 +495,7 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW ); uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( - rtl::OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); + OUString( "NamedRanges" ) ), uno::UNO_QUERY_THROW ); css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) ); if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID ) @@ -525,7 +524,7 @@ ScVbaApplication::getActiveSheet() throw (uno::RuntimeException) if ( !result.is() ) { // Fixme - check if this is reasonable/desired behavior - throw uno::RuntimeException( rtl::OUString( "No activeSheet available" ), + throw uno::RuntimeException( OUString( "No activeSheet available" ), uno::Reference< uno::XInterface >() ); } return result; @@ -557,11 +556,11 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro bScroll = aScroll; } else - throw uno::RuntimeException( rtl::OUString( "second parameter should be boolean" ), + throw uno::RuntimeException( OUString( "second parameter should be boolean" ), uno::Reference< uno::XInterface >() ); } - rtl::OUString sRangeName; + OUString sRangeName; if( Reference >>= sRangeName ) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -603,7 +602,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro //and the createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) to get a root browse::XBrowseNode. //for query XInvocation interface. //but how to directly get the XInvocation? - throw uno::RuntimeException( rtl::OUString( "invalid reference for range name, it should be procedure name" ), + throw uno::RuntimeException( OUString( "invalid reference for range name, it should be procedure name" ), uno::Reference< uno::XInterface >() ); } return; @@ -638,7 +637,7 @@ ScVbaApplication::GoTo( const uno::Any& Reference, const uno::Any& Scroll ) thro } return; } - throw uno::RuntimeException( rtl::OUString( "invalid reference or name" ), + throw uno::RuntimeException( OUString( "invalid reference or name" ), uno::Reference< uno::XInterface >() ); } @@ -691,7 +690,7 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) break; } default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Cursor pointer"), uno::Reference< uno::XInterface >() ); // TODO: isn't this a flaw in the API? It should be allowed to throw an // IllegalArgumentException, or so } @@ -704,10 +703,10 @@ ScVbaApplication::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException) // #TODO perhaps we should switch the return type depending of the filter // type, e.g. return Calc for Calc and Excel if its an imported doc -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getName() throw (uno::RuntimeException) { - static rtl::OUString appName("Microsoft Excel" ); + static OUString appName("Microsoft Excel" ); return appName; } @@ -756,7 +755,7 @@ ScVbaApplication::setDisplayFullScreen( sal_Bool bSet ) throw (uno::RuntimeExce // #FIXME calling ScViewUtil::SetFullScreen( *pShell, bSet ); // directly results in a strange crash, using dispatch instead if ( bSet != getDisplayFullScreen() ) - dispatchRequests( getCurrentDocument(), rtl::OUString(".uno:FullScreen") ); + dispatchRequests( getCurrentDocument(), OUString(".uno:FullScreen") ); } sal_Bool SAL_CALL @@ -776,8 +775,8 @@ ScVbaApplication::setDisplayScrollBars( sal_Bool bSet ) throw (uno::RuntimeExce // use uno here as it does all he repainting etc. magic uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xProps( xView, uno::UNO_QUERY ); - xProps->setPropertyValue( rtl::OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); - xProps->setPropertyValue( rtl::OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasVerticalScrollBar"), uno::makeAny( bSet ) ); + xProps->setPropertyValue( OUString("HasHorizontalScrollBar"), uno::makeAny( bSet ) ); } sal_Bool SAL_CALL @@ -830,17 +829,17 @@ static uno::Reference< beans::XPropertySet > lcl_getPathSettingsService( const u if ( !xPathSettings.is() ) { uno::Reference< lang::XMultiComponentFactory > xSMgr( xContext->getServiceManager(), uno::UNO_QUERY_THROW ); - xPathSettings.set( xSMgr->createInstanceWithContext( rtl::OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); + xPathSettings.set( xSMgr->createInstanceWithContext( OUString("com.sun.star.util.PathSettings"), xContext ), uno::UNO_QUERY_THROW ); } return xPathSettings; } -rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) throw ( uno::RuntimeException ) +OUString ScVbaApplication::getOfficePath( const OUString& _sPathType ) throw ( uno::RuntimeException ) { - rtl::OUString sRetPath; + OUString sRetPath; uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); try { - rtl::OUString sUrl; + OUString sUrl; xProps->getPropertyValue( _sPathType ) >>= sUrl; // if its a list of paths then use the last one @@ -851,42 +850,42 @@ rtl::OUString ScVbaApplication::getOfficePath( const rtl::OUString& _sPathType ) } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sRetPath; } void SAL_CALL -ScVbaApplication::setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (uno::RuntimeException) +ScVbaApplication::setDefaultFilePath( const OUString& DefaultFilePath ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getPathSettingsService( mxContext ); - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( DefaultFilePath, aURL ); - xProps->setPropertyValue( rtl::OUString("Work"), uno::Any( aURL ) ); + xProps->setPropertyValue( OUString("Work"), uno::Any( aURL ) ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getDefaultFilePath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Work")); + return getOfficePath( OUString("Work")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getLibraryPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Basic")); + return getOfficePath( OUString("Basic")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getTemplatesPath() throw (uno::RuntimeException) { - return getOfficePath( rtl::OUString("Template")); + return getOfficePath( OUString("Template")); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) { - static rtl::OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); + static OUString sPathSep( RTL_CONSTASCII_USTRINGPARAM( FILE_PATH_SEPERATOR ) ); return sPathSep; } @@ -1080,7 +1079,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); // initialize the result list with 1st parameter, join its ranges together ListOfScRange aList; @@ -1134,7 +1133,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Union( throw (script::BasicErrorException, uno::RuntimeException) { if( !rArg1.is() || !rArg2.is() ) - DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception( SbERR_BAD_PARAMETER, OUString() ); ListOfScRange aList; lclAddToListOfScRange( aList, uno::Any( rArg1 ) ); @@ -1183,7 +1182,7 @@ ScVbaApplication::Volatile( const uno::Any& aVolatile ) throw ( uno::RuntimeExc SbMethod* pMeth = StarBASIC::GetActiveMethod(); if ( pMeth ) { - OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", rtl::OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("ScVbaApplication::Volatile() In method ->%s<-", OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); uno::Reference< frame::XModel > xModel( getCurrentDocument() ); ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument(); pDoc->GetMacroManager()->SetUserFuncVolatile( pMeth->GetName(), bVolatile); @@ -1229,14 +1228,14 @@ uno::Any SAL_CALL ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException ) { StarBASIC* pBasic = SFX_APP()->GetBasic(); - SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString("FuncCaller"), SbxCLASS_METHOD ); + SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( OUString("FuncCaller"), SbxCLASS_METHOD ); uno::Any aRet; if ( pMeth ) { SbxVariableRef refTemp = pMeth; // forces a broadcast SbxVariableRef pNew = new SbxMethod( *((SbxMethod*)pMeth)); - OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), OUStringToOString( pNew->GetOUString(), RTL_TEXTENCODING_UTF8 ).getStr() ); aRet = sbxToUnoValue( pNew ); } return aRet; @@ -1255,7 +1254,7 @@ uno::Any SAL_CALL ScVbaApplication::GetOpenFilename( aArgs[ 5 ] = rMultiSelect; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.OpenFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1272,7 +1271,7 @@ uno::Any SAL_CALL ScVbaApplication::GetSaveAsFilename( aArgs[ 5 ] = rButtonText; uno::Reference< lang::XMultiComponentFactory > xFactory( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< XExecutableDialog > xFilePicker( xFactory->createInstanceWithArgumentsAndContext( - ::rtl::OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); + OUString( "ooo.vba.SaveAsFilePicker" ), aArgs, mxContext ), uno::UNO_QUERY_THROW ); return xFilePicker->execute(); } @@ -1295,7 +1294,7 @@ ScVbaApplication::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeExceptio return uno::Any( xMenuBars ); } -void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) +void SAL_CALL ScVbaApplication::OnKey( const OUString& Key, const uno::Any& Procedure ) throw (uno::RuntimeException) { try { @@ -1310,20 +1309,20 @@ void SAL_CALL ScVbaApplication::OnKey( const ::rtl::OUString& Key, const uno::An } } -rtl::OUString +OUString ScVbaApplication::getServiceImplName() { - return rtl::OUString("ScVbaApplication"); + return OUString("ScVbaApplication"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaApplication::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Application" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Application" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 754117845722..1991714fb77a 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -38,7 +38,7 @@ private: // note: member variables moved to struct "ScVbaAppSettings", see cxx file, to be shared by all application instances ScVbaAppSettings& mrAppSettings; - rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException ); + OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); @@ -53,24 +53,24 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); // XApplication - virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException); virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException); @@ -88,7 +88,7 @@ public: virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException); virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException); @@ -96,7 +96,7 @@ public: virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException); virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException); - virtual void SAL_CALL OnKey( const ::rtl::OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException); virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException); @@ -125,8 +125,8 @@ public: virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_APPLICATION_HXX */ diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index 0d3ed7eb84bf..18ccafd8d979 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -98,26 +98,26 @@ ScVbaAssistant::setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeE m_nAnimation = _animation; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaAssistant::Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return m_sName; } -rtl::OUString +OUString ScVbaAssistant::getServiceImplName() { - return rtl::OUString("ScVbaAssistant"); + return OUString("ScVbaAssistant"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAssistant::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.Assistant" ); + aServiceNames[ 0 ] = OUString("ooo.vba.Assistant" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index bc0a9aca63a5..20c75c7cd343 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -36,7 +36,7 @@ private: sal_Bool m_bIsVisible; sal_Int32 m_nPointsLeft; sal_Int32 m_nPointsTop; - rtl::OUString m_sName; + OUString m_sName; sal_Int32 m_nAnimation; public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext ); @@ -53,10 +53,10 @@ public: virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException); virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_ASSISTANT_HXX diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 3174bd2ed093..4e59d1b3dce7 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -64,17 +64,17 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: { ScVbaChart* pChart = static_cast< ScVbaChart* >( xChart.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Object failure, can't access chart implementation" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xAxisPropertySet; if (((nType == xlCategory) || (nType == xlSeriesAxis) || (nType == xlValue))) { if ((nAxisGroup != xlPrimary) && (nAxisGroup != xlSecondary)) - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); xAxisPropertySet.set( pChart->getAxisPropertySet(nType, nAxisGroup), uno::UNO_QUERY_THROW ); } else - throw script::BasicErrorException( rtl::OUString(), NULL, SbERR_METHOD_FAILED, rtl::OUString()); + throw script::BasicErrorException( OUString(), NULL, SbERR_METHOD_FAILED, OUString()); uno::Reference< XHelperInterface > xParent( xChart, uno::UNO_QUERY_THROW ); return new ScVbaAxis( xParent, xContext, xAxisPropertySet, nType, nAxisGroup); } @@ -96,18 +96,18 @@ public: // primary sal_Bool bBool = false; uno::Reference< beans::XPropertySet > xDiagramPropertySet( pChart->xDiagramPropertySet() ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlSeriesAxis ) ); if ( pChart->is3D() ) mCoordinates.push_back( AxesCoordinate( xlPrimary, xlValue ) ); // secondary - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryXAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlCategory ) ); - if ( ( xDiagramPropertySet->getPropertyValue( rtl::OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) + if ( ( xDiagramPropertySet->getPropertyValue( OUString( "HasSecondaryYAxis" ) ) >>= bBool ) && bBool ) mCoordinates.push_back( AxesCoordinate( xlSecondary, xlSeriesAxis ) ); } @@ -160,7 +160,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup) sal_Int32 nAxisGroup = xlPrimary; sal_Int32 nType = -1; if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) ) - throw uno::RuntimeException( rtl::OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Axes::Item Failed to extract type" ), uno::Reference< uno::XInterface >() ); if ( _oAxisGroup.hasValue() ) _oAxisGroup >>= nAxisGroup ; @@ -174,20 +174,20 @@ ScVbaAxes::createCollectionObject(const css::uno::Any& aSource) return aSource; // pass through ( it's already an XAxis object } -rtl::OUString +OUString ScVbaAxes::getServiceImplName() { - return rtl::OUString("ScVbaAxes"); + return OUString("ScVbaAxes"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxes::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axes" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axes" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index 9420815efc92..b8a0bc1f68bc 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -35,8 +35,8 @@ public: css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 52f152ffd008..f52eec90a38b 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -29,16 +29,16 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -const rtl::OUString ORIGIN("Origin"); -const rtl::OUString AUTOORIGIN("AutoOrigin"); -const rtl::OUString VBA_MIN("Max"); -const rtl::OUString VBA_MAX("Min"); +const OUString ORIGIN("Origin"); +const OUString AUTOORIGIN("AutoOrigin"); +const OUString VBA_MIN("Max"); +const OUString VBA_MAX("Min"); ScVbaChart* ScVbaAxis::getChartPtr() throw( uno::RuntimeException ) { ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() ); if ( !pChart ) - throw uno::RuntimeException( rtl::OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Can't access parent chart impl"), uno::Reference< uno::XInterface >() ); return pChart; } @@ -47,7 +47,7 @@ ScVbaAxis::isValueAxis() throw( script::BasicErrorException ) { if ( getType() == xlCategory ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return sal_True; } @@ -103,13 +103,13 @@ ScVbaAxis::getAxisTitle( ) throw (script::BasicErrorException, uno::RuntimeExce void SAL_CALL ScVbaAxis::setDisplayUnit( ::sal_Int32 /*DisplayUnit*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Int32 SAL_CALL ScVbaAxis::getDisplayUnit( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return -1; } @@ -143,7 +143,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } ::sal_Int32 SAL_CALL @@ -175,7 +175,7 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return nCrosses; } @@ -205,7 +205,7 @@ ScVbaAxis::getCrossesAt( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fCrosses; } @@ -232,13 +232,13 @@ ScVbaAxis::setHasTitle( ::sal_Bool _bHasTitle ) throw (script::BasicErrorExcepti switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasXAxisTitle"), uno::makeAny(_bHasTitle)); break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasZAxisTitle"), uno::makeAny(_bHasTitle)); break; default: // xlValue: - pChart->mxDiagramPropertySet->setPropertyValue( rtl::OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); + pChart->mxDiagramPropertySet->setPropertyValue( OUString("HasYAxisTitle"), uno::makeAny(_bHasTitle)); } } @@ -259,13 +259,13 @@ ScVbaAxis::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExcep switch(nType) { case xlCategory: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasXAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasXAxisTitle") ) >>= bHasTitle; break; case xlSeriesAxis: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasZAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasZAxisTitle") ) >>= bHasTitle; break; default: // xlValue: - pChart->mxDiagramPropertySet->getPropertyValue( rtl::OUString("HasYAxisTitle") ) >>= bHasTitle; + pChart->mxDiagramPropertySet->getPropertyValue( OUString("HasYAxisTitle") ) >>= bHasTitle; } } catch (const uno::Exception& e) @@ -281,11 +281,11 @@ ScVbaAxis::setMinorUnit( double _fMinorUnit ) throw (script::BasicErrorException try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("StepHelp"), uno::makeAny(_fMinorUnit)); + mxPropertySet->setPropertyValue( OUString("StepHelp"), uno::makeAny(_fMinorUnit)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -296,11 +296,11 @@ ScVbaAxis::getMinorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepHelp")) >>= fMinor; + mxPropertySet->getPropertyValue( OUString("StepHelp")) >>= fMinor; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMinor; } @@ -311,11 +311,11 @@ ScVbaAxis::setMinorUnitIsAuto( ::sal_Bool _bMinorUnitIsAuto ) throw (script::Bas try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); + mxPropertySet->setPropertyValue( OUString( "AutoStepHelp" ), uno::makeAny(_bMinorUnitIsAuto)); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -327,12 +327,12 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepHelp") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepHelp") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -340,13 +340,13 @@ ScVbaAxis::getMinorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti void SAL_CALL ScVbaAxis::setReversePlotOrder( ::sal_Bool /*ReversePlotOrder*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } ::sal_Bool SAL_CALL ScVbaAxis::getReversePlotOrder( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return false; } @@ -357,12 +357,12 @@ ScVbaAxis::setMajorUnit( double _fMajorUnit ) throw (script::BasicErrorException { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("StepMain"), uno::makeAny(_fMajorUnit)); + mxPropertySet->setPropertyValue( OUString("StepMain"), uno::makeAny(_fMajorUnit)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -373,11 +373,11 @@ ScVbaAxis::getMajorUnit( ) throw (script::BasicErrorException, uno::RuntimeExce try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString("StepMain")) >>= fMax; + mxPropertySet->getPropertyValue( OUString("StepMain")) >>= fMax; } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return fMax; } @@ -389,12 +389,12 @@ ScVbaAxis::setMajorUnitIsAuto( ::sal_Bool _bMajorUnitIsAuto ) throw (script::Bas { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoStepMain" ), uno::makeAny( _bMajorUnitIsAuto )); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -406,12 +406,12 @@ ScVbaAxis::getMajorUnitIsAuto( ) throw (script::BasicErrorException, uno::Runti { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "AutoStepMain")) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoStepMain")) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -423,12 +423,12 @@ ScVbaAxis::setMaximumScale( double _fMaximumScale ) throw (script::BasicErrorExc { if ( isValueAxis() ) { - mxPropertySet->setPropertyValue( rtl::OUString( "Max" ), uno::makeAny(_fMaximumScale)); + mxPropertySet->setPropertyValue( OUString( "Max" ), uno::makeAny(_fMaximumScale)); } } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -440,12 +440,12 @@ ScVbaAxis::getMaximumScale( ) throw (script::BasicErrorException, uno::RuntimeE { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString( "Max" )) >>= fMax; + mxPropertySet->getPropertyValue( OUString( "Max" )) >>= fMax; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return fMax; @@ -457,12 +457,12 @@ ScVbaAxis::setMaximumScaleIsAuto( ::sal_Bool _bMaximumScaleIsAuto ) throw (scrip try { if ( isValueAxis() ) - mxPropertySet->setPropertyValue( rtl::OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); + mxPropertySet->setPropertyValue( OUString( "AutoMax" ), uno::makeAny( _bMaximumScaleIsAuto )); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -474,11 +474,11 @@ ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "AutoMax" ) ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString( "AutoMax" ) ) >>= bIsAuto; } catch ( uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } return bIsAuto; } @@ -489,11 +489,11 @@ ScVbaAxis::setMinimumScale( double _fMinimumScale ) throw (script::BasicErrorExc try { if (isValueAxis()) - mxPropertySet->setPropertyValue( rtl::OUString("Min"), uno::makeAny( _fMinimumScale ) ); + mxPropertySet->setPropertyValue( OUString("Min"), uno::makeAny( _fMinimumScale ) ); } catch ( uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -504,7 +504,7 @@ ScVbaAxis::getMinimumScale( ) throw (script::BasicErrorException, uno::RuntimeE try { if (isValueAxis()) - mxPropertySet->getPropertyValue( rtl::OUString( "Min")) >>= fMin; + mxPropertySet->getPropertyValue( OUString( "Min")) >>= fMin; } catch (const uno::Exception& e) { @@ -520,12 +520,12 @@ ScVbaAxis::setMinimumScaleIsAuto( ::sal_Bool _bMinimumScaleIsAuto ) throw (scrip { if (isValueAxis()) { - mxPropertySet->setPropertyValue( rtl::OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); + mxPropertySet->setPropertyValue( OUString("AutoMin"), uno::makeAny(_bMinimumScaleIsAuto)); } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -537,12 +537,12 @@ ScVbaAxis::getMinimumScaleIsAuto( ) throw (script::BasicErrorException, uno::Ru { if (isValueAxis()) { - mxPropertySet->getPropertyValue( rtl::OUString("AutoMin") ) >>= bIsAuto; + mxPropertySet->getPropertyValue( OUString("AutoMin") ) >>= bIsAuto; } } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bIsAuto; } @@ -563,10 +563,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_False ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue( rtl::OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue( OUString( "Logarithmic" ), uno::makeAny( sal_True ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown @@ -576,7 +576,7 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -589,7 +589,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce if (isValueAxis()) { sal_Bool bisLogarithmic = false; - mxPropertySet->getPropertyValue( rtl::OUString( rtl::OUString("Logarithmic")) ) >>= bisLogarithmic; + mxPropertySet->getPropertyValue( OUString( OUString("Logarithmic")) ) >>= bisLogarithmic; if (bisLogarithmic) nScaleType = xlScaleLogarithmic; else @@ -598,7 +598,7 @@ ScVbaAxis::getScaleType( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return nScaleType; } @@ -638,20 +638,20 @@ void SAL_CALL ScVbaAxis::setLeft( double left ) throw (css::script::BasicErrorEx oShapeHelper->setLeft( left ); } -rtl::OUString +OUString ScVbaAxis::getServiceImplName() { - return rtl::OUString("ScVbaAxis"); + return OUString("ScVbaAxis"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxis::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Axis" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Axis" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index fde704028d5f..028d82cd6270 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -84,8 +84,8 @@ public: virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 986d1a3766e7..9c1993c62131 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -25,21 +25,21 @@ ScVbaAxisTitle::ScVbaAxisTitle( const uno::Reference< XHelperInterface >& xParen { } -rtl::OUString +OUString ScVbaAxisTitle::getServiceImplName() { - return rtl::OUString("ScVbaAxisTitle"); + return OUString("ScVbaAxisTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaAxisTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = AxisTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.AxisTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.AxisTitle" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index 0a9b09ff754d..b0cbd9e92e95 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -30,8 +30,8 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index a184897d9ef0..38ee47e8c919 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -42,7 +42,7 @@ typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; // borders, the enumeration will match the order in this list static const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -const static rtl::OUString sTableBorder("TableBorder"); +const static OUString sTableBorder("TableBorder"); // Equiv widths in in 1/100 mm const static sal_Int32 OOLineThin = 35; @@ -144,17 +144,17 @@ private: } ScVbaBorder(); // no impl protected: - virtual rtl::OUString getServiceImplName() + virtual OUString getServiceImplName() { - return rtl::OUString("ScVbaBorder"); + return OUString("ScVbaBorder"); } - virtual css::uno::Sequence<rtl::OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Border" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Border" ); } return aServiceNames; } @@ -167,7 +167,7 @@ public: table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException) { @@ -180,7 +180,7 @@ public: setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "No Implementation available" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException) @@ -231,7 +231,7 @@ public: break; } } - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException) { @@ -255,12 +255,12 @@ public: aBorderLine.OuterLineWidth = OOLineHairline; break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException) @@ -289,12 +289,12 @@ public: case XlLineStyle::xlSlantDashDot: break; default: - throw uno::RuntimeException( rtl::OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Bad param" ), uno::Reference< uno::XInterface >() ); } setBorderLine( aBorderLine ); } else - throw uno::RuntimeException( rtl::OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Method failed" ), uno::Reference< uno::XInterface >() ); } }; @@ -546,20 +546,20 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } -rtl::OUString +OUString ScVbaBorders::getServiceImplName() { - return rtl::OUString("ScVbaBorders"); + return OUString("ScVbaBorders"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaBorders::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Borders" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Borders" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index cda900232898..a7a5eba2ca2d 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -60,8 +60,8 @@ public: virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException); // xxxxBASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_BORDERS_HXX diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index ae4f367c3a31..496c8d6d2cec 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -49,13 +49,13 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getCaption() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaCharacters::setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException) +ScVbaCharacters::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _caption ); @@ -67,13 +67,13 @@ ScVbaCharacters::getCount() throw (css::uno::RuntimeException) return getCaption().getLength(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaCharacters::getText() throw (css::uno::RuntimeException) { return getCaption(); } void SAL_CALL -ScVbaCharacters::setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaCharacters::setText( const OUString& _text ) throw (css::uno::RuntimeException) { setCaption( _text ); } @@ -87,13 +87,13 @@ void SAL_CALL ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) throw (css::uno::RuntimeException) { // #TODO #FIXME needs implementation, or can't be done? - throw uno::RuntimeException( ::rtl::OUString( "Not Implemented"), uno::Reference< XInterface >() ); + throw uno::RuntimeException( OUString( "Not Implemented"), uno::Reference< XInterface >() ); } // Methods void SAL_CALL -ScVbaCharacters::Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException) +ScVbaCharacters::Insert( const OUString& String ) throw (css::uno::RuntimeException) { m_xSimpleText->insertString( m_xTextRange, String, bReplace ); } @@ -103,24 +103,24 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException) { // #FIXME #TODO is this a bit suspect?, I wonder should the contents // of the cell be deleted from the parent ( range ) - m_xSimpleText->setString(rtl::OUString()); + m_xSimpleText->setString(OUString()); } -rtl::OUString +OUString ScVbaCharacters::getServiceImplName() { - return rtl::OUString("ScVbaCharacters"); + return OUString("ScVbaCharacters"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaCharacters::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Characters" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Characters" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 57ed5fd4f658..4e3121d3878c 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaCharacters() {} // Attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException); // Methods - virtual void SAL_CALL Insert( const ::rtl::OUString& String ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 760095a49bae..449b9d744ad1 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -47,23 +47,23 @@ using namespace ::ooo::vba::excel::XlRowCol; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlAxisGroup; -const rtl::OUString CHART_NAME("Name"); +const OUString CHART_NAME("Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) -const rtl::OUString DEFAULTSERIESPREFIX("Series"); -const rtl::OUString DATAROWSOURCE("DataRowSource"); -const rtl::OUString UPDOWN("UpDown"); -const rtl::OUString VOLUME("Volume"); -const rtl::OUString LINES("Lines"); -const rtl::OUString SPLINETYPE("SplineType"); -const rtl::OUString SYMBOLTYPE("SymbolType"); -const rtl::OUString DEEP("Deep"); -const rtl::OUString SOLIDTYPE("SolidType"); -const rtl::OUString VERTICAL("Vertical"); -const rtl::OUString PERCENT("Percent"); -const rtl::OUString STACKED("Stacked"); -const rtl::OUString DIM3D("Dim3D"); -const rtl::OUString HASMAINTITLE("HasMainTitle"); -const rtl::OUString HASLEGEND("HasLegend"); +const OUString DEFAULTSERIESPREFIX("Series"); +const OUString DATAROWSOURCE("DataRowSource"); +const OUString UPDOWN("UpDown"); +const OUString VOLUME("Volume"); +const OUString LINES("Lines"); +const OUString SPLINETYPE("SplineType"); +const OUString SYMBOLTYPE("SymbolType"); +const OUString DEEP("Deep"); +const OUString SOLIDTYPE("SolidType"); +const OUString VERTICAL("Vertical"); +const OUString PERCENT("Percent"); +const OUString STACKED("Stacked"); +const OUString DIM3D("Dim3D"); +const OUString HASMAINTITLE("HasMainTitle"); +const OUString HASLEGEND("HasLegend"); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, const css::uno::Reference< css::table::XTableChart >& _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart( _xTableChart ) { @@ -77,10 +77,10 @@ ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xPar mxChartPropertySet.set( _xChartComponent, uno::UNO_QUERY_THROW ) ; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChart::getName() throw (css::uno::RuntimeException) { - rtl::OUString sName; + OUString sName; uno::Reference< beans::XPropertySet > xProps( mxChartDocument, uno::UNO_QUERY_THROW ); try { @@ -104,7 +104,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce sal_Int32 nChartType = -1; try { - rtl::OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); + OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); if ( sDiagramType == "com.sun.star.chart.AreaDiagram" ) { if (is3D()) @@ -212,7 +212,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return nChartType; } @@ -262,7 +262,7 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - setDiagram( rtl::OUString("com.sun.star.chart.BarDiagram")); + setDiagram( OUString("com.sun.star.chart.BarDiagram")); break; case xlLine: case xl3DLine: @@ -271,7 +271,7 @@ try case xlLineMarkers: case xlLineMarkersStacked: case xlLineMarkersStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.LineDiagram")); + setDiagram( OUString("com.sun.star.chart.LineDiagram")); break; case xl3DArea: case xlArea: @@ -279,17 +279,17 @@ try case xlAreaStacked100: case xl3DAreaStacked: case xl3DAreaStacked100: - setDiagram( rtl::OUString("com.sun.star.chart.AreaDiagram") ); + setDiagram( OUString("com.sun.star.chart.AreaDiagram") ); break; case xlDoughnut: case xlDoughnutExploded: - setDiagram( rtl::OUString("com.sun.star.chart.DonutDiagram") ); + setDiagram( OUString("com.sun.star.chart.DonutDiagram") ); break; case xlStockHLC: case xlStockOHLC: case xlStockVHLC: case xlStockVOHLC: - setDiagram( rtl::OUString("com.sun.star.chart.StockDiagram")); + setDiagram( OUString("com.sun.star.chart.StockDiagram")); mxDiagramPropertySet->setPropertyValue( UPDOWN, uno::makeAny(sal_Bool((_nChartType == xlStockOHLC) || (_nChartType == xlStockVOHLC)))); mxDiagramPropertySet->setPropertyValue(VOLUME, uno::makeAny(sal_Bool((_nChartType == xlStockVHLC) || (_nChartType == xlStockVOHLC)))); break; @@ -300,13 +300,13 @@ try case xl3DPie: case xlPie: case xlBarOfPie: // not possible (Zoom pie) - setDiagram( rtl::OUString("com.sun.star.chart.PieDiagram")); + setDiagram( OUString("com.sun.star.chart.PieDiagram")); break; case xlRadar: case xlRadarMarkers: case xlRadarFilled: - setDiagram( rtl::OUString("com.sun.star.chart.NetDiagram")); + setDiagram( OUString("com.sun.star.chart.NetDiagram")); break; case xlXYScatter: case xlBubble: // not possible @@ -315,7 +315,7 @@ try case xlXYScatterLinesNoMarkers: case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: - setDiagram( rtl::OUString("com.sun.star.chart.XYDiagram")); + setDiagram( OUString("com.sun.star.chart.XYDiagram")); switch(_nChartType) { case xlXYScatter: @@ -336,7 +336,7 @@ try } break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_CONVERSION, OUString() ); } switch (_nChartType) @@ -539,7 +539,7 @@ try } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -555,7 +555,7 @@ ScVbaChart::Activate() throw (script::BasicErrorException, uno::RuntimeException if ( pChartObj ) pChartObj->Activate(); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "no ChartObject as parent" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "no ChartObject as parent" ) ); } void SAL_CALL @@ -622,18 +622,18 @@ ScVbaChart::setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) { - uno::Sequence< rtl::OUString > sDescriptions ( _nCount ); + uno::Sequence< OUString > sDescriptions ( _nCount ); sal_Int32 nLen = sDescriptions.getLength(); for (sal_Int32 i = 0; i < nLen; i++) { - sDescriptions[i] = DEFAULTSERIESPREFIX + rtl::OUString::valueOf(i+1); + sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::valueOf(i+1); } return sDescriptions; } @@ -660,12 +660,12 @@ ScVbaChart::setPlotBy( ::sal_Int32 _nPlotBy ) throw (css::script::BasicErrorExce mxDiagramPropertySet->setPropertyValue( DATAROWSOURCE, uno::makeAny( chart::ChartDataRowSource_COLUMNS) ); break; default: - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -687,12 +687,12 @@ ScVbaChart::getPlotBy( ) throw (script::BasicErrorException, uno::RuntimeExcept } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } void -ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::BasicErrorException ) +ScVbaChart::setDiagram( const OUString& _sDiagramType ) throw( script::BasicErrorException ) { try { @@ -703,7 +703,7 @@ ScVbaChart::setDiagram( const rtl::OUString& _sDiagramType ) throw( script::Basi } catch ( const uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -819,7 +819,7 @@ ScVbaChart::getHasTitle( ) throw (script::BasicErrorException, uno::RuntimeExce } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasTitle; } @@ -833,7 +833,7 @@ ScVbaChart::setHasTitle( ::sal_Bool bTitle ) throw (script::BasicErrorException, } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -848,7 +848,7 @@ ScVbaChart::getHasLegend( ) throw (script::BasicErrorException, uno::RuntimeExc } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasLegend; } @@ -862,7 +862,7 @@ ScVbaChart::setHasLegend( ::sal_Bool bLegend ) throw (script::BasicErrorExceptio } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -953,7 +953,7 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } catch (const uno::Exception&) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } @@ -976,8 +976,8 @@ ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return _nNotUpDown; } @@ -994,8 +994,8 @@ ScVbaChart::hasMarkers() throw ( script::BasicErrorException ) } catch (const uno::Exception&) { - rtl::OUString aTemp; // temporary needed for g++ 3.3.5 - script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + OUString aTemp; // temporary needed for g++ 3.3.5 + script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return bHasMarkers; } @@ -1052,20 +1052,20 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro } -rtl::OUString +OUString ScVbaChart::getServiceImplName() { - return rtl::OUString("ScVbaChart"); + return OUString("ScVbaChart"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChart::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index bef1cb23cd3d..e2282e84a626 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -48,10 +48,10 @@ friend class ScVbaAxis; css::uno::Reference< css::chart::XTwoAxisXSupplier > xTwoAxisXSupplier; css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier; - css::uno::Sequence< rtl::OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); + css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); css::uno::Sequence< css::uno::Sequence< double > > dblValues; void setDefaultChartType()throw ( css::script::BasicErrorException ) ; - void setDiagram( const rtl::OUString& _sDiagramType) throw( css::script::BasicErrorException ); + void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); bool isStacked() throw ( css::uno::RuntimeException ); bool is100PercentStacked() throw ( css::uno::RuntimeException ); sal_Int32 getStackedType( sal_Int32 _nStacked, sal_Int32 _n100PercentStacked, sal_Int32 _nUnStacked ) throw ( css::uno::RuntimeException ); @@ -68,7 +68,7 @@ public: bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException); virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException); @@ -86,8 +86,8 @@ public: virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 42cf8f1758f2..f08764f439f3 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -const rtl::OUString PERSIST_NAME("PersistName"); +const OUString PERSIST_NAME("PersistName"); ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjectImpl_BASE( _xParent, _xContext ), xTableChart( _xTableChart ), xDrawPageSupplier( _xDrawPageSupplier ) { @@ -41,7 +41,7 @@ ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterf oShapeHelper.reset(new ShapeHelper(xShape)); } -rtl::OUString ScVbaChartObject::getPersistName() +OUString ScVbaChartObject::getPersistName() { if ( sPersistName.isEmpty() ) sPersistName = xNamed->getName(); @@ -60,7 +60,7 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) if (xShape->getShapeType().compareToAscii("com.sun.star.drawing.OLE2Shape") == 0 ) { uno::Reference< beans::XPropertySet > xShapePropertySet(xShape, uno::UNO_QUERY_THROW ); - rtl::OUString sName; + OUString sName; xShapePropertySet->getPropertyValue(PERSIST_NAME ) >>=sName; if ( sName.equals(sPersistName)) { @@ -72,19 +72,19 @@ ScVbaChartObject::setShape() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return NULL; } void SAL_CALL -ScVbaChartObject::setName( const rtl::OUString& sName ) throw (css::uno::RuntimeException) +ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeException) { xNamedShape->setName(sName); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException) { return xNamedShape->getName(); @@ -100,7 +100,7 @@ ScVbaChartObject::Delete() throw ( css::script::BasicErrorException ) if (pChartObjectsImpl) pChartObjectsImpl->removeByName( getPersistName() ); else - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "Parent is not ChartObjects" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "Parent is not ChartObjects" ) ); } void @@ -117,7 +117,7 @@ ScVbaChartObject::Activate() throw ( script::BasicErrorException ) } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString( "ChartObject Activate internal error" ) ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString( "ChartObject Activate internal error" ) ); } } @@ -127,20 +127,20 @@ ScVbaChartObject::getChart() throw (css::uno::RuntimeException) return new ScVbaChart( this, mxContext, xEmbeddedObjectSupplier->getEmbeddedObject(), xTableChart ); } -rtl::OUString +OUString ScVbaChartObject::getServiceImplName() { - return rtl::OUString("ScVbaChartObject"); + return OUString("ScVbaChartObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ChartObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ChartObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 99f94ebb7e8b..f0a557e6f080 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -40,23 +40,23 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XDrawPage > xDrawPage; css::uno::Reference< css::drawing::XShape > xShape; css::uno::Reference< css::container::XNamed > xNamed; - rtl::OUString sPersistName; + OUString sPersistName; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr<ov::ShapeHelper> oShapeHelper; SAL_WNODEPRECATED_DECLARATIONS_POP css::uno::Reference< css::container::XNamed > xNamedShape; - rtl::OUString getPersistName(); + OUString getPersistName(); css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& sName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException ); virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index cdfd42545885..81904861106a 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -58,15 +58,15 @@ ScVbaChartObjects::ScVbaChartObjects( const css::uno::Reference< ov::XHelperInte } void -ScVbaChartObjects::removeByName(const rtl::OUString& _sChartName) +ScVbaChartObjects::removeByName(const OUString& _sChartName) { xTableCharts->removeByName( _sChartName ); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ) { - uno::Sequence< rtl::OUString > sChartNames; + uno::Sequence< OUString > sChartNames; try { // c++ hackery @@ -74,34 +74,34 @@ ScVbaChartObjects::getChartObjectNames() throw( css::script::BasicErrorException ScCellRangesBase* pUno= dynamic_cast< ScCellRangesBase* >( xIf.get() ); ScDocShell* pDocShell = NULL; if ( !pUno ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the impl class from the drawpage"), uno::Reference< uno::XInterface >() ); pDocShell = pUno->GetDocShell(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Failed to obtain the docshell implclass"), uno::Reference< uno::XInterface >() ); uno::Reference< sheet::XSpreadsheetDocument > xSpreadsheetDocument( pDocShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XSpreadsheets > xSpreadsheets = xSpreadsheetDocument->getSheets(); - std::vector< rtl::OUString > aChartNamesVector; + std::vector< OUString > aChartNamesVector; - uno::Sequence< rtl::OUString > sSheetNames = xSpreadsheets->getElementNames(); + uno::Sequence< OUString > sSheetNames = xSpreadsheets->getElementNames(); sal_Int32 nItems = sSheetNames.getLength(); for (sal_Int32 i = 0; i < nItems; i++) { uno::Reference< table::XTableChartsSupplier > xLocTableChartsSupplier( xSpreadsheets->getByName(sSheetNames[i]), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); + uno::Sequence< OUString > scurchartnames = xLocTableChartsSupplier->getCharts()->getElementNames(); sal_Int32 nChartNames = scurchartnames.getLength(); for (sal_Int32 n = 0; n < nChartNames; n++ ) aChartNamesVector.push_back(scurchartnames[n]); } sChartNames.realloc( aChartNamesVector.size() ); - std::vector< rtl::OUString > ::const_iterator it = aChartNamesVector.begin(); - std::vector< rtl::OUString > ::const_iterator it_end = aChartNamesVector.end(); + std::vector< OUString > ::const_iterator it = aChartNamesVector.begin(); + std::vector< OUString > ::const_iterator it_end = aChartNamesVector.end(); for ( sal_Int32 index = 0 ; it != it_end; ++it, ++index ) sChartNames[index] = *it; } catch (uno::Exception& ) { - throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw script::BasicErrorException( OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sChartNames; } @@ -119,7 +119,7 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight aRectangle.Width = Millimeter::getInHundredthsOfOneMillimeter(_nWidth); aRectangle.Height = Millimeter::getInHundredthsOfOneMillimeter(_nHeight); // Note the space at the end of the stem ("Chart "). In ChartSheets only "Chart" is the stem - rtl::OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), rtl::OUString( "Chart " ) , rtl::OUString(), 1); + OUString sPersistChartName = ContainerUtilities::getUniqueName( getChartObjectNames(), OUString( "Chart " ) , OUString(), 1); xTableCharts->addNewByName(sPersistChartName, aRectangle, aCellRangeAddress, true, false ); uno::Reference< excel::XChartObject > xChartObject( getItemByStringIndex( sPersistChartName ), uno::UNO_QUERY_THROW ); xChartObject->getChart()->setChartType(excel::XlChartType::xlColumnClustered); @@ -127,13 +127,13 @@ ScVbaChartObjects::Add( double _nX, double _nY, double _nWidth, double _nHeight } catch (const uno::Exception& ex) { - OSL_TRACE("AddItem caught exception ->%s", rtl::OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("AddItem caught exception ->%s", OUStringToOString( ex.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } return aNULL(); } void SAL_CALL ScVbaChartObjects::Delete( ) throw (script::BasicErrorException) { - uno::Sequence< rtl::OUString > sChartNames = xTableCharts->getElementNames(); + uno::Sequence< OUString > sChartNames = xTableCharts->getElementNames(); sal_Int32 ncount = sChartNames.getLength(); for (sal_Int32 i = 0; i < ncount ; i++) removeByName(sChartNames[i]); @@ -165,20 +165,20 @@ ScVbaChartObjects::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( uno::Reference< excel::XChartObject > ( new ScVbaChartObject( getParent(), mxContext, xTableChart, xDrawPageSupplier ) ) ); } -rtl::OUString +OUString ScVbaChartObjects::getServiceImplName() { - return rtl::OUString("ScVbaChartObjects"); + return OUString("ScVbaChartObjects"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaChartObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.ChartObjects"); + sNames[0] = OUString("ooo.vba.excel.ChartObjects"); } return sNames; } diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 7c52f5c1962d..6ced7893db7f 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -31,10 +31,10 @@ typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE; /* #TODO see if this hash table is 'really' necessary -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, css::uno::Reference< ov::excel::XChartObject >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > aHashTable; + OUStringHash, + ::std::equal_to< OUString > > aHashTable; */ class ScVbaChartObjects : public ChartObjects_BASE @@ -47,8 +47,8 @@ class ScVbaChartObjects : public ChartObjects_BASE public: ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - css::uno::Sequence< rtl::OUString > getChartObjectNames() throw( css::script::BasicErrorException ); - void removeByName(const rtl::OUString& _sChartName); + css::uno::Sequence< OUString > getChartObjectNames() throw( css::script::BasicErrorException ); + void removeByName(const OUString& _sChartName); // XChartObjects virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException); @@ -60,8 +60,8 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ChartObjects_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index 3fbe661f98fa..a07722c86f1b 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -25,21 +25,21 @@ ScVbaChartTitle::ScVbaChartTitle( const uno::Reference< XHelperInterface >& xPar { } -rtl::OUString +OUString ScVbaChartTitle::getServiceImplName() { - return rtl::OUString("ScVbaChartTitle"); + return OUString("ScVbaChartTitle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaChartTitle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { - uno::Sequence< rtl::OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); + uno::Sequence< OUString > BaseServiceNames = ChartTitleBase::getServiceNames(); aServiceNames.realloc( BaseServiceNames.getLength() + 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Chart" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Chart" ); for ( sal_Int32 index = 1; index < (BaseServiceNames.getLength() + 1); ++index ) aServiceNames[ index ] = BaseServiceNames[ index ]; } diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 22989e8a3106..dec1b7717572 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -30,8 +30,8 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 1393237312bf..d6f18cc40bbc 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -47,7 +47,7 @@ ScVbaComment::ScVbaComment( mxRange( xRange ) { if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY ); } @@ -108,14 +108,14 @@ ScVbaComment::getCommentByIndex( sal_Int32 Index ) throw (uno::RuntimeException) // public vba functions -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::getAuthor() throw (uno::RuntimeException) { return getAnnotation()->getAuthor(); } void SAL_CALL -ScVbaComment::setAuthor( const rtl::OUString& /*_author*/ ) throw (uno::RuntimeException) +ScVbaComment::setAuthor( const OUString& /*_author*/ ) throw (uno::RuntimeException) { // #TODO #FIXME implementation needed } @@ -163,14 +163,14 @@ ScVbaComment::Previous() throw (uno::RuntimeException) return getCommentByIndex( getAnnotationIndex() ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::Any& Overwrite ) throw (uno::RuntimeException) { - rtl::OUString sText; + OUString sText; aText >>= sText; uno::Reference< text::XSimpleText > xAnnoText( getAnnotation(), uno::UNO_QUERY_THROW ); - rtl::OUString sAnnoText = xAnnoText->getString(); + OUString sAnnoText = xAnnoText->getString(); if ( aStart.hasValue() ) { @@ -200,7 +200,7 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xAnnoText->insertString( xRange, sText, bOverwrite ); return xAnnoText->getString(); } - throw uno::RuntimeException( rtl::OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "ScVbaComment::Text - bad Start value " ), uno::Reference< uno::XInterface >() ); } else if ( aText.hasValue() ) { @@ -212,20 +212,20 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An return sAnnoText; } -rtl::OUString +OUString ScVbaComment::getServiceImplName() { - return rtl::OUString("ScVbaComment"); + return OUString("ScVbaComment"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaComment::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.ScVbaComment" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.ScVbaComment" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index e8c2381639a2..17a2c319cc08 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -53,8 +53,8 @@ public: virtual ~ScVbaComment() {} // Attributes - virtual rtl::OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAuthor( const rtl::OUString& _author ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException); @@ -63,10 +63,10 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_COMMENT_HXX */ diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 9e09ee631cda..1a678afb68e7 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -88,20 +88,20 @@ ScVbaComments::getElementType() throw (uno::RuntimeException) return excel::XComment::static_type(0); } -rtl::OUString +OUString ScVbaComments::getServiceImplName() { - return rtl::OUString("ScVbaComments"); + return OUString("ScVbaComments"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaComments::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Comments"); + sNames[0] = OUString("ooo.vba.excel.Comments"); } return sNames; } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 93d248dccb20..431409d4c54e 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -46,8 +46,8 @@ public: // ScVbaComments_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); private: css::uno::Reference< css::frame::XModel > mxModel; diff --git a/sc/source/ui/vba/vbacondition.cxx b/sc/source/ui/vba/vbacondition.cxx index 3ebd89adf753..54d320c07743 100644 --- a/sc/source/ui/vba/vbacondition.cxx +++ b/sc/source/ui/vba/vbacondition.cxx @@ -77,14 +77,14 @@ ScVbaCondition< Ifc1 >::retrieveAPIOperator( const uno::Any& _aOperator) throw ( } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula1( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula1(); } template< typename Ifc1 > -rtl::OUString +OUString ScVbaCondition< Ifc1 >::Formula2( ) throw ( script::BasicErrorException, uno::RuntimeException ) { return mxSheetCondition->getFormula2(); @@ -94,7 +94,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula1( const uno::Any& _aFormula1) throw ( script::BasicErrorException ) { - rtl::OUString sFormula; + OUString sFormula; if ( (_aFormula1 >>= sFormula )) { mxSheetCondition->setFormula1( sFormula ); @@ -108,7 +108,7 @@ template< typename Ifc1 > void ScVbaCondition< Ifc1 >::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { - rtl::OUString sFormula2; + OUString sFormula2; // #TODO surely this can't be right? // ( from helperapi/impl/.../calc/ConditionImpl.java if ( (_aFormula2 >>= sFormula2 )) @@ -157,7 +157,7 @@ ScVbaCondition< Ifc1 >::Operator(sal_Bool _bIncludeFormulaValue) throw ( script: } case sheet::ConditionOperator_NONE: default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString("Operator not supported")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString("Operator not supported")); break; } return retvalue; diff --git a/sc/source/ui/vba/vbacondition.hxx b/sc/source/ui/vba/vbacondition.hxx index db0eb8f1c94d..b5bed15ae80f 100644 --- a/sc/source/ui/vba/vbacondition.hxx +++ b/sc/source/ui/vba/vbacondition.hxx @@ -35,8 +35,8 @@ public: static css::sheet::ConditionOperator retrieveAPIOperator( const css::uno::Any& _aOperator) throw ( css::script::BasicErrorException ); - virtual rtl::OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); - virtual rtl::OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula1( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + virtual OUString SAL_CALL Formula2( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ); virtual sal_Int32 Operator(sal_Bool _bIncludeFormulaValue) throw ( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx index 1f1c3736bce9..a5c59fd27d8b 100644 --- a/sc/source/ui/vba/vbadialog.cxx +++ b/sc/source/ui/vba/vbadialog.cxx @@ -23,59 +23,59 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static const rtl::OUString aStringList[]= +static const OUString aStringList[]= { - rtl::OUString( ".uno:Open" ), - rtl::OUString( ".uno:FormatCellDialog" ), - rtl::OUString( ".uno:InsertCell" ), - rtl::OUString( ".uno:Print" ), - rtl::OUString( ".uno:PasteSpecial" ), - rtl::OUString( ".uno:ToolProtectionDocument" ), - rtl::OUString( ".uno:ColumnWidth" ), - rtl::OUString( ".uno:DefineName" ), - rtl::OUString( ".uno:ConfigureDialog" ), - rtl::OUString( ".uno:HyperlinkDialog" ), - rtl::OUString( ".uno:InsertGraphic" ), - rtl::OUString( ".uno:InsertObject" ), - rtl::OUString( ".uno:PageFormatDialog" ), - rtl::OUString( ".uno:DataSort" ), - rtl::OUString( ".uno:RowHeight" ), - rtl::OUString( ".uno:AutoCorrectDlg" ), - rtl::OUString( ".uno:ConditionalFormatDialog" ), - rtl::OUString( ".uno:DataConsolidate" ), - rtl::OUString( ".uno:CreateNames" ), - rtl::OUString( ".uno:FillSeries" ), - rtl::OUString( ".uno:Validation"), - rtl::OUString( ".uno:DefineLabelRange" ), - rtl::OUString( ".uno:DataFilterAutoFilter" ), - rtl::OUString( ".uno:DataFilterSpecialFilter" ), - rtl::OUString( ".uno:AutoFormat" ) + OUString( ".uno:Open" ), + OUString( ".uno:FormatCellDialog" ), + OUString( ".uno:InsertCell" ), + OUString( ".uno:Print" ), + OUString( ".uno:PasteSpecial" ), + OUString( ".uno:ToolProtectionDocument" ), + OUString( ".uno:ColumnWidth" ), + OUString( ".uno:DefineName" ), + OUString( ".uno:ConfigureDialog" ), + OUString( ".uno:HyperlinkDialog" ), + OUString( ".uno:InsertGraphic" ), + OUString( ".uno:InsertObject" ), + OUString( ".uno:PageFormatDialog" ), + OUString( ".uno:DataSort" ), + OUString( ".uno:RowHeight" ), + OUString( ".uno:AutoCorrectDlg" ), + OUString( ".uno:ConditionalFormatDialog" ), + OUString( ".uno:DataConsolidate" ), + OUString( ".uno:CreateNames" ), + OUString( ".uno:FillSeries" ), + OUString( ".uno:Validation"), + OUString( ".uno:DefineLabelRange" ), + OUString( ".uno:DataFilterAutoFilter" ), + OUString( ".uno:DataFilterSpecialFilter" ), + OUString( ".uno:AutoFormat" ) }; const sal_Int32 nDialogSize = sizeof (aStringList) / sizeof (aStringList[0]); -rtl::OUString +OUString ScVbaDialog::mapIndexToName( sal_Int32 nIndex ) { if( nIndex < nDialogSize ) return aStringList[ nIndex ]; - return rtl::OUString(); + return OUString(); } -rtl::OUString +OUString ScVbaDialog::getServiceImplName() { - return rtl::OUString("ScVbaDialog"); + return OUString("ScVbaDialog"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialog::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialog" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialog" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index 4adeea7798aa..bdf1e75aacbb 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~ScVbaDialog() {} // Methods - virtual rtl::OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbadialogs.cxx b/sc/source/ui/vba/vbadialogs.cxx index 367dbcf6cea1..6c3982b4ff2e 100644 --- a/sc/source/ui/vba/vbadialogs.cxx +++ b/sc/source/ui/vba/vbadialogs.cxx @@ -37,20 +37,20 @@ ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException) return uno::Any( aDialog ); } -rtl::OUString +OUString ScVbaDialogs::getServiceImplName() { - return rtl::OUString("ScVbaDialogs"); + return OUString("ScVbaDialogs"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaDialogs::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Dialogs" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Dialogs" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 0542f5cf4698..420f955cb2e1 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -40,8 +40,8 @@ public: // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_DIALOGS_HXX */ diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index b444c2f836a8..9135324f8dfb 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -using ::rtl::OUString; // ============================================================================ @@ -798,7 +797,7 @@ OUString ScVbaEventsHelper::implGetDocumentModuleName( const EventHandlerInfo& r if( bSheetEvent && (nTab < 0) ) throw lang::IllegalArgumentException(); - rtl::OUString aCodeName; + OUString aCodeName; if( bSheetEvent ) mpDoc->GetCodeName( nTab, aCodeName ); else diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 7129c3f66af4..5779f624a89e 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -43,7 +43,7 @@ protected: virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); private: /** Checks if selection has been changed compared to selection of last call. diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 91dfba73542a..8eceec21ba28 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -105,8 +105,8 @@ ScVbaFont::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExceptio nValue = SUPERSCRIPT; nValue2 = SUPERSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); } uno::Any SAL_CALL @@ -138,7 +138,7 @@ ScVbaFont::getSuperscript() throw ( uno::RuntimeException ) xCell.set( xCellRange->getCellByPosition( 0,0 ) ); uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = 0; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUPERSCRIPT ) ); } @@ -178,8 +178,8 @@ ScVbaFont::setSubscript( const uno::Any& aValue ) throw ( uno::RuntimeException nValue2 = SUBSCRIPTHEIGHT; } - xProps->setPropertyValue( rtl::OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); - xProps->setPropertyValue( rtl::OUString( "CharEscapement" ), ( uno::Any )nValue ); + xProps->setPropertyValue( OUString( "CharEscapementHeight" ), ( uno::Any )nValue2 ); + xProps->setPropertyValue( OUString( "CharEscapement" ), ( uno::Any )nValue ); } @@ -213,7 +213,7 @@ ScVbaFont::getSubscript() throw ( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProps = lcl_TextProperties( xCell ); short nValue = NORMAL; - xProps->getPropertyValue( rtl::OUString( "CharEscapement" ) ) >>= nValue; + xProps->getPropertyValue( OUString( "CharEscapement" ) ) >>= nValue; return uno::makeAny( ( nValue == SUBSCRIPT ) ); } @@ -258,9 +258,9 @@ void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException ) { //XXX #TODO# #FIXME# - //mxFont->setPropertyValue( rtl::OUString( "CharSize" ), ( uno::Any )fValue ); + //mxFont->setPropertyValue( OUString( "CharSize" ), ( uno::Any )fValue ); throw uno::RuntimeException( - rtl::OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); } @@ -269,7 +269,7 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFontSize not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -279,7 +279,7 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("setStandardFont not supported"), uno::Reference< uno::XInterface >() ); } @@ -288,7 +288,7 @@ ScVbaFont::getStandardFont() throw ( uno::RuntimeException ) { //XXX #TODO# #FIXME# throw uno::RuntimeException( - rtl::OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); + OUString("getStandardFont not supported"), uno::Reference< uno::XInterface >() ); // return uno::Any(); } @@ -298,18 +298,18 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) sal_Bool bBold = false; sal_Bool bItalic = false; - rtl::OUString aStyles; + OUString aStyles; aValue >>= aStyles; - std::vector< rtl::OUString > aTokens; + std::vector< OUString > aTokens; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aStyles.getToken( 0, ' ', nIndex ); + OUString aToken = aStyles.getToken( 0, ' ', nIndex ); aTokens.push_back( aToken ); }while( nIndex >= 0 ); - std::vector< rtl::OUString >::iterator it; + std::vector< OUString >::iterator it; for( it = aTokens.begin(); it != aTokens.end(); ++it ) { if( (*it).equalsIgnoreAsciiCase("Bold") ) @@ -327,7 +327,7 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException ) uno::Any SAL_CALL ScVbaFont::getFontStyle() throw ( uno::RuntimeException ) { - rtl::OUStringBuffer aStyles; + OUStringBuffer aStyles; sal_Bool bValue = false; getBold() >>= bValue; if( bValue ) @@ -379,10 +379,10 @@ ScVbaFont::setUnderline( const uno::Any& aValue ) throw ( uno::RuntimeException nValue = awt::FontUnderline::DOUBLE; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value for Underline"), uno::Reference< uno::XInterface >() ); } - mxFont->setPropertyValue( rtl::OUString( "CharUnderline" ), ( uno::Any )nValue ); + mxFont->setPropertyValue( OUString( "CharUnderline" ), ( uno::Any )nValue ); } @@ -394,7 +394,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; - mxFont->getPropertyValue( rtl::OUString( "CharUnderline" ) ) >>= nValue; + mxFont->getPropertyValue( OUString( "CharUnderline" ) ) >>= nValue; switch ( nValue ) { case awt::FontUnderline::DOUBLE: @@ -407,7 +407,7 @@ ScVbaFont::getUnderline() throw ( uno::RuntimeException ) nValue = excel::XlUnderlineStyle::xlUnderlineStyleNone; break; default: - throw uno::RuntimeException( rtl::OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Unknown value retrieved for Underline"), uno::Reference< uno::XInterface >() ); } return uno::makeAny( nValue ); @@ -454,14 +454,14 @@ ScVbaFont::getColor() throw (uno::RuntimeException) { // #TODO #FIXME - behave like getXXX above ( wrt. GetDataSet ) uno::Any aAny; - aAny = OORGBToXLRGB( mxFont->getPropertyValue( rtl::OUString( "CharColor" ) ) ); + aAny = OORGBToXLRGB( mxFont->getPropertyValue( OUString( "CharColor" ) ) ); return aAny; } void SAL_CALL ScVbaFont::setOutlineFont( const uno::Any& aValue ) throw ( uno::RuntimeException ) { - mxFont->setPropertyValue( rtl::OUString( "CharContoured" ), aValue ); + mxFont->setPropertyValue( OUString( "CharContoured" ), aValue ); } uno::Any SAL_CALL @@ -470,23 +470,23 @@ ScVbaFont::getOutlineFont() throw (uno::RuntimeException) if ( GetDataSet() ) if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); - return mxFont->getPropertyValue( rtl::OUString( "CharContoured" ) ); + return mxFont->getPropertyValue( OUString( "CharContoured" ) ); } -rtl::OUString +OUString ScVbaFont::getServiceImplName() { - return rtl::OUString("ScVbaFont"); + return OUString("ScVbaFont"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFont::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Font" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Font" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index abb76a46390f..1a93fffb5da1 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -70,8 +70,8 @@ public: virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException) ; virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index e05e3ce53bd4..24f230b30369 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -50,18 +50,18 @@ using namespace ::com::sun::star; #define LOCALE "Locale" template< typename Ifc1 > -ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( rtl::OUString("en"), rtl::OUString( "US"), rtl::OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) +ScVbaFormat< Ifc1 >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( sal_False ) { try { if ( !mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); // mxServiceInfo is unused, // mxNumberFormatsSupplier is initialized when needed in initializeNumberFormats. } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -95,11 +95,11 @@ ScVbaFormat<Ifc1>::setVerticalAlignment( const uno::Any& _oAlignment) throw (s aVal = uno::makeAny( table::CellVertJustify2::STANDARD ); break; } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -110,10 +110,10 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, uno::Any aResult = aNULL(); try { - if (!isAmbiguous( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) + if (!isAmbiguous( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) ) { sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD; - mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; + mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment; switch( aAPIAlignment ) { case table::CellVertJustify2::BOTTOM: @@ -135,7 +135,7 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException, } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aResult; } @@ -171,11 +171,11 @@ ScVbaFormat<Ifc1>::setHorizontalAlignment( const uno::Any& HorizontalAlignment ) // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -187,7 +187,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException uno::Any NRetAlignment = aNULL(); try { - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if (!isAmbiguous(sHoriJust)) { table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_BLOCK; @@ -216,7 +216,7 @@ ScVbaFormat<Ifc1>::getHorizontalAlignment( ) throw (script::BasicErrorException } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return NRetAlignment; } @@ -238,7 +238,7 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script break; case excel::XlOrientation::xlHorizontal: aVal = uno::makeAny( table::CellOrientation_STANDARD ); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ROTANG ) ), uno::makeAny( sal_Int32(0) ) ); break; case excel::XlOrientation::xlUpward: aVal = uno::makeAny( table::CellOrientation_BOTTOMTOP); @@ -250,12 +250,12 @@ ScVbaFormat<Ifc1>::setOrientation( const uno::Any& _aOrientation ) throw (script // #FIXME what about the default case above? // shouldn't need the test below if ( aVal.hasValue() ) - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } template< typename Ifc1 > @@ -265,10 +265,10 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R uno::Any NRetOrientation = aNULL(); try { - if (!isAmbiguous(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) + if (!isAmbiguous(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ))) { table::CellOrientation aOrientation = table::CellOrientation_STANDARD; - if ( !( mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) + if ( !( mxPropertySet->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLORI ) ) ) >>= aOrientation ) ) throw uno::RuntimeException(); switch(aOrientation) @@ -292,7 +292,7 @@ ScVbaFormat<Ifc1>::getOrientation( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetOrientation; } @@ -303,11 +303,11 @@ ScVbaFormat<Ifc1>::setWrapText( const uno::Any& _aWrapText ) throw (script::Basi { try { - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ), _aWrapText); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - rtl::OUString aPropName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); + OUString aPropName( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRAP ) ) ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); @@ -326,7 +326,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aWrap; } @@ -364,10 +364,10 @@ template< typename Ifc1 > uno::Any SAL_CALL ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, uno::RuntimeException) { - uno::Any aRet = uno::makeAny( rtl::OUString() ); + uno::Any aRet = uno::makeAny( OUString() ); try { - rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sPropName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous( sPropName )) { @@ -377,15 +377,15 @@ ScVbaFormat<Ifc1>::getNumberFormatLocal( ) throw (script::BasicErrorException, if ( ! (mxPropertySet->getPropertyValue( sPropName ) >>= nFormat ) ) throw uno::RuntimeException(); - rtl::OUString sFormat; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aRet = uno::makeAny( sFormat.toAsciiLowerCase() ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; @@ -397,9 +397,9 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t { try { - rtl::OUString sLocalFormatString; + OUString sLocalFormatString; sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if ( !(_oLocalFormatString >>= sLocalFormatString ) || !( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat ) ) throw uno::RuntimeException(); @@ -407,7 +407,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t sLocalFormatString = sLocalFormatString.toAsciiUpperCase(); initializeNumberFormats(); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); if (nNewFormat == -1) @@ -416,7 +416,7 @@ ScVbaFormat<Ifc1>::setNumberFormatLocal( const uno::Any& _oLocalFormatString ) t } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -426,7 +426,7 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri { try { - rtl::OUString sFormatString; + OUString sFormatString; if ( !( _oFormatString >>= sFormatString ) ) throw uno::RuntimeException(); @@ -440,13 +440,13 @@ ScVbaFormat<Ifc1>::setNumberFormat( const uno::Any& _oFormatString ) throw (scri nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); lang::Locale aRangeLocale; - xNumberFormats->getByKey(nFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; + xNumberFormats->getByKey(nFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( LOCALE ) ) ) >>= aRangeLocale; sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, aRangeLocale); - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ), uno::makeAny( nNewFormat)); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -462,16 +462,16 @@ ScVbaFormat<Ifc1>::setIndentLevel( const uno::Any& _aLevel ) throw (script::Basi throw uno::RuntimeException(); table::CellHoriJustify aAPIAlignment = table::CellHoriJustify_STANDARD; - rtl::OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); + OUString sHoriJust( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHJUS ) ); if ( !( mxPropertySet->getPropertyValue(sHoriJust) >>= aAPIAlignment ) ) throw uno::RuntimeException(); if (aAPIAlignment == table::CellHoriJustify_STANDARD) mxPropertySet->setPropertyValue( sHoriJust, uno::makeAny( table::CellHoriJustify_LEFT) ) ; - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ), uno::makeAny( sal_Int16(nLevel * 352.8) ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -482,7 +482,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R uno::Any NRetIndentLevel = aNULL(); try { - rtl::OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); + OUString sParaIndent( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_PINDENT ) ); if (!isAmbiguous(sParaIndent)) { sal_Int16 IndentLevel = 0; @@ -494,7 +494,7 @@ ScVbaFormat<Ifc1>::getIndentLevel( ) throw (script::BasicErrorException, uno::R } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return NRetIndentLevel; } @@ -509,14 +509,14 @@ ScVbaFormat<Ifc1>::setLocked( const uno::Any& _aLocked ) throw (script::BasicErr if ( !( _aLocked >>= bIsLocked ) ) throw uno::RuntimeException(); util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsLocked = bIsLocked; mxPropertySet->setPropertyValue(sCellProt, uno::makeAny( aCellProtection ) ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -529,14 +529,14 @@ ScVbaFormat<Ifc1>::setFormulaHidden( const uno::Any& FormulaHidden ) throw (scri sal_Bool bIsFormulaHidden = false; FormulaHidden >>= bIsFormulaHidden; util::CellProtection aCellProtection; - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); mxPropertySet->getPropertyValue(sCellProt) >>= aCellProtection; aCellProtection.IsFormulaHidden = bIsFormulaHidden; mxPropertySet->setPropertyValue(sCellProt,uno::makeAny(aCellProtection)); } catch (const uno::Exception& ) { - DebugHelper::exception( SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception( SbERR_METHOD_FAILED, OUString() ); } } @@ -547,7 +547,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim uno::Any aCellProtection = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { @@ -569,7 +569,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aCellProtection; } @@ -581,7 +581,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: uno::Any aBoolRet = aNULL(); try { - rtl::OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); + OUString sCellProt( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLPRO ) ); if (!isAmbiguous(sCellProt)) { SfxItemSet* pDataSet = getCurrentDataSet(); @@ -602,7 +602,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: } catch (const uno::Exception&) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aBoolRet; } @@ -613,11 +613,11 @@ ScVbaFormat<Ifc1>::setShrinkToFit( const uno::Any& ShrinkToFit ) throw (script:: { try { - mxPropertySet->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); + mxPropertySet->setPropertyValue(OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ), ShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString() ); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString() ); } } @@ -629,13 +629,13 @@ ScVbaFormat<Ifc1>::getShrinkToFit( ) throw (script::BasicErrorException, uno::R uno::Any aRet = aNULL(); try { - rtl::OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); + OUString sShrinkToFit( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHRINK_TO_FIT ) ); if (!isAmbiguous(sShrinkToFit)) aRet = mxPropertySet->getPropertyValue(sShrinkToFit); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return aRet; } @@ -659,16 +659,16 @@ ScVbaFormat<Ifc1>::setReadingOrder( const uno::Any& ReadingOrder ) throw (script aVal = uno::makeAny( text::WritingMode_RL_TB ); break; case excel::Constants::xlContext: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } - mxPropertySet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); + mxPropertySet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ), aVal ); } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -680,7 +680,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: uno::Any NRetReadingOrder = aNULL(); try { - rtl::OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); + OUString sWritingMode( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_WRITING ) ); if (!isAmbiguous(sWritingMode)) { text::WritingMode aWritingMode = text::WritingMode_LR_TB; @@ -699,7 +699,7 @@ ScVbaFormat<Ifc1>::getReadingOrder( ) throw (script::BasicErrorException, uno:: } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } return NRetReadingOrder; @@ -713,28 +713,28 @@ ScVbaFormat< Ifc1 >::getNumberFormat( ) throw (script::BasicErrorException, uno try { sal_Int32 nFormat = -1; - rtl::OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); + OUString sNumFormat( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_DP_NUMBERFO ) ); if (!isAmbiguous(sNumFormat) && ( mxPropertySet->getPropertyValue(sNumFormat) >>= nFormat) ) { initializeNumberFormats(); sal_Int32 nNewFormat = xNumberFormatTypes->getFormatForLocale(nFormat, getDefaultLocale() ); - rtl::OUString sFormat; - xNumberFormats->getByKey(nNewFormat)->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; + OUString sFormat; + xNumberFormats->getByKey(nNewFormat)->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( FORMATSTRING ))) >>= sFormat; aFormat = uno::makeAny( sFormat ); } } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aFormat; } template< typename Ifc1 > bool -ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( script::BasicErrorException ) +ScVbaFormat<Ifc1>::isAmbiguous(const OUString& _sPropertyName) throw ( script::BasicErrorException ) { bool bResult = false; try @@ -744,7 +744,7 @@ ScVbaFormat<Ifc1>::isAmbiguous(const rtl::OUString& _sPropertyName) throw ( scri } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return bResult; } @@ -771,21 +771,21 @@ ScVbaFormat<Ifc1>::getXPropertyState() throw ( uno::RuntimeException ) } template< typename Ifc1 > -rtl::OUString +OUString ScVbaFormat<Ifc1>::getServiceImplName() { - return rtl::OUString("ScVbaFormat"); + return OUString("ScVbaFormat"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormat<Ifc1>::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Format" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Format" ); } return aServiceNames; } @@ -803,7 +803,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for XPropertySet" ), uno::Reference< uno::XInterface >() ); return pDataSet; } diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index edd9fc5f663c..b227381a2ba0 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -49,7 +49,7 @@ protected: sal_Bool mbAddIndent; //NumberFormatter oNumberFormatter = null; css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory; - bool isAmbiguous(const rtl::OUString& _sPropertyName) throw ( css::script::BasicErrorException ); + bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException ); void initializeNumberFormats() throw ( css::script::BasicErrorException ); SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); @@ -90,8 +90,8 @@ public: virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 09a1455a3d73..ce4f8969538d 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -28,7 +28,7 @@ lcl_getScVbaFormatConditionsPtr( const uno::Reference< excel::XFormatConditions { ScVbaFormatConditions* pFormatConditions = static_cast< ScVbaFormatConditions* >( xFormatConditions.get() ); if ( !pFormatConditions ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pFormatConditions; } ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntry >& _xSheetConditionalEntry, const uno::Reference< excel::XStyle >& _xStyle, const uno::Reference< excel::XFormatConditions >& _xFormatConditions, const uno::Reference< css::beans::XPropertySet >& _xPropertySet ) throw ( css::uno::RuntimeException ) : ScVbaFormatCondition_BASE( xParent, xContext, uno::Reference< sheet::XSheetCondition >( _xSheetConditionalEntry, css::uno::UNO_QUERY_THROW ) ), moFormatConditions( _xFormatConditions ), mxStyle( _xStyle ), mxParentRangePropertySet( _xPropertySet ) @@ -59,7 +59,7 @@ ScVbaFormatCondition::Modify( ::sal_Int32 _nType, const uno::Any& _aOperator, co } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } @@ -93,7 +93,7 @@ ScVbaFormatCondition::retrieveAPIType(sal_Int32 _nVBAType, const uno::Reference< aAPIType = sheet::ConditionOperator_NONE; break; default: - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return aAPIType; } @@ -140,28 +140,28 @@ ScVbaFormatCondition::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries) ); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } } -rtl::OUString +OUString ScVbaFormatCondition::getServiceImplName() { - return rtl::OUString("ScVbaFormatCondition"); + return OUString("ScVbaFormatCondition"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatCondition::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatCondition" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatCondition" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 63fb310bc40e..ca373fd61c8d 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -32,7 +32,7 @@ typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE class ScVbaFormatCondition : public ScVbaFormatCondition_BASE { protected: - rtl::OUString msStyleName; + OUString msStyleName; css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; @@ -56,8 +56,8 @@ public: virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 8e1989f6b2de..e0bf2411bada 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -31,11 +31,11 @@ using namespace ::com::sun::star; typedef std::vector< beans::PropertyValue > VecPropValues; -static rtl::OUString OPERATOR("Operator"); -static rtl::OUString FORMULA1("Formula1"); -static rtl::OUString FORMULA2("Formula2"); -static rtl::OUString STYLENAME("StyleName"); -static rtl::OUString sStyleNamePrefix("Excel_CondFormat"); +static OUString OPERATOR("Operator"); +static OUString FORMULA1("Formula1"); +static OUString FORMULA2("Formula2"); +static OUString STYLENAME("StyleName"); +static OUString sStyleNamePrefix("Excel_CondFormat"); void SAL_CALL ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) @@ -44,7 +44,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); sal_Int32 nCount = mxSheetConditionalEntries->getCount(); for (sal_Int32 i = nCount - 1; i >= 0; i--) { @@ -56,7 +56,7 @@ ScVbaFormatConditions::Delete( ) throw (script::BasicErrorException, uno::Runti } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -128,7 +128,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons uno::Reference< excel::XFormatCondition > xFormatCondition; try { - rtl::OUString sStyleName; + OUString sStyleName; if ( !xStyle.is() ) { sStyleName = getStyleName(); @@ -186,7 +186,7 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons catch (uno::Exception& ) { } - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return xFormatCondition; } @@ -203,36 +203,36 @@ ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { try { - mxParentRangePropertySet->setPropertyValue( rtl::OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); + mxParentRangePropertySet->setPropertyValue( OUString("ConditionalFormat"), uno::makeAny( mxSheetConditionalEntries )); } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getA1Formula(const css::uno::Any& _aFormula) throw ( script::BasicErrorException ) { // #TODO, #FIXME hook-in proper formula conversion detection & logic - rtl::OUString sFormula; + OUString sFormula; if ( !( _aFormula >>= sFormula ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); return sFormula; } -rtl::OUString +OUString ScVbaFormatConditions::getStyleName() { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); - uno::Sequence< rtl::OUString > sCellStyleNames = pStyles->getStyleNames(); - return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, rtl::OUString("_")); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); + uno::Sequence< OUString > sCellStyleNames = pStyles->getStyleNames(); + return ContainerUtilities::getUniqueName(sCellStyleNames, sStyleNamePrefix, OUString("_")); } void -ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) +ScVbaFormatConditions::removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( script::BasicErrorException ) { try { @@ -247,7 +247,7 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, { ScVbaStyles* pStyles = static_cast< ScVbaStyles* >( mxStyles.get() ); if ( !pStyles ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); pStyles->Delete( _sStyleName ); } return; @@ -256,24 +256,24 @@ ScVbaFormatConditions::removeFormatCondition( const rtl::OUString& _sStyleName, } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaFormatConditions::getServiceImplName() { - return rtl::OUString("ScVbaFormatConditions"); + return OUString("ScVbaFormatConditions"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaFormatConditions::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.FormatConditions" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.FormatConditions" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 303852ac98c8..100916426dce 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -50,9 +50,9 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE public: void notifyRange() throw ( css::script::BasicErrorException ); virtual css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - rtl::OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); - rtl::OUString getStyleName(); - void removeFormatCondition( const rtl::OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); + OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + OUString getStyleName(); + void removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -62,8 +62,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #ifdef _MSC_VER diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 707a5578b605..94d42fcc777f 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -42,14 +42,14 @@ using namespace ::ooo::vba; // ============================================================================= //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) -rtl::OUString sDocCtxName( "ExcelDocumentContext" ); +OUString sDocCtxName( "ExcelDocumentContext" ); ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, sDocCtxName ) { OSL_TRACE("ScVbaGlobals::ScVbaGlobals()"); uno::Sequence< beans::PropertyValue > aInitArgs( 2 ); - aInitArgs[ 0 ].Name = rtl::OUString("Application"); + aInitArgs[ 0 ].Name = OUString("Application"); aInitArgs[ 0 ].Value = uno::makeAny( getApplication() ); aInitArgs[ 1 ].Name = sDocCtxName; aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) ); @@ -93,7 +93,7 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException) return xWorkbook; } // FIXME check if this is correct/desired behavior - throw uno::RuntimeException( rtl::OUString( + throw uno::RuntimeException( OUString( "No activeWorkbook available" ), Reference< uno::XInterface >() ); } @@ -198,7 +198,7 @@ ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, c } uno::Any SAL_CALL -ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaGlobals::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { return getApplication()->Evaluate( Name ); } @@ -230,7 +230,7 @@ ScVbaGlobals::getDebug() throw (uno::RuntimeException) { uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_SET_THROW ); uno::Reference< uno::XInterface > xVBADebug = xServiceManager->createInstanceWithContext( - ::rtl::OUString( "ooo.vba.Debug" ), mxContext ); + OUString( "ooo.vba.Debug" ), mxContext ); return uno::Any( xVBADebug ); } catch( uno::Exception& ) @@ -245,21 +245,21 @@ ScVbaGlobals::MenuBars( const uno::Any& aIndex ) throw (uno::RuntimeException) return uno::Any( getApplication()->MenuBars(aIndex) ); } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) { static bool bInit = false; - static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); + static uno::Sequence< OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() ); if ( !bInit ) { - rtl::OUString names[] = { - ::rtl::OUString( "ooo.vba.excel.Range" ), - ::rtl::OUString( "ooo.vba.excel.Workbook" ), - ::rtl::OUString( "ooo.vba.excel.Window" ), - ::rtl::OUString( "ooo.vba.excel.Worksheet" ), - ::rtl::OUString( "ooo.vba.excel.Application" ), - ::rtl::OUString( "ooo.vba.excel.Hyperlink" ), - ::rtl::OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) + OUString names[] = { + OUString( "ooo.vba.excel.Range" ), + OUString( "ooo.vba.excel.Workbook" ), + OUString( "ooo.vba.excel.Window" ), + OUString( "ooo.vba.excel.Worksheet" ), + OUString( "ooo.vba.excel.Application" ), + OUString( "ooo.vba.excel.Hyperlink" ), + OUString( "com.sun.star.script.vba.VBASpreadsheetEventProcessor" ) }; sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) ); sal_Int32 startIndex = serviceNames.getLength(); @@ -271,20 +271,20 @@ ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException) return serviceNames; } -rtl::OUString +OUString ScVbaGlobals::getServiceImplName() { - return rtl::OUString("ScVbaGlobals"); + return OUString("ScVbaGlobals"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaGlobals::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Globals" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Globals" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 1868dc6f5d81..9980d2aed938 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -62,7 +62,7 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -80,10 +80,10 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc // XMultiServiceFactory - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif // diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 0c1ce0e618da..cd261d3a0704 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -29,8 +29,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; // ============================================================================ diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index 85e29678d234..f69e3147f5b1 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -45,16 +45,16 @@ public: virtual ~ScVbaHyperlink(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setAddress( const ::rtl::OUString& rAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); - virtual void SAL_CALL setSubAddress( const ::rtl::OUString& rSubAddress ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); - virtual void SAL_CALL setScreenTip( const ::rtl::OUString& rScreenTip ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); - virtual void SAL_CALL setTextToDisplay( const ::rtl::OUString& rTextToDisplay ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException); + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException); + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException); + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException); @@ -63,7 +63,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE private: - typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > UrlComponents; + typedef ::std::pair< OUString, OUString > UrlComponents; void ensureTextField() throw (css::uno::RuntimeException); UrlComponents getUrlComponents() throw (css::uno::RuntimeException); @@ -72,7 +72,7 @@ private: private: css::uno::Reference< css::table::XCell > mxCell; css::uno::Reference< css::beans::XPropertySet > mxTextField; - ::rtl::OUString maScreenTip; + OUString maScreenTip; long mnType; }; diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 8711ba0a1168..8004e3c9eb6a 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -27,7 +27,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -using ::rtl::OUString; // ============================================================================ @@ -38,7 +37,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan { const ScRangeList& rScInner = ScVbaRange::getScRangeList( rxInner ); if( rScInner.empty() || rScOuter.empty() ) - throw uno::RuntimeException( ::rtl::OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Empty range objects" ), uno::Reference< uno::XInterface >() ); for( size_t nIndex = 0, nCount = rScInner.size(); nIndex < nCount; ++nIndex ) if( !rScOuter.In( *rScInner[ nIndex ] ) ) diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 69b80b13d840..3782a100b7ee 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -48,9 +48,9 @@ typedef std::pair< sal_Int32, sal_Int32 > PatternPair; using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -static const rtl::OUString BACKCOLOR( "CellBackColor" ); -static const rtl::OUString PATTERN( "Pattern" ); -static const rtl::OUString PATTERNCOLOR( "PatternColor" ); +static const OUString BACKCOLOR( "CellBackColor" ); +static const OUString PATTERN( "Pattern" ); +static const OUString PATTERNCOLOR( "PatternColor" ); static PatternMap lcl_getPatternMap() { @@ -86,7 +86,7 @@ ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, m_aPattColor.SetColor( (sal_uInt32)0x0 ); m_nPattern = 0L; if ( !m_xProps.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); + throw lang::IllegalArgumentException( OUString( "properties"), uno::Reference< uno::XInterface >(), 2 ); } uno::Any @@ -250,7 +250,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n uno::Reference< container::XNameContainer > ScVbaInterior::GetAttributeContainer() { - return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); + return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( OUString( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW ); } sal_Int32 ScVbaInterior::GetAttributeData( uno::Any aValue ) @@ -266,12 +266,12 @@ uno::Any ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; - aAttributeData.Type = rtl::OUString( "sal_Int32" ); - aAttributeData.Value = rtl::OUString::valueOf( nValue ); + aAttributeData.Type = OUString( "sal_Int32" ); + aAttributeData.Value = OUString::valueOf( nValue ); return uno::makeAny( aAttributeData ); } uno::Any -ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) +ScVbaInterior::GetUserDefinedAttributes( const OUString& sName ) { uno::Reference< container::XNameContainer > xNameContainer( GetAttributeContainer(), uno::UNO_QUERY_THROW ); if( xNameContainer->hasByName( sName ) ) @@ -281,7 +281,7 @@ ScVbaInterior::GetUserDefinedAttributes( const rtl::OUString& sName ) return uno::Any(); } void -ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::Any& aValue ) +ScVbaInterior::SetUserDefinedAttributes( const OUString& sName, const uno::Any& aValue ) { if( aValue.hasValue() ) { @@ -289,7 +289,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno:: if( xNameContainer->hasByName( sName ) ) xNameContainer->removeByName( sName ); xNameContainer->insertByName( sName, aValue ); - m_xProps->setPropertyValue( rtl::OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); + m_xProps->setPropertyValue( OUString( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) ); } } // OOo do not support below API @@ -311,7 +311,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() ); } Color ScVbaInterior::GetBackColor() @@ -359,7 +359,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt SetMixedColor(); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException) @@ -382,23 +382,23 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) ); } else - throw uno::RuntimeException( rtl::OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() ); } -rtl::OUString +OUString ScVbaInterior::getServiceImplName() { - return rtl::OUString("ScVbaInterior"); + return OUString("ScVbaInterior"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaInterior::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Interior" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Interior" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index f5cc5b9fb439..93cbd4fc20d2 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -52,8 +52,8 @@ protected: sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const; css::uno::Any GetIndexColor( const sal_Int32& nColorIndex ); sal_Int32 GetColorIndex( const sal_Int32 nColor ); - css::uno::Any GetUserDefinedAttributes( const rtl::OUString& sName ); - void SetUserDefinedAttributes( const rtl::OUString& sName, const css::uno::Any& aValue ); + css::uno::Any GetUserDefinedAttributes( const OUString& sName ); + void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue ); void SetMixedColor(); public: ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -73,8 +73,8 @@ public: virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException); virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException); //XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbamenu.cxx b/sc/source/ui/vba/vbamenu.cxx index dedb0398d6bb..45dd42c69336 100644 --- a/sc/source/ui/vba/vbamenu.cxx +++ b/sc/source/ui/vba/vbamenu.cxx @@ -36,14 +36,14 @@ ScVbaMenu::ScVbaMenu( const uno::Reference< ov::XHelperInterface > xParent, cons { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenu::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenu::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenu::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } @@ -66,20 +66,20 @@ ScVbaMenu::MenuItems( const uno::Any& aIndex ) throw (script::BasicErrorExceptio return uno::makeAny( xMenuItems ); } -rtl::OUString +OUString ScVbaMenu::getServiceImplName() { - return rtl::OUString("ScVbaMenu"); + return OUString("ScVbaMenu"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenu::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menu" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menu" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 392053929a29..a6946318457b 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -42,15 +42,15 @@ private: public: ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.cxx b/sc/source/ui/vba/vbamenubar.cxx index 91997c0b1b20..c46c753cbb0e 100644 --- a/sc/source/ui/vba/vbamenubar.cxx +++ b/sc/source/ui/vba/vbamenubar.cxx @@ -48,20 +48,20 @@ ScVbaMenuBar::Menus( const uno::Any& aIndex ) throw (script::BasicErrorException return uno::makeAny( xMenus ); } -rtl::OUString +OUString ScVbaMenuBar::getServiceImplName() { - return rtl::OUString("ScVbaMenuBar"); + return OUString("ScVbaMenuBar"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuBar::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBar" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBar" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index f48956ca1941..c3a81063f6e7 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -45,8 +45,8 @@ public: virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index eb7aead78349..3574b24e112f 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -106,30 +106,30 @@ ScVbaMenuBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw if( nIndex == excel::XlSheetType::xlWorksheet ) { uno::Any aSource; - aSource <<= rtl::OUString( "Worksheet Menu Bar" ); + aSource <<= OUString( "Worksheet Menu Bar" ); uno::Reference< XCommandBar > xCommandBar( m_xCommandBars->Item( aSource, uno::Any() ), uno::UNO_QUERY_THROW ); uno::Reference< excel::XMenuBar > xMenuBar( new ScVbaMenuBar( this, mxContext, xCommandBar ) ); return uno::makeAny( xMenuBar ); } - throw uno::RuntimeException( rtl::OUString("Not implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Not implemented"), uno::Reference< uno::XInterface >() ); } // XHelperInterface -rtl::OUString +OUString ScVbaMenuBars::getServiceImplName() { - return rtl::OUString("ScVbaMenuBars"); + return OUString("ScVbaMenuBars"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuBars::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuBars" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuBars" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index cc52aa699b44..d6ed15c120d7 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -55,8 +55,8 @@ public: virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUBARS_HXX diff --git a/sc/source/ui/vba/vbamenuitem.cxx b/sc/source/ui/vba/vbamenuitem.cxx index 881ef72fa9cc..12acfbb8a6df 100644 --- a/sc/source/ui/vba/vbamenuitem.cxx +++ b/sc/source/ui/vba/vbamenuitem.cxx @@ -34,26 +34,26 @@ ScVbaMenuItem::ScVbaMenuItem( const uno::Reference< ov::XHelperInterface > xPare { } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getCaption() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getCaption(); } void SAL_CALL -ScVbaMenuItem::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) +ScVbaMenuItem::setCaption( const OUString& _caption ) throw (uno::RuntimeException) { m_xCommandBarControl->setCaption( _caption ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaMenuItem::getOnAction() throw ( uno::RuntimeException ) { return m_xCommandBarControl->getOnAction(); } void SAL_CALL -ScVbaMenuItem::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException) +ScVbaMenuItem::setOnAction( const OUString& _onaction ) throw (uno::RuntimeException) { m_xCommandBarControl->setOnAction( _onaction ); } @@ -64,20 +64,20 @@ ScVbaMenuItem::Delete( ) throw (script::BasicErrorException, uno::RuntimeExcepti m_xCommandBarControl->Delete(); } -rtl::OUString +OUString ScVbaMenuItem::getServiceImplName() { - return rtl::OUString("ScVbaMenuItem"); + return OUString("ScVbaMenuItem"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuItem::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItem" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItem" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 4ab24307118f..c74b1f21b714 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -42,16 +42,16 @@ private: public: ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 90e70b127c18..300e5e012db8 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -117,14 +117,14 @@ ScVbaMenuItems::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) thro throw uno::RuntimeException(); } -uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& /*ShortcutKey*/, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& /*StatusBar*/, const css::uno::Any& /*HelpFile*/, const css::uno::Any& /*HelpContextID*/ ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlButton; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); xCommandBarControl->setCaption( Caption ); if( OnAction.hasValue() ) { - rtl::OUString sAction; + OUString sAction; OnAction >>= sAction; xCommandBarControl->setOnAction( sAction ); } @@ -132,20 +132,20 @@ uno::Reference< excel::XMenuItem > SAL_CALL ScVbaMenuItems::Add( const rtl::OUSt } // XHelperInterface -rtl::OUString +OUString ScVbaMenuItems::getServiceImplName() { - return rtl::OUString("ScVbaMenuItems"); + return OUString("ScVbaMenuItems"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenuItems::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.MenuItems" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.MenuItems" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 49410804b388..0c6604818fd3 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUITEMS_HXX diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index f1ab8e120485..27d06e99f5a5 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -109,7 +109,7 @@ ScVbaMenus::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( u return uno::makeAny( uno::Reference< excel::XMenu > ( new ScVbaMenu( this, mxContext, xCommandBarControl ) ) ); } -uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) +uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { sal_Int32 nType = office::MsoControlType::msoControlPopup; uno::Reference< XCommandBarControl > xCommandBarControl = m_xCommandBarControls->Add( uno::makeAny( nType ), uno::Any(), uno::Any(), Before, Restore ); @@ -118,20 +118,20 @@ uno::Reference< excel::XMenu > SAL_CALL ScVbaMenus::Add( const rtl::OUString& Ca } // XHelperInterface -rtl::OUString +OUString ScVbaMenus::getServiceImplName() { - return rtl::OUString("ScVbaMenus"); + return OUString("ScVbaMenus"); } -uno::Sequence<rtl::OUString> +uno::Sequence<OUString> ScVbaMenus::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Menus" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Menus" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index 49180037b375..1d8b3c6685c3 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -52,10 +52,10 @@ public: // Methods virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const rtl::OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif//SC_VBA_MENUS_HXX diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 801d14f42e9e..971c91fb7d7d 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaName(); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValue() throw (css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString &rValue ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersTo( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToLocal( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRefersToR1C1Local( const ::rtl::OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException); virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); @@ -67,8 +67,8 @@ public: virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_NAME_HXX */ diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index a274a0fa1e06..8ee94165a6cb 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -66,8 +66,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // ScVbaNames_BASE - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_NAMES_HXX */ diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx index 456629f6b8c1..0210fe1b0c70 100644 --- a/sc/source/ui/vba/vbaoleobject.cxx +++ b/sc/source/ui/vba/vbaoleobject.cxx @@ -43,7 +43,7 @@ ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParen xChild.set( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<frame::XModel> xModel( xChild->getParent(), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); m_xControl.set( xControlProvider->createControl( xControlShape, xModel ) ); } @@ -68,14 +68,14 @@ ScVbaOLEObject::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) sal_Bool SAL_CALL ScVbaOLEObject::getVisible() throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s returning visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); + OSL_TRACE("OleObject %s returning visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), m_xControl->getVisible() ? "true" : "false" ); return m_xControl->getVisible(); } void SAL_CALL ScVbaOLEObject::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { - OSL_TRACE("OleObject %s set visible %s", rtl::OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); + OSL_TRACE("OleObject %s set visible %s", OUStringToOString( m_xControl->getName(), RTL_TEXTENCODING_UTF8 ).getStr(), _visible ? "true" : "false" ); m_xControl->setVisible( _visible ); } @@ -128,30 +128,30 @@ ScVbaOLEObject::setWidth( double _width ) throw (uno::RuntimeException) m_xControl->setWidth( _width ); } -rtl::OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) +OUString SAL_CALL ScVbaOLEObject::getLinkedCell() throw (uno::RuntimeException) { return m_xControl->getControlSource(); } -void SAL_CALL ScVbaOLEObject::setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (uno::RuntimeException) +void SAL_CALL ScVbaOLEObject::setLinkedCell( const OUString& _linkedcell ) throw (uno::RuntimeException) { m_xControl->setControlSource( _linkedcell ); } -rtl::OUString +OUString ScVbaOLEObject::getServiceImplName() { - return rtl::OUString("ScVbaOLEObject"); + return OUString("ScVbaOLEObject"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObject::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObject" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObject" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index 40596383caf2..0f99da573587 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -32,8 +32,8 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); css::uno::Reference< ov::msforms::XControl> m_xControl; public: ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, @@ -54,8 +54,8 @@ public: virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException); virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException); virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLinkedCell( const ::rtl::OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException); }; #endif //SC_VBA_OLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 7b1c44fd94ad..968db0b1cc61 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -126,7 +126,7 @@ ScVbaOLEObjects::createCollectionObject( const css::uno::Any& aSource ) } uno::Any -ScVbaOLEObjects::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaOLEObjects::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { try { @@ -158,20 +158,20 @@ ScVbaOLEObjects::getElementType() throw (uno::RuntimeException) return ooo::vba::excel::XOLEObject::static_type(0); } -rtl::OUString +OUString ScVbaOLEObjects::getServiceImplName() { - return rtl::OUString("ScVbaOLEObjects"); + return OUString("ScVbaOLEObjects"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOLEObjects::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.OLEObjects" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.OLEObjects" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index 2583aa01202e..074c572c4155 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -30,9 +30,9 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); public: ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); diff --git a/sc/source/ui/vba/vbaoutline.cxx b/sc/source/ui/vba/vbaoutline.cxx index 29cbd0e09434..67ea4a6b9a94 100644 --- a/sc/source/ui/vba/vbaoutline.cxx +++ b/sc/source/ui/vba/vbaoutline.cxx @@ -37,20 +37,20 @@ ScVbaOutline::ShowLevels( const uno::Any& RowLevels, const uno::Any& ColumnLevel } } -rtl::OUString +OUString ScVbaOutline::getServiceImplName() { - return rtl::OUString("ScVbaOutline"); + return OUString("ScVbaOutline"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaOutline::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Outline" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Outline" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 48c9a609fbd7..a81aeb937297 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -38,8 +38,8 @@ public: virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException) ; // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 611c568243e6..780ed0e5467a 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -36,7 +36,7 @@ ScVbaPageBreak<Ifc1>::ScVbaPageBreak( const uno::Reference< XHelperInterface >& template< typename Ifc1 > sal_Int32 ScVbaPageBreak<Ifc1>::getType() throw (uno::RuntimeException) { - uno::Any aValue = mxRowColPropertySet->getPropertyValue( rtl::OUString( "IsStartOfNewPage" )); + uno::Any aValue = mxRowColPropertySet->getPropertyValue( OUString( "IsStartOfNewPage" )); sal_Bool hasPageBreak = false; aValue >>= hasPageBreak; @@ -56,16 +56,16 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) (type != excel::XlPageBreak::xlPageBreakManual) && (type != excel::XlPageBreak::xlPageBreakAutomatic) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); return; } - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); if( type == excel::XlPageBreak::xlPageBreakManual ) maTablePageBreakData.ManualBreak = sal_True; else @@ -75,7 +75,7 @@ void ScVbaPageBreak<Ifc1>::setType(sal_Int32 type) throw (uno::RuntimeException) template< typename Ifc1 > void ScVbaPageBreak<Ifc1>::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_False)); } template< typename Ifc1 > @@ -86,21 +86,21 @@ uno::Reference< excel::XRange> ScVbaPageBreak<Ifc1>::Location() throw ( script:: } template< typename Ifc1 > -rtl::OUString +OUString ScVbaPageBreak<Ifc1>::getServiceImplName() { - return rtl::OUString("ScVbaPageBreak"); + return OUString("ScVbaPageBreak"); } template< typename Ifc1 > -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageBreak<Ifc1>::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PageBreak" ); } return aServiceNames; } @@ -108,20 +108,20 @@ ScVbaPageBreak<Ifc1>::getServiceNames() template class ScVbaPageBreak< excel::XHPageBreak >; /* class ScVbaHPageBreak */ -rtl::OUString +OUString ScVbaHPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreak"); + return OUString("ScVbaHPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreak" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreak" ); } return aServiceNames; } @@ -141,20 +141,20 @@ ScVbaVPageBreak::~ScVbaVPageBreak() { } -rtl::OUString +OUString ScVbaVPageBreak::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreak"); + return OUString("ScVbaVPageBreak"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreak::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreak" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreak" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index 4256c61cf317..aa33b2191469 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -51,8 +51,8 @@ public: virtual css::uno::Reference< ov::excel::XRange> SAL_CALL Location() throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; @@ -70,8 +70,8 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; //VPageBreak @@ -88,8 +88,8 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 8c6806e1992a..d7ac4a05c336 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -152,7 +152,7 @@ sheet::TablePageBreakData RangePageBreaks::getTablePageBreakData( sal_Int32 nAPI if( nPos >= nUsedStart ) index++; if( nPos > nUsedEnd ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); if( index == nAPIItemIndex ) return aTablePageBreakData; } @@ -166,13 +166,13 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script Before >>= xRange; if( !xRange.is() ) { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue( rtl::OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue( OUString( "IsStartOfNewPage" ), uno::makeAny(sal_True)); sheet::TablePageBreakData aTablePageBreakData; aTablePageBreakData.ManualBreak = sal_True; aTablePageBreakData.Position = nAPIRowColIndex; @@ -237,20 +237,20 @@ ScVbaHPageBreaks::getElementType() throw (uno::RuntimeException) return excel::XHPageBreak::static_type(0); } -rtl::OUString +OUString ScVbaHPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaHPageBreaks"); + return OUString("ScVbaHPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaHPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.HPageBreaks" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.HPageBreaks" ); } return aServiceNames; } @@ -297,20 +297,20 @@ ScVbaVPageBreaks::getElementType() throw ( uno::RuntimeException ) return excel::XVPageBreak::static_type( 0 ); } -rtl::OUString +OUString ScVbaVPageBreaks::getServiceImplName() { - return rtl::OUString("ScVbaVPageBreaks"); + return OUString("ScVbaVPageBreaks"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaVPageBreaks::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.VPageBreaks" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.VPageBreaks" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 3e28da557fa3..9fec6397056c 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -55,8 +55,8 @@ public: virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; //VPageBreaks @@ -82,8 +82,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapagesetup.cxx b/sc/source/ui/vba/vbapagesetup.cxx index 4df0b92eb4bc..91a23d0fbc2c 100644 --- a/sc/source/ui/vba/vbapagesetup.cxx +++ b/sc/source/ui/vba/vbapagesetup.cxx @@ -38,7 +38,7 @@ using namespace ::ooo::vba; #define ZOOM_IN 10 #define ZOOM_MAX 400 -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ); ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, @@ -49,19 +49,19 @@ ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent // query for current page style mxModel.set( xModel, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xSheetProps( mxSheet, uno::UNO_QUERY_THROW ); - uno::Any aValue = xSheetProps->getPropertyValue( rtl::OUString( "PageStyle" )); - rtl::OUString aStyleName; + uno::Any aValue = xSheetProps->getPropertyValue( OUString( "PageStyle" )); + OUString aStyleName; aValue >>= aStyleName; uno::Reference< style::XStyleFamiliesSupplier > xStyleFamiliesSup( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xStyleFamilies = xStyleFamiliesSup->getStyleFamilies(); - uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(rtl::OUString( "PageStyles")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xPageStyle( xStyleFamilies->getByName(OUString( "PageStyles")), uno::UNO_QUERY_THROW ); mxPageProps.set( xPageStyle->getByName(aStyleName), uno::UNO_QUERY_THROW ); mnOrientLandscape = excel::XlPageOrientation::xlLandscape; mnOrientPortrait = excel::XlPageOrientation::xlPortrait; } -rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeException) { String aPrintArea; uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); @@ -86,11 +86,11 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getPrintArea() throw (css::uno::RuntimeEx return aPrintArea; } -void SAL_CALL ScVbaPageSetup::setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException) { uno::Reference< sheet::XPrintAreas > xPrintAreas( mxSheet, uno::UNO_QUERY_THROW ); if( rAreas.isEmpty() || - rAreas.equalsIgnoreAsciiCase ( rtl::OUString("FALSE") ) ) + rAreas.equalsIgnoreAsciiCase ( OUString("FALSE") ) ) { // print the whole sheet uno::Sequence< table::CellRangeAddress > aSeq; @@ -137,7 +137,7 @@ void SAL_CALL ScVbaPageSetup::setFooterMargin( double margin ) throw (css::uno:: uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesTall() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesY")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesY")); } void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) throw (css::uno::RuntimeException) @@ -151,7 +151,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) fitToPagesTall >>= scaleToPageY; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( scaleToPageY )); } catch( uno::Exception& ) { @@ -160,7 +160,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesTall( const uno::Any& fitToPagesTall) uno::Any SAL_CALL ScVbaPageSetup::getFitToPagesWide() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "ScaleToPagesX")); + return mxPageProps->getPropertyValue( OUString( "ScaleToPagesX")); } void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) throw (css::uno::RuntimeException) @@ -174,7 +174,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) fitToPagesWide >>= scaleToPageX; } - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( scaleToPageX )); } catch( uno::Exception& ) { @@ -183,7 +183,7 @@ void SAL_CALL ScVbaPageSetup::setFitToPagesWide( const uno::Any& fitToPagesWide) uno::Any SAL_CALL ScVbaPageSetup::getZoom() throw (css::uno::RuntimeException) { - return mxPageProps->getPropertyValue( rtl::OUString( "PageScale")); + return mxPageProps->getPropertyValue( OUString( "PageScale")); } void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::RuntimeException) @@ -197,7 +197,7 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= aValue; if( aValue ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } else @@ -205,36 +205,36 @@ void SAL_CALL ScVbaPageSetup::setZoom( const uno::Any& zoom) throw (css::uno::Ru zoom >>= pageScale; if(( pageScale < ZOOM_IN )||( pageScale > ZOOM_MAX )) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } // these only exist in S08 sal_uInt16 nScale = 0; - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPages"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesX"), uno::makeAny( nScale )); - mxPageProps->setPropertyValue( rtl::OUString( "ScaleToPagesY"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPages"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesX"), uno::makeAny( nScale )); + mxPageProps->setPropertyValue( OUString( "ScaleToPagesY"), uno::makeAny( nScale )); } catch( beans::UnknownPropertyException& ) { if( pageScale == 0 ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } } catch( uno::Exception& ) { } - mxPageProps->setPropertyValue( rtl::OUString( "PageScale"), uno::makeAny( pageScale )); + mxPageProps->setPropertyValue( OUString( "PageScale"), uno::makeAny( pageScale )); } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeException) { - rtl::OUString leftHeader; + OUString leftHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); @@ -248,16 +248,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftHeader() throw (css::uno::RuntimeE return leftHeader; } -void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftHeader( const OUString& leftHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getLeftText(); xText->setString( leftHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -265,12 +265,12 @@ void SAL_CALL ScVbaPageSetup::setLeftHeader( const rtl::OUString& leftHeader) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::RuntimeException) { - rtl::OUString centerHeader; + OUString centerHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); @@ -284,16 +284,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterHeader() throw (css::uno::Runtim return centerHeader; } -void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterHeader( const OUString& centerHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getCenterText(); xText->setString( centerHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -301,12 +301,12 @@ void SAL_CALL ScVbaPageSetup::setCenterHeader( const rtl::OUString& centerHeader } } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::RuntimeException) { - rtl::OUString rightHeader; + OUString rightHeader; try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); @@ -320,16 +320,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightHeader() throw (css::uno::Runtime return rightHeader; } -void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightHeader( const OUString& rightHeader) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xHeaderContent( mxPageProps->getPropertyValue( OUString( "RightPageHeaderContent")), uno::UNO_QUERY_THROW); if( xHeaderContent.is() ) { uno::Reference< text::XText > xText = xHeaderContent->getRightText(); xText->setString( rightHeader ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageHeaderContent"), uno::makeAny(xHeaderContent) ); } } catch( uno::Exception& ) @@ -337,12 +337,12 @@ void SAL_CALL ScVbaPageSetup::setRightHeader( const rtl::OUString& rightHeader) } } -rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeException) { - rtl::OUString leftFooter; + OUString leftFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); @@ -356,16 +356,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getLeftFooter() throw (css::uno::RuntimeE return leftFooter; } -void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setLeftFooter( const OUString& leftFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getLeftText(); xText->setString( leftFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -373,12 +373,12 @@ void SAL_CALL ScVbaPageSetup::setLeftFooter( const rtl::OUString& leftFooter) th } } -rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::RuntimeException) { - rtl::OUString centerFooter; + OUString centerFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); @@ -392,16 +392,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getCenterFooter() throw (css::uno::Runtim return centerFooter; } -void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setCenterFooter( const OUString& centerFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getCenterText(); xText->setString( centerFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -410,12 +410,12 @@ void SAL_CALL ScVbaPageSetup::setCenterFooter( const rtl::OUString& centerFooter } -rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) +OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::RuntimeException) { - rtl::OUString rightFooter; + OUString rightFooter; try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); @@ -429,16 +429,16 @@ rtl::OUString SAL_CALL ScVbaPageSetup::getRightFooter() throw (css::uno::Runtime return rightFooter; } -void SAL_CALL ScVbaPageSetup::setRightFooter( const rtl::OUString& rightFooter) throw (css::uno::RuntimeException) +void SAL_CALL ScVbaPageSetup::setRightFooter( const OUString& rightFooter) throw (css::uno::RuntimeException) { try { - uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( rtl::OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); + uno::Reference<sheet::XHeaderFooterContent> xFooterContent( mxPageProps->getPropertyValue( OUString( "RightPageFooterContent")), uno::UNO_QUERY_THROW); if( xFooterContent.is() ) { uno::Reference< text::XText > xText = xFooterContent->getRightText(); xText->setString( rightFooter ); - mxPageProps->setPropertyValue( rtl::OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); + mxPageProps->setPropertyValue( OUString( "RightPageFooterContent"), uno::makeAny(xFooterContent) ); } } catch( uno::Exception& ) @@ -451,7 +451,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getOrder() throw (css::uno::RuntimeException) sal_Int32 order = excel::XlOrder::xlDownThenOver; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintDownFirst")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintDownFirst")); sal_Bool bPrintDownFirst = false; aValue >>= bPrintDownFirst; if( !bPrintDownFirst ) @@ -475,12 +475,12 @@ void SAL_CALL ScVbaPageSetup::setOrder( sal_Int32 order) throw (css::uno::Runtim bOrder = false; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintDownFirst"), uno::makeAny( bOrder )); + mxPageProps->setPropertyValue( OUString( "PrintDownFirst"), uno::makeAny( bOrder )); } catch( uno::Exception& ) { @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime sal_Int16 number = 0; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "FirstPageNumber")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "FirstPageNumber")); aValue >>= number; } catch( uno::Exception& ) @@ -510,7 +510,7 @@ sal_Int32 SAL_CALL ScVbaPageSetup::getFirstPageNumber() throw (css::uno::Runtime void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) throw (css::uno::RuntimeException) { if( firstPageNumber < 0 ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); if( firstPageNumber == excel::Constants::xlAutomatic ) firstPageNumber = 0; @@ -518,7 +518,7 @@ void SAL_CALL ScVbaPageSetup::setFirstPageNumber( sal_Int32 firstPageNumber) thr { uno::Any aValue; aValue <<= (sal_Int16)firstPageNumber; - mxPageProps->setPropertyValue( rtl::OUString( "FirstPageNumber"), aValue ); + mxPageProps->setPropertyValue( OUString( "FirstPageNumber"), aValue ); } catch( uno::Exception& ) { @@ -530,7 +530,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterVertically() throw (css::uno::Runtime sal_Bool centerVertically = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterVertically")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterVertically")); aValue >>= centerVertically; } catch( uno::Exception& ) @@ -543,7 +543,7 @@ void SAL_CALL ScVbaPageSetup::setCenterVertically( sal_Bool centerVertically) th { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterVertically"), uno::makeAny( centerVertically )); + mxPageProps->setPropertyValue( OUString( "CenterVertically"), uno::makeAny( centerVertically )); } catch( uno::Exception& ) { @@ -555,7 +555,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getCenterHorizontally() throw (css::uno::Runti sal_Bool centerHorizontally = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "CenterHorizontally")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "CenterHorizontally")); aValue >>= centerHorizontally; } catch( uno::Exception& ) @@ -568,7 +568,7 @@ void SAL_CALL ScVbaPageSetup::setCenterHorizontally( sal_Bool centerHorizontally { try { - mxPageProps->setPropertyValue( rtl::OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); + mxPageProps->setPropertyValue( OUString( "CenterHorizontally"), uno::makeAny( centerHorizontally )); } catch( uno::Exception& ) { @@ -580,7 +580,7 @@ sal_Bool SAL_CALL ScVbaPageSetup::getPrintHeadings() throw (css::uno::RuntimeExc sal_Bool printHeadings = false; try { - uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( "PrintHeaders")); + uno::Any aValue = mxPageProps->getPropertyValue( OUString( "PrintHeaders")); aValue >>= printHeadings; } catch( uno::Exception& ) @@ -593,27 +593,27 @@ void SAL_CALL ScVbaPageSetup::setPrintHeadings( sal_Bool printHeadings) throw (c { try { - mxPageProps->setPropertyValue( rtl::OUString( "PrintHeaders"), uno::makeAny( printHeadings )); + mxPageProps->setPropertyValue( OUString( "PrintHeaders"), uno::makeAny( printHeadings )); } catch( uno::Exception& ) { } } -rtl::OUString +OUString ScVbaPageSetup::getServiceImplName() { - return rtl::OUString("ScVbaPageSetup"); + return OUString("ScVbaPageSetup"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPageSetup::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.PageSetup" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.PageSetup" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 38ca4613a6a0..ffa33b5addd1 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -40,8 +40,8 @@ public: virtual ~ScVbaPageSetup(){} // Attribute - virtual rtl::OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPrintArea( const rtl::OUString& rAreas ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException); + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException); void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException); double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException); @@ -52,18 +52,18 @@ public: virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException); virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftHeader( const rtl::OUString& leftHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterHeader( const rtl::OUString& centerHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightHeader( const rtl::OUString& rightHeader ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setLeftFooter( const rtl::OUString& leftFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCenterFooter( const rtl::OUString& centerFooter ) throw (css::uno::RuntimeException); - virtual rtl::OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); - virtual void SAL_CALL setRightFooter( const rtl::OUString& rightFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException); + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException); virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException); @@ -76,8 +76,8 @@ public: virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index fc43d9e9300c..b9fa93374473 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -97,8 +97,8 @@ ScVbaPalette::getPalette() const if ( m_pShell ) xProps.set( m_pShell->GetModel(), uno::UNO_QUERY_THROW ); else - throw uno::RuntimeException( rtl::OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); - xIndex.set( xProps->getPropertyValue( rtl::OUString("ColorPalette") ), uno::UNO_QUERY ); + throw uno::RuntimeException( OUString( "Can't extract palette, no doc shell" ), uno::Reference< uno::XInterface >() ); + xIndex.set( xProps->getPropertyValue( OUString("ColorPalette") ), uno::UNO_QUERY ); if ( !xIndex.is() ) return new DefaultPalette(); return xIndex; diff --git a/sc/source/ui/vba/vbapane.cxx b/sc/source/ui/vba/vbapane.cxx index 3a8bcd856d5a..01734f6649ec 100644 --- a/sc/source/ui/vba/vbapane.cxx +++ b/sc/source/ui/vba/vbapane.cxx @@ -48,7 +48,7 @@ ScVbaPane::setScrollColumn( sal_Int32 _scrollcolumn ) throw (uno::RuntimeExcepti { if( _scrollcolumn < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Column number should not less than 1" ), + throw uno::RuntimeException( OUString( "Column number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleColumn( _scrollcolumn - 1 ); @@ -65,7 +65,7 @@ ScVbaPane::setScrollRow( sal_Int32 _scrollrow ) throw (uno::RuntimeException) { if( _scrollrow < 1 ) { - throw uno::RuntimeException( rtl::OUString( "Row number should not less than 1" ), + throw uno::RuntimeException( OUString( "Row number should not less than 1" ), uno::Reference< uno::XInterface >() ); } m_xViewPane->setFirstVisibleRow( _scrollrow - 1 ); @@ -88,7 +88,7 @@ ScVbaPane::getVisibleRange() throw (uno::RuntimeException) void SAL_CALL ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; sal_Int32 downRows = 0; sal_Int32 rightCols = 0; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); @@ -99,7 +99,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downRows += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -107,7 +107,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downRows -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -115,7 +115,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) rightCols += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -123,7 +123,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) rightCols -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); @@ -141,7 +141,7 @@ ScVbaPane::SmallScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any void SAL_CALL ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any& ToRight, const uno::Any& ToLeft ) throw (uno::RuntimeException) { - rtl::OUString messageBuffer; + OUString messageBuffer; table::CellRangeAddress visibleRange = m_xViewPane->getVisibleRange(); sal_Int32 vertPageSize = 1 + visibleRange.EndRow - visibleRange.StartRow; @@ -154,7 +154,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Down >>= down ) downPages += down; else - messageBuffer += rtl::OUString( "Error getting parameter: Down\n" ); + messageBuffer += OUString( "Error getting parameter: Down\n" ); } if( Up.hasValue() ) { @@ -162,7 +162,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( Up >>= up ) downPages -= up; else - messageBuffer += rtl::OUString( "Error getting parameter: Up\n" ); + messageBuffer += OUString( "Error getting parameter: Up\n" ); } if( ToRight.hasValue() ) { @@ -170,7 +170,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToRight >>= right ) acrossPages += right; else - messageBuffer += rtl::OUString( "Error getting parameter: ToRight\n" ); + messageBuffer += OUString( "Error getting parameter: ToRight\n" ); } if( ToLeft.hasValue() ) { @@ -178,7 +178,7 @@ ScVbaPane::LargeScroll( const uno::Any& Down, const uno::Any& Up, const uno::Any if( ToLeft >>= left ) acrossPages -= left; else - messageBuffer += rtl::OUString( "Error getting parameter: ToLeft\n" ); + messageBuffer += OUString( "Error getting parameter: ToLeft\n" ); } if( !messageBuffer.isEmpty() ) throw(uno::RuntimeException( messageBuffer, uno::Reference< uno::XInterface >() ) ); diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index a37473e10349..d03f2ebdef02 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -32,20 +32,20 @@ ScVbaPivotCache::Refresh() throw (css::uno::RuntimeException) m_xTable->refresh(); } -rtl::OUString +OUString ScVbaPivotCache::getServiceImplName() { - return rtl::OUString("ScVbaPivotCache"); + return OUString("ScVbaPivotCache"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotCache::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotCache" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotCache" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 6c0653891fd8..66b29c36cb3e 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -35,8 +35,8 @@ public: virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_PIVOTCACHE_HXX diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 97ce5e200ad5..14343b34b795 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -35,20 +35,20 @@ ScVbaPivotTable::PivotCache() throw (uno::RuntimeException) return new ScVbaPivotCache( uno::Reference< XHelperInterface >(), mxContext, m_xTable ); } -rtl::OUString +OUString ScVbaPivotTable::getServiceImplName() { - return rtl::OUString("ScVbaPivotTable"); + return OUString("ScVbaPivotTable"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaPivotTable::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.PivotTable" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.PivotTable" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 26bbcdc8b18c..d58ba7a7eb07 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -34,8 +34,8 @@ public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_PIVOTTABLE_HXX diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index ffa5e173c385..e013c1a8ad3b 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -66,20 +66,20 @@ ScVbaPivotTables::getElementType() throw (uno::RuntimeException) return excel::XPivotTable::static_type(0); } -rtl::OUString +OUString ScVbaPivotTables::getServiceImplName() { - return rtl::OUString("ScVbaPivotTables"); + return OUString("ScVbaPivotTables"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaPivotTables::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.PivotTables"); + sNames[0] = OUString("ooo.vba.excel.PivotTables"); } return sNames; } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 43de737d508d..1baa3ef01a76 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -34,7 +34,7 @@ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE { - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<OUString> getServiceNames(); public: ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); @@ -50,7 +50,7 @@ public: // ScVbaPivotTables_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); + virtual OUString getServiceImplName(); }; diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index c4c8136a436e..0cdd5fb836a9 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -43,7 +43,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException); - rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index f3383326329a..85305e52904f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -248,7 +248,7 @@ ScCellRangesBase* ScVbaRange::getCellRangesBase() throw ( uno::RuntimeException return ScCellRangesBase::getImplementation( mxRanges ); if( mxRange.is() ) return ScCellRangesBase::getImplementation( mxRange ); - throw uno::RuntimeException( rtl::OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("General Error creating range - Unknown" ), uno::Reference< uno::XInterface >() ); } ScCellRangeObj* ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException ) @@ -260,7 +260,7 @@ SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException ) { SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( getCellRangesBase() ); if ( !pDataSet ) - throw uno::RuntimeException( rtl::OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't access Itemset for range" ), uno::Reference< uno::XInterface >() ); return pDataSet; } @@ -364,9 +364,9 @@ public: virtual uno::Any createCollectionObject( const uno::Any& aSource ); - virtual rtl::OUString getServiceImplName() { return rtl::OUString(); } + virtual OUString getServiceImplName() { return OUString(); } - virtual uno::Sequence< rtl::OUString > getServiceNames() { return uno::Sequence< rtl::OUString >(); } + virtual uno::Sequence< OUString > getServiceNames() { return uno::Sequence< OUString >(); } }; @@ -389,7 +389,7 @@ getDocShellFromIf( const uno::Reference< uno::XInterface >& xIf ) throw ( uno::R { ScCellRangesBase* pUno = ScCellRangesBase::getImplementation( xIf ); if ( !pUno ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); return pUno->GetDocShell(); } @@ -427,7 +427,7 @@ getDocumentFromRange( const uno::Reference< table::XCellRange >& xRange ) { ScDocShell* pDocShell = getDocShellFromRange( xRange ); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying docshell from uno range object" ), uno::Reference< uno::XInterface >() ); ScDocument* pDoc = pDocShell->GetDocument(); return pDoc; } @@ -480,14 +480,14 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) { if( ScCellRangesBase* pScRangesBase = getCellRangesBase() ) return pScRangesBase->GetRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain UNO range implementation object" ), uno::Reference< uno::XInterface >() ); } const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain VBA range implementation object" ), uno::Reference< uno::XInterface >() ); } @@ -532,7 +532,7 @@ public: return false; } - rtl::OUString getNumberFormatString() + OUString getNumberFormatString() { uno::Reference< uno::XInterface > xIf( mxRangeProps, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoCellRange = ScCellRangesBase::getImplementation( xIf ); @@ -544,12 +544,12 @@ public: // one of the cells in the range is not like the other ;-) // so return a zero length format to indicate that if ( eState == SFX_ITEM_DONTCARE ) - return rtl::OUString(); + return OUString(); } uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW ); - ::rtl::OUString aFormatString; + OUString aFormatString; uno::Any aString = xNumberProps->getPropertyValue( "FormatString" ); aString >>= aFormatString; return aFormatString; @@ -563,7 +563,7 @@ public: return nType; } - bool setNumberFormat( const rtl::OUString& rFormat ) + bool setNumberFormat( const OUString& rFormat ) { // #163288# treat "General" as "Standard" format sal_Int32 nNewIndex = 0; @@ -692,19 +692,19 @@ public: }; -const static ::rtl::OUString ISVISIBLE( "IsVisible"); -const static ::rtl::OUString POSITION( "Position"); -const static rtl::OUString EQUALS( "=" ); -const static rtl::OUString NOTEQUALS( "<>" ); -const static rtl::OUString GREATERTHAN( ">" ); -const static rtl::OUString GREATERTHANEQUALS( ">=" ); -const static rtl::OUString LESSTHAN( "<" ); -const static rtl::OUString LESSTHANEQUALS( "<=" ); -const static rtl::OUString CONTS_HEADER( "ContainsHeader" ); -const static rtl::OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); -const static rtl::OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); -const static rtl::OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); -const static rtl::OUString CELLSTYLE( "CellStyle" ); +const static OUString ISVISIBLE( "IsVisible"); +const static OUString POSITION( "Position"); +const static OUString EQUALS( "=" ); +const static OUString NOTEQUALS( "<>" ); +const static OUString GREATERTHAN( ">" ); +const static OUString GREATERTHANEQUALS( ">=" ); +const static OUString LESSTHAN( "<" ); +const static OUString LESSTHANEQUALS( "<=" ); +const static OUString CONTS_HEADER( "ContainsHeader" ); +const static OUString INSERTPAGEBREAKS( "InsertPageBreaks" ); +const static OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY( "The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again" ); +const static OUString STR_ERRORMESSAGE_NOCELLSWEREFOUND( "No cells were found" ); +const static OUString CELLSTYLE( "CellStyle" ); class CellValueSetter : public ValueSetter { @@ -750,7 +750,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab } case uno::TypeClass_STRING: { - rtl::OUString aString; + OUString aString; if ( aValue >>= aString ) { // The required behavior for a string value is: @@ -762,7 +762,7 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab if ( aString.toChar() == '\'' ) // case 1 - handle with XTextRange { - rtl::OUString aRemainder( aString.copy(1) ); // strip the quote + OUString aRemainder( aString.copy(1) ); // strip the quote uno::Reference< text::XTextRange > xTextRange( xCell, uno::UNO_QUERY_THROW ); xTextRange->setString( aRemainder ); } @@ -820,7 +820,7 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< if ( eType == table::CellContentType_FORMULA ) { - rtl::OUString sFormula = xCell->getFormula(); + OUString sFormula = xCell->getFormula(); if ( sFormula == "=TRUE()" ) aValue <<= sal_True; else if ( sFormula == "=FALSE()" ) @@ -872,7 +872,7 @@ public: protected: bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) { - rtl::OUString sFormula; + OUString sFormula; double aDblValue = 0.0; if ( aValue >>= sFormula ) { @@ -923,7 +923,7 @@ public: { uno::Any aValue; aValue <<= xCell->getFormula(); - rtl::OUString sVal; + OUString sVal; aValue >>= sVal; uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW ); ScCellRangesBase* pUnoRangesBase = dynamic_cast< ScCellRangesBase* >( xIf.get() ); @@ -978,7 +978,7 @@ public: }; -const static rtl::OUString sNA("#N/A"); +const static OUString sNA("#N/A"); class Dim1ArrayValueSetter : public ArrayVisitor { @@ -1146,7 +1146,7 @@ public: }; bool -ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) +ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter ) { ScDocument* pDoc = NULL; @@ -1163,32 +1163,32 @@ ScVbaRange::getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& return false; } -bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, formula::FormulaGrammar::AddressConvention aConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { // see if there is a match with a named range uno::Reference< beans::XPropertySet > xProps( pDocSh->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNameAccess( xProps->getPropertyValue( "NamedRanges" ), uno::UNO_QUERY_THROW ); // Strangly enough you can have Range( "namedRange1, namedRange2, etc," ) // loop around each ',' separated name - std::vector< rtl::OUString > vNames; + std::vector< OUString > vNames; sal_Int32 nIndex = 0; do { - rtl::OUString aToken = sName.getToken( 0, ',', nIndex ); + OUString aToken = sName.getToken( 0, ',', nIndex ); vNames.push_back( aToken ); } while ( nIndex >= 0 ); if ( vNames.empty() ) vNames.push_back( sName ); - std::vector< rtl::OUString >::iterator it = vNames.begin(); - std::vector< rtl::OUString >::iterator it_end = vNames.end(); + std::vector< OUString >::iterator it = vNames.begin(); + std::vector< OUString >::iterator it_end = vNames.end(); for ( ; it != it_end; ++it ) { formula::FormulaGrammar::AddressConvention eConv = aConv; // spaces are illegal ( but the user of course can enter them ) - rtl::OUString sAddress = (*it).trim(); + OUString sAddress = (*it).trim(); // if a local name ( on the active sheet ) exists this will // take precedence over a global with the same name bool bLocalName = false; @@ -1241,7 +1241,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S ScVbaRange* -getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) +getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { ScRangeList aCellRanges; ScRange refRange; @@ -1301,10 +1301,10 @@ uno::Reference< sheet::XSheetCellRange > lclExpandToMerged( const uno::Reference uno::Reference< sheet::XSheetCellRangeContainer > lclExpandToMerged( const uno::Reference< sheet::XSheetCellRangeContainer >& rxCellRanges, bool bRecursive ) throw (uno::RuntimeException) { if( !rxCellRanges.is() ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); sal_Int32 nCount = rxCellRanges->getCount(); if( nCount < 1 ) - throw uno::RuntimeException( rtl::OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Missing cell ranges object" ), uno::Reference< uno::XInterface >() ); ScRangeList aScRanges; for( sal_Int32 nIndex = 0; nIndex < nCount; ++nIndex ) @@ -1371,7 +1371,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( - const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, + const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv ) throw ( uno::RuntimeException ) { table::CellRangeAddress refAddr; @@ -1385,7 +1385,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, { case uno::TypeClass_STRING: { - rtl::OUString rString; + OUString rString; aParam >>= rString; ScRangeList aCellRanges; ScRange refRange; @@ -1408,7 +1408,7 @@ table::CellRangeAddress getCellRangeAddressForVBARange( const uno::Any& aParam, break; } default: - throw uno::RuntimeException( rtl::OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't extact CellRangeAddress from type" ), uno::Reference< uno::XInterface >() ); } return lclGetRangeAddress( xRangeParam ); } @@ -1419,7 +1419,7 @@ lcl_setupBorders( const uno::Reference< excel::XRange >& xParentRange, const uno uno::Reference< XHelperInterface > xParent( xParentRange, uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(xRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); uno::Reference< XCollection > borders( new ScVbaBorders( xParent, xContext, xRange, aPalette ) ); return borders; @@ -1448,9 +1448,9 @@ ScVbaRange::ScVbaRange( const uno::Reference< XHelperInterface >& xParent, const mbIsColumns( bIsColumns ) { if ( !xContext.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "context is not set " ), uno::Reference< uno::XInterface >() , 1 ); if ( !xRange.is() ) - throw lang::IllegalArgumentException( rtl::OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); + throw lang::IllegalArgumentException( OUString( "range is not set " ), uno::Reference< uno::XInterface >() , 1 ); uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxParent, mxContext, xRange ) ); m_Areas = new ScVbaRangeAreas( mxParent, mxContext, xIndex, mbIsRows, mbIsColumns ); @@ -1562,7 +1562,7 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFi catch ( const uno::Exception& e ) { OSL_TRACE("Bahhh, caught exception %s", - rtl::OUStringToOString( e.Message, + OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1851,7 +1851,7 @@ ScVbaRange::FillDown() throw (uno::RuntimeException) sheet::FillMode_SIMPLE, sheet::FillDateMode_FILL_DATE_DAY, 0, 0x7FFFFFFF); } -::rtl::OUString +OUString ScVbaRange::getText() throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1983,7 +1983,7 @@ ScVbaRange::setFormulaArray(const uno::Any& rFormula) throw (uno::RuntimeExcepti setFormula( rFormula ); } -::rtl::OUString +OUString ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno::RuntimeException) { // #TODO code within the test below "if ( m_Areas.... " can be removed @@ -1997,7 +1997,7 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno } long nIndex = 0, nCount = 0; - ::rtl::OUString rString; + OUString rString; uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW ); rString = xTextRange->getString(); if( !( Start >>= nIndex ) && !( Length >>= nCount ) ) @@ -2009,13 +2009,13 @@ ScVbaRange::Characters(const uno::Any& Start, const uno::Any& Length) throw (uno return rString.copy( --nIndex, nCount ); // Zero value indexing } -::rtl::OUString +OUString ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolute, const uno::Any& ReferenceStyle, const uno::Any& External, const uno::Any& RelativeTo ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { // Multi-Area Range - rtl::OUString sAddress; + OUString sAddress; uno::Reference< XCollection > xCollection( m_Areas, uno::UNO_QUERY_THROW ); uno::Any aExternalCopy = External; for ( sal_Int32 index = 1; index <= xCollection->getCount(); ++index ) @@ -2023,7 +2023,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut uno::Reference< excel::XRange > xRange( xCollection->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW ); if ( index > 1 ) { - sAddress += rtl::OUString( ',' ); + sAddress += OUString( ',' ); // force external to be false // only first address should have the // document and sheet specifications @@ -2096,7 +2096,7 @@ ScVbaRange::Font() throw ( script::BasicErrorException, uno::RuntimeException) else if ( mxRanges.is() ) xProps.set(mxRanges, ::uno::UNO_QUERY ); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); ScCellRangeObj* pRangeObj = NULL; @@ -2162,7 +2162,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, if ( bIsColumnIndex ) { // Column index can be a col address e.g Cells( 1, "B" ) etc. - rtl::OUString sCol; + OUString sCol; if ( nColumnIndex >>= sCol ) { ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 ); @@ -2218,7 +2218,7 @@ ScVbaRange::Select() throw (uno::RuntimeException) { ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); if ( !pUnoRangesBase ) - throw uno::RuntimeException( rtl::OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access underlying uno range object" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = pUnoRangesBase->GetDocShell(); if ( pShell ) { @@ -2326,7 +2326,7 @@ ScVbaRange::Activate() throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; if ( aIndex.hasValue() ) { @@ -2352,10 +2352,10 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow - nStartRow )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); // return a normal range ( even for multi-selection uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); return new ScVbaRange( mxParent, mxContext, xRange, true ); @@ -2369,7 +2369,7 @@ ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XRange > ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) { - rtl::OUString sAddress; + OUString sAddress; ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); @@ -2396,10 +2396,10 @@ ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol - nStartCol )); } else - throw uno::RuntimeException( rtl::OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal param" ), uno::Reference< uno::XInterface >() ); if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 ) - throw uno::RuntimeException( rtl::OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); } // Columns() - no params uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); @@ -2473,7 +2473,7 @@ void ScVbaRange::Copy(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if ( Destination.hasValue() ) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2501,7 +2501,7 @@ void ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); if (Destination.hasValue()) { uno::Reference< excel::XRange > xRange( Destination, uno::UNO_QUERY_THROW ); @@ -2525,7 +2525,7 @@ ScVbaRange::Cut(const ::uno::Any& Destination) throw (uno::RuntimeException) void ScVbaRange::setNumberFormat( const uno::Any& aFormat ) throw ( script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sFormat; + OUString sFormat; aFormat >>= sFormat; if ( m_Areas->getCount() > 1 ) { @@ -2564,7 +2564,7 @@ ScVbaRange::getNumberFormat() throw ( script::BasicErrorException, uno::RuntimeE return aResult; } NumFormatHelper numFormat( mxRange ); - rtl::OUString sFormat = numFormat.getNumberFormatString(); + OUString sFormat = numFormat.getNumberFormatString(); if ( !sFormat.isEmpty() ) return uno::makeAny( sFormat ); return aNULL(); @@ -2680,7 +2680,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI if( !Cell1.hasValue() ) throw uno::RuntimeException( - rtl::OUString( " Invalid Argument " ), + OUString( " Invalid Argument " ), uno::Reference< XInterface >() ); table::CellRangeAddress resultAddress; @@ -2690,7 +2690,7 @@ ScVbaRange::Range( const uno::Any &Cell1, const uno::Any &Cell2, bool bForceUseI // Cell1 defined only if ( !Cell2.hasValue() ) { - rtl::OUString sName; + OUString sName; Cell1 >>= sName; RangeHelper referRange( xReferrer ); table::CellRangeAddress referAddress = referRange.getCellRangeAddressable()->getRangeAddress(); @@ -2827,7 +2827,7 @@ void SAL_CALL ScVbaRange::PasteSpecial( const uno::Any& Paste, const uno::Any& Operation, const uno::Any& SkipBlanks, const uno::Any& Transpose ) throw (::com::sun::star::uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( ( pShell ? pShell->GetModel() : NULL ), uno::UNO_QUERY_THROW ); @@ -2905,11 +2905,11 @@ ScVbaRange::AddComment( const uno::Any& Text ) throw (uno::RuntimeException) throw uno::RuntimeException(); // workaround: Excel allows to create empty comment, Calc does not - ::rtl::OUString aNoteText; + OUString aNoteText; if( Text.hasValue() && !(Text >>= aNoteText) ) throw uno::RuntimeException(); if( aNoteText.isEmpty() ) - aNoteText = ::rtl::OUString( sal_Unicode( ' ' ) ); + aNoteText = OUString( sal_Unicode( ' ' ) ); // try to create a new annotation table::CellRangeAddress aRangePos = lclGetRangeAddress( mxRange ); @@ -2960,7 +2960,7 @@ ScVbaRange::getHidden() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getRowOrColumnProps( mxRange, mbIsRows ); if ( !( xProps->getPropertyValue( ISVISIBLE ) >>= bIsVisible ) ) - throw uno::RuntimeException( rtl::OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to get IsVisible property"), uno::Reference< uno::XInterface >() ); } catch( const uno::Exception& e ) { @@ -2996,7 +2996,7 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException) } ::sal_Bool SAL_CALL -ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) +ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) { if ( m_Areas->getCount() > 1 ) { @@ -3010,8 +3010,8 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace // sanity check required params if ( What.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sWhat = VBAToRegexp( What); + throw uno::RuntimeException( OUString( "Range::Replace, missing params" ) , uno::Reference< uno::XInterface >() ); + OUString sWhat = VBAToRegexp( What); // #TODO #FIXME SearchFormat & ReplacesFormat are not processed // What do we do about MatchByte.. we don't seem to support that const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); @@ -3040,7 +3040,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nLook == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); // set global search props ( affects the find dialog // and of course the defaults for this method newOptions.SetWordOnly( bSearchWords ); @@ -3056,7 +3056,7 @@ ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replace else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3082,7 +3082,7 @@ uno::Reference< excel::XRange > SAL_CALL ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& LookIn, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& SearchDirection, const uno::Any& MatchCase, const uno::Any& /*MatchByte*/, const uno::Any& /*SearchFormat*/ ) throw (uno::RuntimeException) { // return a Range object that represents the first cell where that information is found. - rtl::OUString sWhat; + OUString sWhat; sal_Int32 nWhat = 0; double fWhat = 0.0; @@ -3090,20 +3090,20 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L if( What >>= sWhat ) { if( sWhat.isEmpty() ) - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); } else if( What >>= nWhat ) { - sWhat = rtl::OUString::valueOf( nWhat ); + sWhat = OUString::valueOf( nWhat ); } else if( What >>= fWhat ) { - sWhat = rtl::OUString::valueOf( fWhat ); + sWhat = OUString::valueOf( fWhat ); } else - throw uno::RuntimeException( rtl::OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Find, missing params" ) , uno::Reference< uno::XInterface >() ); - rtl::OUString sSearch = VBAToRegexp( sWhat ); + OUString sSearch = VBAToRegexp( sWhat ); const SvxSearchItem& globalSearchOptions = ScGlobal::GetSearchItem(); SvxSearchItem newOptions( globalSearchOptions ); @@ -3124,10 +3124,10 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // After must be a single cell in the range if( xAfterRange->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be a single cell." ) , uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xCell( Cells( uno::makeAny( xAfterRange->getRow() ), uno::makeAny( xAfterRange->getColumn() ) ), uno::UNO_QUERY ); if( !xCell.is() ) - throw uno::RuntimeException( rtl::OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "After must be in range." ) , uno::Reference< uno::XInterface >() ); xStartCell.set( xAfterRange->getCellRange(), uno::UNO_QUERY_THROW ); } @@ -3150,7 +3150,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L nSearchType = SVX_SEARCHIN_VALUE; break; default: - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookIn." ) , uno::Reference< uno::XInterface >() ); } newOptions.SetCellType( nSearchType ); xDescriptor->setPropertyValue( "SearchType", uno::makeAny( nSearchType ) ); @@ -3167,7 +3167,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nLookAt == excel::XlLookAt::xlWhole ) bSearchWords = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for LookAt" ) , uno::Reference< uno::XInterface >() ); newOptions.SetWordOnly( bSearchWords ); xDescriptor->setPropertyValue( SC_UNO_SRCHWORDS, uno::makeAny( bSearchWords ) ); } @@ -3182,7 +3182,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if ( nSearchOrder == excel::XlSearchOrder::xlByRows ) bSearchByRow = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchOrder" ) , uno::Reference< uno::XInterface >() ); newOptions.SetRowDirection( bSearchByRow ); xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( bSearchByRow ) ); @@ -3200,7 +3200,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L else if( nSearchDirection == excel::XlSearchDirection::xlPrevious ) bSearchBackwards = sal_True; else - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for SearchDirection" ) , uno::Reference< uno::XInterface >() ); newOptions.SetBackward( bSearchBackwards ); xDescriptor->setPropertyValue( "SearchBackwards", uno::makeAny( bSearchBackwards ) ); } @@ -3212,7 +3212,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L { // SearchCaseSensitive if( !( MatchCase >>= bMatchCase ) ) - throw uno::RuntimeException( rtl::OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Range::Replace, illegal value for MatchCase" ) , uno::Reference< uno::XInterface >() ); } xDescriptor->setPropertyValue( SC_UNO_SRCHCASE, uno::makeAny( bMatchCase ) ); @@ -3253,17 +3253,17 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere { xKeyRange.set( Key, uno::UNO_QUERY_THROW ); } - else if ( Key.getValueType() == ::getCppuType( static_cast< const rtl::OUString* >(0) ) ) + else if ( Key.getValueType() == ::getCppuType( static_cast< const OUString* >(0) ) ) { - rtl::OUString sRangeName = ::comphelper::getString( Key ); + OUString sRangeName = ::comphelper::getString( Key ); table::CellRangeAddress aRefAddr; if ( !pDocSh ) - throw uno::RuntimeException( rtl::OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort no docshell to calculate key param"), uno::Reference< uno::XInterface >() ); xKeyRange = getRangeForName( xContext, sRangeName, pDocSh, aRefAddr ); } else - throw uno::RuntimeException( rtl::OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort illegal type value for key param"), uno::Reference< uno::XInterface >() ); uno::Reference< table::XCellRange > xKey; xKey.set( xKeyRange->getCellRange(), uno::UNO_QUERY_THROW ); return xKey; @@ -3271,7 +3271,7 @@ uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Refere // helper method for Sort sal_Int32 findSortPropertyIndex( const uno::Sequence< beans::PropertyValue >& props, -const rtl::OUString& sPropName ) throw( uno::RuntimeException ) +const OUString& sPropName ) throw( uno::RuntimeException ) { const beans::PropertyValue* pProp = props.getConstArray(); sal_Int32 nItems = props.getLength(); @@ -3281,7 +3281,7 @@ const rtl::OUString& sPropName ) throw( uno::RuntimeException ) if ( pProp->Name.equals( sPropName ) ) return count; if ( count == nItems ) - throw uno::RuntimeException( rtl::OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort unknown sort property"), uno::Reference< uno::XInterface >() ); return -1; //should never reach here ( satisfy compiler ) } @@ -3317,7 +3317,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan aTableField.IsAscending = false; } else - throw uno::RuntimeException( rtl::OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal Key param" ), uno::Reference< uno::XInterface >() ); } @@ -3327,7 +3327,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& { // #TODO# #FIXME# can we do something with Type if ( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "That command cannot be used on multiple selections" ), uno::Reference< uno::XInterface >() ); sal_Int16 nDataOption1 = excel::XlSortDataOption::xlSortNormal; sal_Int16 nDataOption2 = excel::XlSortDataOption::xlSortNormal; @@ -3335,7 +3335,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocument* pDoc = getScDocument(); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); RangeHelper thisRange( mxRange ); table::CellRangeAddress thisRangeAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); @@ -3459,7 +3459,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& ScDocShell* pDocShell = getScDocShell(); xKey1 = processKey( Key1, mxContext, pDocShell ); if ( !xKey1.is() ) - throw uno::RuntimeException( rtl::OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Range::Sort needs a key1 param"), uno::Reference< uno::XInterface >() ); if ( Key2.hasValue() ) xKey2 = processKey( Key2, mxContext, pDocShell ); @@ -3468,7 +3468,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > sortDescriptor = xSort->createSortDescriptor(); - sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString( "SortFields" ) ); + sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, OUString( "SortFields" ) ); uno::Sequence< table::TableSortField > sTableFields(1); sal_Int32 nTableIndex = 0; @@ -3486,7 +3486,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any& } sortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields; - sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, rtl::OUString("IsSortColumns") ); + sal_Int32 nIndex = findSortPropertyIndex( sortDescriptor, OUString("IsSortColumns") ); sortDescriptor[ nIndex ].Value <<= bIsSortColumns; nIndex = findSortPropertyIndex( sortDescriptor, CONTS_HEADER ); @@ -3520,7 +3520,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) // Save ActiveCell pos ( to restore later ) uno::Any aDft; uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); - rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // position current cell upper left of this range Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select(); @@ -3554,7 +3554,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) nSID = SID_CURSORBLKRIGHT; break; default: - throw uno::RuntimeException( ::rtl::OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( ": Invalid ColumnIndex" ), uno::Reference< uno::XInterface >() ); } if ( pDispatcher ) { @@ -3563,7 +3563,7 @@ ScVbaRange::End( ::sal_Int32 Direction ) throw (uno::RuntimeException) } // result is the ActiveCell - rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); + OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft ); // restore old ActiveCell uno::Any aVoid; @@ -3594,11 +3594,11 @@ uno::Reference< excel::XCharacters > SAL_CALL ScVbaRange::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException) { if ( !isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create Characters property for multicell range " ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple(mxRange->getCellByPosition(0,0) , uno::UNO_QUERY_THROW ); ScDocument* pDoc = getDocumentFromRange(mxRange); if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); return new ScVbaCharacters( this, mxContext, aPalette, xSimple, Start, Length ); @@ -3633,7 +3633,7 @@ ScVbaRange::Delete( const uno::Any& Shift ) throw (uno::RuntimeException) mode = sheet::CellDeleteMode_LEFT; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -3682,10 +3682,10 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException) return new CellsEnumeration( mxParent, mxContext, m_Areas ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaRange::getDefaultMethodName( ) throw (uno::RuntimeException) { - const static rtl::OUString sName( "Item" ); + const static OUString sName( "Item" ); return sName; } @@ -3828,7 +3828,7 @@ uno::Reference< excel::XRange > ScVbaRange::getArea( sal_Int32 nIndex ) throw( css::uno::RuntimeException ) { if ( !m_Areas.is() ) - throw uno::RuntimeException( rtl::OUString("No areas available"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No areas available"), uno::Reference< uno::XInterface >() ); uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( ++nIndex ), uno::Any() ), uno::UNO_QUERY_THROW ); return xRange; } @@ -4119,11 +4119,11 @@ ScVbaRange::ApplicationRange( const uno::Reference< uno::XComponentContext >& xC // msgbox Application.Range("test").Address ' works // Single param Range - rtl::OUString sRangeName; + OUString sRangeName; Cell1 >>= sRangeName; if ( Cell1.hasValue() && !Cell2.hasValue() && !sRangeName.isEmpty() ) { - const static rtl::OUString sNamedRanges( "NamedRanges"); + const static OUString sNamedRanges( "NamedRanges"); uno::Reference< beans::XPropertySet > xPropSet( getCurrentExcelDoc(xContext), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameAccess > xNamed( xPropSet->getPropertyValue( sNamedRanges ), uno::UNO_QUERY_THROW ); @@ -4197,7 +4197,7 @@ static void lcl_SetAllQueryForField( ScDocShell* pDocShell, SCCOLROW nField, sal } // Modifies sCriteria, and nOp depending on the value of sCriteria -static void lcl_setTableFieldsFromCriteria( rtl::OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) +static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference< beans::XPropertySet >& xDescProps, sheet::TableFilterField2& rFilterField ) { // #TODO make this more efficient and cycle through // sCriteria1 character by character to pick up <,<>,=, * etc. @@ -4314,7 +4314,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const if ( pRange ) { if ( pRange->isSingleCellRange() ) - throw uno::RuntimeException( rtl::OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can't create AutoFilter" ), uno::Reference< uno::XInterface >() ); RangeHelper currentRegion( pRange->mxRange ); autoFiltAddress = currentRegion.getCellRangeAddressable()->getRangeAddress(); } @@ -4349,7 +4349,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const xDataBaseRange.set( xDBRanges->getByTable(nSheet ), uno::UNO_QUERY_THROW ); } if ( !xDataBaseRange.is() ) - throw uno::RuntimeException( rtl::OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to find the autofilter placeholder range" ), uno::Reference< uno::XInterface >() ); uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW ); // set autofilt @@ -4365,7 +4365,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sal_Int32 nField = 0; // *IS* 1 based - rtl::OUString sCriteria1; + OUString sCriteria1; sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd; sal_Bool bVisible = sal_True; @@ -4449,7 +4449,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const nConn = sheet::FilterConnection_AND; break; default: - throw uno::RuntimeException( rtl::OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "UnknownOption" ), uno::Reference< uno::XInterface >() ); } @@ -4459,7 +4459,7 @@ ScVbaRange::AutoFilter( const uno::Any& Field, const uno::Any& Criteria1, const sTabFilts[0].Connection = sheet::FilterConnection_AND; sTabFilts[0].Field = (nField - 1); - rtl::OUString sCriteria2; + OUString sCriteria2; if ( Criteria2.hasValue() ) // there is a Criteria2 { sTabFilts.realloc(2); @@ -4544,7 +4544,7 @@ ScVbaRange::Insert( const uno::Any& Shift, const uno::Any& /*CopyOrigin*/ ) thro mode = sheet::CellInsertMode_DOWN; break; default: - throw uno::RuntimeException( rtl::OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal parameter " ), uno::Reference< uno::XInterface >() ); } } else @@ -4589,7 +4589,7 @@ ScVbaRange::Autofit() throw (uno::RuntimeException) // throw an error if ( !( mbIsColumns || mbIsRows ) ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); ScDocShell* pDocShell = getDocShellFromRange( mxRange ); if ( pDocShell ) { @@ -4623,7 +4623,7 @@ ScVbaRange::Hyperlinks( const uno::Any& aIndex ) throw (uno::RuntimeException) uno::Reference< excel::XHyperlinks > xSheetHlinks( xWorksheet->Hyperlinks( uno::Any() ), uno::UNO_QUERY_THROW ); ScVbaHyperlinksRef xScSheetHlinks( dynamic_cast< ScVbaHyperlinks* >( xSheetHlinks.get() ) ); if( !xScSheetHlinks.is() ) - throw uno::RuntimeException( ::rtl::OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain hyperlinks implementation object" ), uno::Reference< uno::XInterface >() ); // create a new local hyperlinks object based on the sheet hyperlinks ScVbaHyperlinksRef xHlinks( new ScVbaHyperlinks( getParent(), mxContext, xScSheetHlinks, getScRangeList() ) ); @@ -4701,7 +4701,7 @@ sal_Unicode lclGetPrefixChar( const uno::Reference< sheet::XSheetCellRangeContai inline uno::Any lclGetPrefixVariant( sal_Unicode cPrefixChar ) { - return uno::Any( (cPrefixChar == 0) ? ::rtl::OUString() : ::rtl::OUString( cPrefixChar ) ); + return uno::Any( (cPrefixChar == 0) ? OUString() : OUString( cPrefixChar ) ); } } // namespace @@ -4728,7 +4728,7 @@ uno::Any SAL_CALL ScVbaRange::getPrefixCharacter() throw (uno::RuntimeException) return lclGetPrefixVariant( lclGetPrefixChar( mxRange ) ); if( mxRanges.is() ) return lclGetPrefixVariant( lclGetPrefixChar( mxRanges ) ); - throw uno::RuntimeException( ::rtl::OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Unexpected empty Range object" ), uno::Reference< uno::XInterface >() ); } uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) @@ -4737,7 +4737,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not get Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); sal_Bool bShowDetail = false; @@ -4769,7 +4769,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException) } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } return aNULL(); } @@ -4780,7 +4780,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru // In MSO VBA, the specified range must be a single summary column or row in an outline. otherwise throw exception if( m_Areas->getCount() > 1 ) - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); bool bShowDetail = extractBoolFromAny( aShowDetail ); @@ -4805,7 +4805,7 @@ void ScVbaRange::setShowDetail(const uno::Any& aShowDetail) throw ( css::uno::Ru } else { - throw uno::RuntimeException( rtl::OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Can not set Range.ShowDetail attribute "), uno::Reference< uno::XInterface >() ); } } @@ -4970,7 +4970,7 @@ ScVbaRange::AutoFill( const uno::Reference< excel::XRange >& Destination, const eCmd = FILL_GROWTH; break; case excel::XlAutoFillType::xlFillFormats: - throw uno::RuntimeException( rtl::OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "xlFillFormat not supported for AutoFill" ), uno::Reference< uno::XInterface >() ); case excel::XlAutoFillType::xlFillValues: case excel::XlAutoFillType::xlFillSeries: case excel::XlAutoFillType::xlLinearTrend: @@ -5000,7 +5000,7 @@ ScVbaRange::GoalSeek( const uno::Any& Goal, const uno::Reference< excel::XRange table::CellRangeAddress thisAddress = thisRange.getCellRangeAddressable()->getRangeAddress(); RangeHelper changingCellRange( pRange->mxRange ); table::CellRangeAddress changingCellAddr = changingCellRange.getCellRangeAddressable()->getRangeAddress(); - rtl::OUString sGoal = getAnyAsString( Goal ); + OUString sGoal = getAnyAsString( Goal ); table::CellAddress thisCell( thisAddress.Sheet, thisAddress.StartColumn, thisAddress.StartRow ); table::CellAddress changingCell( changingCellAddr.Sheet, changingCellAddr.StartColumn, changingCellAddr.StartRow ); sheet::GoalResult res = xGoalSeek->seekGoal( thisCell, changingCell, sGoal ); @@ -5029,7 +5029,7 @@ ScVbaRange::Item( const uno::Any& row, const uno::Any& column ) throw (script::B if ( mbIsRows || mbIsColumns ) { if ( column.hasValue() ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); uno::Reference< excel::XRange > xRange; if ( mbIsColumns ) xRange = Columns( row ); @@ -5061,7 +5061,7 @@ ScVbaRange::AutoOutline( ) throw (script::BasicErrorException, uno::RuntimeExce xSheetOutline->autoOutline( thisAddress ); } else - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } void SAL_CALL @@ -5169,7 +5169,7 @@ ScVbaRange::getStyle() throw (uno::RuntimeException) return xRange->getStyle(); } uno::Reference< beans::XPropertySet > xProps( mxRange, uno::UNO_QUERY_THROW ); - rtl::OUString sStyleName; + OUString sStyleName; xProps->getPropertyValue( CELLSTYLE ) >>= sStyleName; ScDocShell* pShell = getScDocShell(); uno::Reference< frame::XModel > xModel( pShell->GetModel() ); @@ -5251,13 +5251,13 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw uno::Reference< excel::XRange > xUsedRange( getWorksheet()->getUsedRange() ); sal_Int32 nType = 0; if ( !( _oType >>= nType ) ) - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); switch(nType) { case excel::XlCellType::xlCellTypeSameFormatConditions: case excel::XlCellType::xlCellTypeAllValidation: case excel::XlCellType::xlCellTypeSameValidation: - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: case excel::XlCellType::xlCellTypeComments: @@ -5315,11 +5315,11 @@ ScVbaRange::SpecialCells( const uno::Any& _oType, const uno::Any& _oValue) throw break; } default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if ( !pRangeToUse ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); return pRangeToUse->SpecialCellsImpl( nType, _oValue ); } @@ -5345,7 +5345,7 @@ static sal_Int32 lcl_getFormulaResultFlags(const uno::Any& aType) throw ( script nRes = sheet::FormulaResult::STRING; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } return nRes; } @@ -5367,7 +5367,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( case excel::XlCellType::xlCellTypeSameValidation: // Shouldn't get here ( should be filtered out by // ScVbaRange::SpecialCells() - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); break; case excel::XlCellType::xlCellTypeBlanks: xLocSheetCellRanges = xQuery->queryEmptyCells(); @@ -5390,7 +5390,7 @@ ScVbaRange::SpecialCellsImpl( sal_Int32 nType, const uno::Any& _oValue) throw ( xLocSheetCellRanges = xQuery->queryVisibleCells(); break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); break; } if (xLocSheetCellRanges.is()) @@ -5470,7 +5470,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: aColumns[i].Function = sheet::GeneralFunction_VARP; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString()) ; + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString()) ; return; } } @@ -5479,24 +5479,24 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaRange::getServiceImplName() { - return rtl::OUString("ScVbaRange"); + return OUString("ScVbaRange"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaRange::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.excel.Range" ); + aServiceNames[ 0 ] = OUString( "ooo.vba.excel.Range" ); } return aServiceNames; } @@ -5508,7 +5508,7 @@ ScVbaRange::hasError() throw (uno::RuntimeException) uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW ); uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW ); - static rtl::OUString FunctionName( "IsError" ); + static OUString FunctionName( "IsError" ); uno::Sequence< uno::Any > Params(1); uno::Reference< excel::XRange > aRange( this ); Params[0] = uno::makeAny( aRange ); diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 26c583eb7de4..3459f52f6647 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -140,7 +140,7 @@ public: static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, - const rtl::OUString& sRangeName, ScDocShell* pDocSh, + const OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( css::uno::RuntimeException ); static css::uno::Reference< ov::excel::XRange > CellsHelper( @@ -161,7 +161,7 @@ public: virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); using ScVbaRange_BASE::setNumberFormat; virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException); @@ -207,10 +207,10 @@ public: throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) + virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException); @@ -229,7 +229,7 @@ public: virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException); static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException); virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException); @@ -272,9 +272,9 @@ public: } virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException); // XDefaultMethod - ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException); // XDefaultProperty - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest @@ -285,14 +285,14 @@ public: // * object should be a lightweight as possible // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException); - static bool getCellRangesForAddress( sal_uInt16& rResFlags, const rtl::OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); + static bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException ); // XErrorQuery virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif /* SC_VBA_RANGE_HXX */ diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 256d3659eb42..cf6adaf1b02b 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -33,7 +33,6 @@ #include "vbafont.hxx" #include "drwlayer.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -283,7 +282,7 @@ void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) void ScVbaSheetObjectBase::setDefaultProperties( sal_Int32 nIndex ) throw (uno::RuntimeException) { - OUString aName = ::rtl::OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); + OUString aName = OUStringBuffer( implGetBaseName() ).append( sal_Unicode( ' ' ) ).append( nIndex + 1 ).makeStringAndClear(); setName( aName ); implSetDefaultProperties(); } diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index c565c9660a14..87ba3776d85c 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -50,24 +50,24 @@ public: virtual ~ScVbaButtonCharacters(); // XCharacters attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const ::rtl::OUString& rText ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); // XCharacters methods - virtual void SAL_CALL Insert( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::uno::RuntimeException); // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE private: - ::rtl::OUString getFullString() const throw (css::uno::RuntimeException); - void setFullString( const ::rtl::OUString& rString ) throw (css::uno::RuntimeException); + OUString getFullString() const throw (css::uno::RuntimeException); + void setFullString( const OUString& rString ) throw (css::uno::RuntimeException); private: ScVbaPalette maPalette; @@ -99,8 +99,8 @@ public: virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException); virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException); virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); @@ -111,7 +111,7 @@ public: protected: /** Derived classes return the base name used for new objects. */ - virtual ::rtl::OUString implGetBaseName() const = 0; + virtual OUString implGetBaseName() const = 0; /** Derived classes set default properties for new drawing objects. */ virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); @@ -148,10 +148,10 @@ public: ListenerType eListenerType ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& rName ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); - virtual void SAL_CALL setOnAction( const ::rtl::OUString& rMacroName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException); + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException); virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException); @@ -165,8 +165,8 @@ protected: protected: css::uno::Reference< css::container::XIndexContainer > mxFormIC; css::uno::Reference< css::beans::XPropertySet > mxControlProps; - ::rtl::OUString maListenerType; - ::rtl::OUString maEventMethod; + OUString maListenerType; + OUString maEventMethod; }; // ============================================================================ @@ -184,8 +184,8 @@ public: const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); // XButton attributes - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); - virtual void SAL_CALL setCaption( const ::rtl::OUString& rCaption ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException); virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException); @@ -203,7 +203,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE protected: - virtual ::rtl::OUString implGetBaseName() const; + virtual OUString implGetBaseName() const; virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 74f656f2001d..b542a666b1c9 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/form/XFormsSupplier.hpp> #include "vbasheetobject.hxx" -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 466c7ff377ec..0f96a1d41990 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -59,7 +59,7 @@ public: // ScVbaCollectionBase virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ); - virtual css::uno::Any getItemByStringIndex( const ::rtl::OUString& rIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException); protected: ScVbaObjectContainerRef mxContainer; diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 427a70410722..03196a46ba5f 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString DISPLAYNAME("DisplayName"); +static OUString DISPLAYNAME("DisplayName"); @@ -31,12 +31,12 @@ uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( xModel, uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( rtl::OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( OUString( "CellStyles" ) ), uno::UNO_QUERY_THROW ); return xStylesAccess; } static uno::Reference< beans::XPropertySet > -lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) +lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) { uno::Reference< beans::XPropertySet > xStyleProps( ScVbaStyle::getStylesNameContainer( xModel )->getByName( sStyleName ), uno::UNO_QUERY_THROW ); @@ -47,11 +47,11 @@ lcl_getStyleProps( const rtl::OUString& sStyleName, const uno::Reference< frame: void ScVbaStyle::initialise() throw ( uno::RuntimeException ) { if (!mxModel.is() ) - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString( "XModel Interface could not be retrieved") ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString( "XModel Interface could not be retrieved") ); uno::Reference< lang::XServiceInfo > xServiceInfo( mxPropertySet, uno::UNO_QUERY_THROW ); - if ( !xServiceInfo->supportsService( rtl::OUString( "com.sun.star.style.CellStyle" ) ) ) + if ( !xServiceInfo->supportsService( OUString( "com.sun.star.style.CellStyle" ) ) ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } mxStyle.set( mxPropertySet, uno::UNO_QUERY_THROW ); @@ -60,7 +60,7 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException ) } -ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) +ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel ) { try { @@ -68,7 +68,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -80,7 +80,7 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } @@ -92,19 +92,19 @@ ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException) } void SAL_CALL -ScVbaStyle::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setName( const OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException) { mxStyle->setName(Name); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getName() throw (script::BasicErrorException, uno::RuntimeException) { return mxStyle->getName(); } void SAL_CALL -ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyle::setNameLocal( const OUString& NameLocal ) throw (script::BasicErrorException, uno::RuntimeException) { try { @@ -116,17 +116,17 @@ ScVbaStyle::setNameLocal( const ::rtl::OUString& NameLocal ) throw (script::Basi } } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaStyle::getNameLocal() throw (script::BasicErrorException, uno::RuntimeException) { - rtl::OUString sName; + OUString sName; try { mxPropertySet->getPropertyValue(DISPLAYNAME) >>= sName; } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString() ); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString() ); } return sName; } @@ -140,37 +140,37 @@ ScVbaStyle::Delete() throw (script::BasicErrorException, uno::RuntimeException) } catch (const uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } void SAL_CALL ScVbaStyle::setMergeCells( const uno::Any& /*MergeCells*/ ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); } uno::Any SAL_CALL ScVbaStyle::getMergeCells( ) throw (script::BasicErrorException, uno::RuntimeException) { - DebugHelper::exception(SbERR_NOT_IMPLEMENTED, rtl::OUString()); + DebugHelper::exception(SbERR_NOT_IMPLEMENTED, OUString()); return uno::Any(); } -rtl::OUString +OUString ScVbaStyle::getServiceImplName() { - return rtl::OUString("ScVbaStyle"); + return OUString("ScVbaStyle"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyle::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index cd0e0a72628d..70d4e2824739 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -35,24 +35,24 @@ protected: css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; void initialise() throw ( css::uno::RuntimeException ); public: - ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const rtl::OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); + ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const OUString& sStyleName, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual ~ScVbaStyle(){} static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; }; // XStyle Methods virtual ::sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setNameLocal( const ::rtl::OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException); // XFormat virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 2706440c972c..df854d17d593 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -static rtl::OUString SDEFAULTCELLSTYLENAME("Default"); +static OUString SDEFAULTCELLSTYLENAME("Default"); static css::uno::Any lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) { @@ -42,11 +42,11 @@ ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, con } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) { return mxNameContainerCellStyles->getElementNames(); @@ -94,12 +94,12 @@ ScVbaStyles::createEnumeration() throw (uno::RuntimeException) } uno::Reference< excel::XStyle > SAL_CALL -ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) +ScVbaStyles::Add( const OUString& _sName, const uno::Any& _aBasedOn ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< excel::XStyle > aRet; try { - rtl::OUString sParentCellStyleName("Default"); + OUString sParentCellStyleName("Default"); if ( _aBasedOn.hasValue() ) { uno::Reference< excel::XRange > oRange; @@ -112,16 +112,16 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString() ); } } else { - DebugHelper::exception(SbERR_BAD_ARGUMENT, rtl::OUString()); + DebugHelper::exception(SbERR_BAD_ARGUMENT, OUString()); } } - uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( rtl::OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); + uno::Reference< style::XStyle > xStyle( mxMSF->createInstance( OUString("com.sun.star.style.CellStyle")), uno::UNO_QUERY_THROW ); if (!mxNameContainerCellStyles->hasByName(_sName)) { @@ -135,13 +135,13 @@ ScVbaStyles::Add( const ::rtl::OUString& _sName, const uno::Any& _aBasedOn ) thr } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } return aRet; } void -ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorException ) +ScVbaStyles::Delete(const OUString _sStyleName) throw ( script::BasicErrorException ) { try { @@ -150,24 +150,24 @@ ScVbaStyles::Delete(const rtl::OUString _sStyleName) throw ( script::BasicErrorE } catch (uno::Exception& ) { - DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); + DebugHelper::exception(SbERR_METHOD_FAILED, OUString()); } } -rtl::OUString +OUString ScVbaStyles::getServiceImplName() { - return rtl::OUString("ScVbaStyles"); + return OUString("ScVbaStyles"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaStyles::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XStyles" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XStyles" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 4161f073cf6b..aff8d859cedc 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -33,17 +33,17 @@ class ScVbaStyles: public ScVbaStyles_BASE css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles; public: ScVbaStyles( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::script::BasicErrorException ); - css::uno::Sequence< rtl::OUString > getStyleNames() throw ( css::uno::RuntimeException ); - void Delete(const rtl::OUString _sStyleName) throw ( css::script::BasicErrorException ); + css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); + void Delete(const OUString _sStyleName) throw ( css::script::BasicErrorException ); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const ::rtl::OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject(const css::uno::Any&); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif diff --git a/sc/source/ui/vba/vbatextboxshape.cxx b/sc/source/ui/vba/vbatextboxshape.cxx index ca7cc7270613..994ca2971f73 100644 --- a/sc/source/ui/vba/vbatextboxshape.cxx +++ b/sc/source/ui/vba/vbatextboxshape.cxx @@ -31,14 +31,14 @@ ScVbaTextBoxShape::ScVbaTextBoxShape( const uno::Reference< uno::XComponentConte m_xModel.set( xModel ); } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaTextBoxShape::getText() throw (css::uno::RuntimeException) { return m_xTextRange->getString(); } void SAL_CALL -ScVbaTextBoxShape::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) +ScVbaTextBoxShape::setText( const OUString& _text ) throw (css::uno::RuntimeException) { m_xTextRange->setString( _text ); } @@ -50,7 +50,7 @@ ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) t ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL; if ( !pDoc ) - throw uno::RuntimeException( rtl::OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Failed to access document from shell" ), uno::Reference< uno::XInterface >() ); uno::Reference< text::XSimpleText > xSimple( m_xTextRange, uno::UNO_QUERY_THROW ); ScVbaPalette aPalette( pDoc->GetDocumentShell() ); diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index 53c1df383172..533df3a3b50b 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -35,8 +35,8 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // Attributes - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException); - virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException); + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException); }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/sc/source/ui/vba/vbatextframe.cxx b/sc/source/ui/vba/vbatextframe.cxx index 306f71318ee7..854594faafb9 100644 --- a/sc/source/ui/vba/vbatextframe.cxx +++ b/sc/source/ui/vba/vbatextframe.cxx @@ -40,20 +40,20 @@ ScVbaTextFrame::Characters() throw (uno::RuntimeException) return uno::makeAny( uno::Reference< ov::excel::XCharacters >( new ScVbaCharacters( this, mxContext, aPalette, xSimpleText, aStart, aLength, sal_True ) ) ); } -rtl::OUString +OUString ScVbaTextFrame::getServiceImplName() { - return rtl::OUString("ScVbaTextFrame"); + return OUString("ScVbaTextFrame"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaTextFrame::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.TextFrame" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.TextFrame" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index 32fc8642ca1e..3bad6ba0c5a7 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -33,8 +33,8 @@ public: // Methods virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbatitle.hxx b/sc/source/ui/vba/vbatitle.hxx index d3c84ac95198..3f4d105c3808 100644 --- a/sc/source/ui/vba/vbatitle.hxx +++ b/sc/source/ui/vba/vbatitle.hxx @@ -64,27 +64,27 @@ public: return new ScVbaFont( BaseClass::mxParent, BaseClass::mxContext, m_Palette, xShapePropertySet ); } - void SAL_CALL setText( const ::rtl::OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + void SAL_CALL setText( const OUString& Text ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { try { - xShapePropertySet->setPropertyValue( rtl::OUString("String"), css::uno::makeAny( Text )); + xShapePropertySet->setPropertyValue( OUString("String"), css::uno::makeAny( Text )); } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } - ::rtl::OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) + OUString SAL_CALL getText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { - ::rtl::OUString sText; + OUString sText; try { - xShapePropertySet->getPropertyValue( rtl::OUString("String") ) >>= sText; + xShapePropertySet->getPropertyValue( OUString("String") ) >>= sText; } catch ( css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return sText; } @@ -117,11 +117,11 @@ public: { try { - xShapePropertySet->setPropertyValue(rtl::OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); + xShapePropertySet->setPropertyValue(OUString("TextRotation"), css::uno::makeAny(_nOrientation*100)); } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } } ::sal_Int32 SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) @@ -129,26 +129,26 @@ public: sal_Int32 nSOOrientation = 0; try { - xShapePropertySet->getPropertyValue( rtl::OUString("TextRotation")) >>= nSOOrientation; + xShapePropertySet->getPropertyValue( OUString("TextRotation")) >>= nSOOrientation; } catch (css::uno::Exception& ) { - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); + throw css::script::BasicErrorException( OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, OUString() ); } return static_cast< sal_Int32 >(nSOOrientation / 100) ; } // XHelperInterface - rtl::OUString getServiceImplName() + OUString getServiceImplName() { - return rtl::OUString("TitleImpl"); + return OUString("TitleImpl"); } - css::uno::Sequence< rtl::OUString > getServiceNames() + css::uno::Sequence< OUString > getServiceNames() { - static css::uno::Sequence< rtl::OUString > aServiceNames; + static css::uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.XTitle" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.XTitle" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index cdd02499bca0..da9f0bb6b633 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -35,17 +35,17 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -const static rtl::OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); -const static rtl::OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); -const static rtl::OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); -const static rtl::OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); -const static rtl::OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); -const static rtl::OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); -const static rtl::OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); -const static rtl::OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); -const static rtl::OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); -const static rtl::OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); -const static rtl::OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); +const static OUString VALIDATION( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_VALIDAT ) ); +const static OUString IGNOREBLANK( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_IGNOREBL ) ); +const static OUString SHOWINPUT( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWINP ) ); +const static OUString SHOWERROR( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWERR ) ); +const static OUString ERRORTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRTITLE ) ); +const static OUString INPUTTITLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPTITLE ) ); +const static OUString INPUTMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_INPMESS ) ); +const static OUString ERRORMESS( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRMESS ) ); +const static OUString STYPE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TYPE ) ); +const static OUString SHOWLIST( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SHOWLIST ) ); +const static OUString ALERTSTYLE( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_ERRALSTY ) ); static void lcl_setValidationProps( const uno::Reference< table::XCellRange >& xRange, const uno::Reference< beans::XPropertySet >& xProps ) @@ -134,68 +134,68 @@ ScVbaValidation::setShowError( ::sal_Bool _showerror ) throw (uno::RuntimeExcept lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sErrorTitle; + OUString sErrorTitle; xProps->getPropertyValue( ERRORTITLE ) >>= sErrorTitle; return sErrorTitle; } void -ScVbaValidation::setErrorTitle( const rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorTitle( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORTITLE, uno::makeAny( _errormessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sMsg; + OUString sMsg; xProps->getPropertyValue( INPUTMESS ) >>= sMsg; return sMsg; } void SAL_CALL -ScVbaValidation::setInputMessage( const ::rtl::OUString& _inputmessage ) throw (uno::RuntimeException) +ScVbaValidation::setInputMessage( const OUString& _inputmessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTMESS, uno::makeAny( _inputmessage ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getInputTitle() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( INPUTTITLE ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setInputTitle( const ::rtl::OUString& _inputtitle ) throw (uno::RuntimeException) +ScVbaValidation::setInputTitle( const OUString& _inputtitle ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( INPUTTITLE, uno::makeAny( _inputtitle ) ); lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getErrorMessage() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange ); - rtl::OUString sString; + OUString sString; xProps->getPropertyValue( ERRORMESS ) >>= sString; return sString; } void SAL_CALL -ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw (uno::RuntimeException) +ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); xProps->setPropertyValue( ERRORMESS, uno::makeAny( _errormessage ) ); @@ -206,7 +206,7 @@ ScVbaValidation::setErrorMessage( const ::rtl::OUString& _errormessage ) throw ( void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException) { - rtl::OUString sBlank; + OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( IGNOREBLANK, uno::makeAny( sal_True ) ); @@ -233,15 +233,15 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un sheet::ValidationType nValType = sheet::ValidationType_ANY; xProps->getPropertyValue( STYPE ) >>= nValType; if ( nValType != sheet::ValidationType_ANY ) - throw uno::RuntimeException( rtl::OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "validation object already exists" ), uno::Reference< uno::XInterface >() ); sal_Int32 nType = -1; if ( !Type.hasValue() || !( Type >>= nType ) ) - throw uno::RuntimeException( rtl::OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing required param" ), uno::Reference< uno::XInterface >() ); Delete(); // set up defaults - rtl::OUString sFormula1; + OUString sFormula1; Formula1 >>= sFormula1; - rtl::OUString sFormula2; + OUString sFormula2; Formula2 >>= sFormula2; switch ( nType ) { @@ -250,7 +250,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un // for validate list // at least formula1 is required if ( !Formula1.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "missing param" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "missing param" ), uno::Reference< uno::XInterface >() ); nValType = sheet::ValidationType_LIST; xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); // #TODO validate required params @@ -262,7 +262,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un xProps->setPropertyValue( STYPE, uno::makeAny(nValType )); break; default: - throw uno::RuntimeException( rtl::OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "unsupported operation..." ), uno::Reference< uno::XInterface >() ); } sheet::ValidationAlertStyle eStyle = sheet::ValidationAlertStyle_STOP; @@ -283,7 +283,7 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un eStyle = sheet::ValidationAlertStyle_INFO; break; default: - throw uno::RuntimeException( rtl::OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "bad param..." ), uno::Reference< uno::XInterface >() ); } } @@ -306,11 +306,11 @@ ScVbaValidation::Add( const uno::Any& Type, const uno::Any& AlertStyle, const un lcl_setValidationProps( m_xRange, xProps ); } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula1() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); - rtl::OUString sString = xCond->getFormula1(); + OUString sString = xCond->getFormula1(); sal_uInt16 nFlags = 0; ScRangeList aCellRanges; @@ -327,7 +327,7 @@ ScVbaValidation::getFormula1() throw (uno::RuntimeException) return sString; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaValidation::getFormula2() throw (uno::RuntimeException) { uno::Reference< sheet::XSheetCondition > xCond( lcl_getValidationProps( m_xRange ), uno::UNO_QUERY_THROW ); @@ -377,20 +377,20 @@ ScVbaValidation::getType() throw (uno::RuntimeException) return nExcelType; } -rtl::OUString +OUString ScVbaValidation::getServiceImplName() { - return rtl::OUString("ScVbaValidation"); + return OUString("ScVbaValidation"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaValidation::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Validation" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Validation" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index ea236a31c085..baa96d730555 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -41,23 +41,23 @@ public: virtual void SAL_CALL setShowInput( ::sal_Bool _showinput ) throw (css::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException); virtual void SAL_CALL setShowError( ::sal_Bool _showerror ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputTitle( const ::rtl::OUString& _inputtitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorTitle( const ::rtl::OUString& _errortitle ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setInputMessage( const ::rtl::OUString& _inputmessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); - virtual void SAL_CALL setErrorMessage( const ::rtl::OUString& _errormessage ) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException); + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException) ; + virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException); // Methods virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException); virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 2ac13621ae32..dab52fa8b631 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -48,9 +48,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlWindowState; -typedef boost::unordered_map< rtl::OUString, -SCTAB, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +SCTAB, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; @@ -103,13 +103,13 @@ public: { ScModelObj* pModel = static_cast< ScModelObj* >( m_xModel.get() ); if ( !pModel ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain current document" ), uno::Reference< uno::XInterface >() ); ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); if ( !pDocShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain docshell" ), uno::Reference< uno::XInterface >() ); ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); SCTAB nTabCount = pDocShell->GetDocument()->GetTableCount(); uno::Sequence<sal_Int32> aSheets( nTabCount ); @@ -160,7 +160,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -169,10 +169,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -180,7 +180,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -290,7 +290,7 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P /* sal_Int32 nSheets = 0; sal_Int32 nPosition = 0; - throw uno::RuntimeException( rtl::OUString("No Implemented"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("No Implemented"), uno::Reference< uno::XInterface >() ); sal_Bool bSheets = ( Sheets >>= nSheets ); sal_Bool bPosition = ( Position >>= nPosition ); if ( bSheets || bPosition ) // at least one param specified @@ -305,11 +305,11 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P uno::Any SAL_CALL ScVbaWindow::getCaption() throw (uno::RuntimeException) { - static rtl::OUString sCrud(" - OpenOffice.org Calc" ); + static OUString sCrud(" - OpenOffice.org Calc" ); static sal_Int32 nCrudLen = sCrud.getLength(); - rtl::OUString sTitle; - getFrameProps()->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; + OUString sTitle; + getFrameProps()->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM ( SC_UNONAME_TITLE ) ) ) >>= sTitle; sal_Int32 nCrudIndex = sTitle.indexOf( sCrud ); // adjust title ( by removing crud ) // sCrud string present @@ -320,7 +320,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) { sTitle = sTitle.copy( 0, nCrudIndex ); ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ); - rtl::OUString sName = workbook.getName(); + OUString sName = workbook.getName(); // rather bizare hack to make sure the name behavior // is like XL // if the adjusted title == workbook name, use name @@ -330,7 +330,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) if ( !sTitle.equals( sName ) ) { - static rtl::OUString sDot("."); + static OUString sDot("."); // starts with title if ( sName.indexOf( sTitle ) == 0 ) // extention starts immediately after @@ -345,7 +345,7 @@ ScVbaWindow::getCaption() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setCaption( const uno::Any& _caption ) throw (uno::RuntimeException) { - getFrameProps()->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); + getFrameProps()->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_TITLE ) ), _caption ); } uno::Any SAL_CALL @@ -444,7 +444,7 @@ ScVbaWindow::setWindowState( const uno::Any& _windowstate ) throw (uno::RuntimeE else if (nwindowState == xlNormal) pWork -> Restore(); else - throw uno::RuntimeException( rtl::OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Invalid Parameter" ), uno::Reference< uno::XInterface >() ); } } @@ -495,7 +495,7 @@ ScVbaWindow::RangeSelection() throw (script::BasicErrorException, uno::RuntimeEx ::sal_Bool SAL_CALL ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); sal_Bool bGrid = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bGrid; return bGrid; @@ -505,14 +505,14 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHOWGRID ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _displaygridlines )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); sal_Bool bHeading = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHeading; return bHeading; @@ -521,14 +521,14 @@ ScVbaWindow::getDisplayHeadings() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_COLROWHDR ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHeadings )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); sal_Bool bHorizontalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bHorizontalScrollBar; return bHorizontalScrollBar; @@ -537,14 +537,14 @@ ScVbaWindow::getDisplayHorizontalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_HORSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayHorizontalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); sal_Bool bOutline = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bOutline; return bOutline; @@ -553,14 +553,14 @@ ScVbaWindow::getDisplayOutline() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OUTLSYMB ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayOutline )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); sal_Bool bVerticalScrollBar = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bVerticalScrollBar; return bVerticalScrollBar; @@ -569,14 +569,14 @@ ScVbaWindow::getDisplayVerticalScrollBar() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VERTSCROLL ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayVerticalScrollBar )); } ::sal_Bool SAL_CALL ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); sal_Bool bWorkbookTabs = sal_True; getControllerProps()->getPropertyValue( sName ) >>= bWorkbookTabs; return bWorkbookTabs; @@ -585,7 +585,7 @@ ScVbaWindow::getDisplayWorkbookTabs() throw (uno::RuntimeException) void SAL_CALL ScVbaWindow::setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (uno::RuntimeException) { - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SHEETTABS ) ); getControllerProps()->setPropertyValue( sName, uno::makeAny( _bDisplayWorkbookTabs )); } @@ -731,7 +731,7 @@ uno::Any SAL_CALL ScVbaWindow::getZoom() throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xProps = getControllerProps(); - rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); + OUString sName( RTL_CONSTASCII_USTRINGPARAM( SC_UNO_ZOOMTYPE ) ); sal_Int16 nZoomType = view::DocumentZoomType::PAGE_WIDTH; xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException) } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { - sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); + sName = OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNO_ZOOMVALUE)); sal_Int16 nZoom = 100; xProps->getPropertyValue( sName ) >>= nZoom; return uno::makeAny( nZoom ); @@ -793,7 +793,7 @@ ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException) nSlot = FID_PAGEBREAKMODE; break; default: - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } // !! TODO !! get view shell from controller ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel ); @@ -864,20 +864,20 @@ void SAL_CALL ScVbaWindow::setTabRatio( double fRatio ) throw (css::uno::Runtime } } -rtl::OUString +OUString ScVbaWindow::getServiceImplName() { - return rtl::OUString("ScVbaWindow"); + return OUString("ScVbaWindow"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWindow::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Window" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Window" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index fe5725340ca3..c637fdf736a9 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -120,8 +120,8 @@ public: virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 0c090516961d..5f4bf1098ffe 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -30,9 +30,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -typedef boost::unordered_map< rtl::OUString, -sal_Int32, ::rtl::OUStringHash, -::std::equal_to< ::rtl::OUString > > NameIndexHash; +typedef boost::unordered_map< OUString, +sal_Int32, OUStringHash, +::std::equal_to< OUString > > NameIndexHash; static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) @@ -130,7 +130,7 @@ public: uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW ); uno::Reference< XHelperInterface > xTemp; // temporary needed for g++ 3.3.5 ScVbaWindow window( xTemp, m_xContext, xModel, xController ); - rtl::OUString sCaption; + OUString sCaption; window.getCaption() >>= sCaption; namesToIndices[ sCaption ] = nIndex++; } @@ -168,7 +168,7 @@ public: } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -177,10 +177,10 @@ public: } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); - ::rtl::OUString* pString = names.getArray(); + uno::Sequence< OUString > names( namesToIndices.size() ); + OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) @@ -188,7 +188,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); @@ -225,20 +225,20 @@ ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWor } -rtl::OUString +OUString ScVbaWindows::getServiceImplName() { - return rtl::OUString("ScVbaWindows"); + return OUString("ScVbaWindows"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWindows::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Windows"); + sNames[0] = OUString("ooo.vba.excel.Windows"); } return sNames; } diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 0cd2186fc4e7..59a32790f28d 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -47,8 +47,8 @@ public: virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif //SC_VBA_WINDOWS_HXX diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index 6062b9e3bde5..96aa20574b0b 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -97,7 +97,7 @@ ScVbaWorkbook::Colors( const ::uno::Any& Index ) throw (::script::BasicErrorExce ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException) { sal_Int32 aFileFormat = 0; - rtl::OUString aFilterName; + OUString aFilterName; uno::Sequence< beans::PropertyValue > aArgs = getModel()->getArgs(); // #FIXME - seems suspect should we not walk through the properties @@ -251,14 +251,14 @@ void SAL_CALL ScVbaWorkbook::setPrecisionAsDisplayed( sal_Bool _precisionAsDispl } void -ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException) +ScVbaWorkbook::SaveCopyAs( const OUString& sFileName ) throw ( uno::RuntimeException) { - rtl::OUString aURL; + OUString aURL; osl::FileBase::getFileURLFromSystemPath( sFileName, aURL ); uno::Reference< frame::XStorable > xStor( getModel(), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > storeProps(1); - storeProps[0].Name = rtl::OUString( "FilterName" ); - storeProps[0].Value <<= rtl::OUString( "MS Excel 97" ); + storeProps[0].Name = OUString( "FilterName" ); + storeProps[0].Value <<= OUString( "MS Excel 97" ); xStor->storeToURL( aURL, storeProps ); } @@ -279,36 +279,36 @@ ScVbaWorkbook::Names( const uno::Any& aIndex ) throw (uno::RuntimeException) { uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_SET_THROW ); uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, xModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); return uno::Any( xNames ); } -rtl::OUString +OUString ScVbaWorkbook::getServiceImplName() { - return rtl::OUString("ScVbaWorkbook"); + return OUString("ScVbaWorkbook"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorkbook::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Workbook" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Workbook" ); } return aServiceNames; } -::rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorkbook::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xModelProp( getModel(), uno::UNO_QUERY_THROW ); - return xModelProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xModelProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int64 diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 6a8f02c596ce..7288d2aa1d1b 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -56,14 +56,14 @@ public: virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException); - virtual void SAL_CALL SaveCopyAs( const rtl::OUString& Filename ) throw ( css::uno::RuntimeException); + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException); // code name - virtual ::rtl::OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index a9357fae6194..5f191ac70425 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -88,7 +88,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& { uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW ); uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW); - uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( rtl::OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance( OUString( "ooo.vba.VBAObjectModuleObjectProvider")), uno::UNO_QUERY_THROW ); // set up the module info for the workbook and sheets in the nealy created // spreadsheet ScDocument* pDoc = pShell->GetDocument(); @@ -99,20 +99,20 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& pDoc->SetCodeName( sCodeName ); } - std::vector< rtl::OUString > sDocModuleNames; + std::vector< OUString > sDocModuleNames; sDocModuleNames.push_back( sCodeName ); uno::Reference<container::XNameAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > sSheets( xSheets->getElementNames() ); + uno::Sequence< OUString > sSheets( xSheets->getElementNames() ); for ( sal_Int32 index=0; index < sSheets.getLength() ; ++index ) { sDocModuleNames.push_back( sSheets[ index ] ); } - std::vector<rtl::OUString>::iterator it_end = sDocModuleNames.end(); + std::vector<OUString>::iterator it_end = sDocModuleNames.end(); - for ( std::vector<rtl::OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) + for ( std::vector<OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it ) { script::ModuleInfo sModuleInfo; @@ -120,9 +120,9 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo ); if( xLib->hasByName( *it ) ) - xLib->replaceByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n") ) ); + xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) ); else - xLib->insertByName( *it, uno::makeAny( rtl::OUString( "Option VBASupport 1\n" ) ) ); + xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) ); } } } @@ -195,7 +195,7 @@ ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException) { uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc; sal_Int32 nWorkbookType = 0; - ::rtl::OUString aTemplateFileName; + OUString aTemplateFileName; if( Template >>= nWorkbookType ) { // nWorkbookType is a constant from XlWBATemplate (added in Excel 2007) @@ -241,19 +241,19 @@ ScVbaWorkbooks::Close() throw (uno::RuntimeException) } bool -ScVbaWorkbooks::isTextFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isTextFile( const OUString& sType ) { // will return true if the file is // a) a variant of a text file // b) a csv file // c) unknown // returning true basically means treat this like a csv file - const static rtl::OUString txtType("generic_Text"); + const static OUString txtType("generic_Text"); return sType.equals( txtType ) || sType.isEmpty(); } bool -ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) +ScVbaWorkbooks::isSpreadSheetFile( const OUString& sType ) { // include calc_QPro etc. ? ( not for the moment anyway ) if ( sType.indexOf( "calc_MS" ) == 0 @@ -263,23 +263,23 @@ ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) return false; } -rtl::OUString -ScVbaWorkbooks::getFileFilterType( const rtl::OUString& rFileName ) +OUString +ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) { - uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(::rtl::OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); + uno::Reference< document::XTypeDetection > xTypeDetect( mxContext->getServiceManager()->createInstanceWithContext(OUString("com.sun.star.document.TypeDetection"), mxContext), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aMediaDesc(1); - aMediaDesc[ 0 ].Name = rtl::OUString("URL" ); + aMediaDesc[ 0 ].Name = OUString("URL" ); aMediaDesc[ 0 ].Value <<= rFileName; - rtl::OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); + OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); return sType; } // #TODO# #FIXME# can any of the unused params below be used? uno::Any SAL_CALL -ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) +ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/, const uno::Any& ReadOnly, const uno::Any& Format, const uno::Any& /*Password*/, const uno::Any& /*WriteResPassword*/, const uno::Any& /*IgnoreReadOnlyRecommended*/, const uno::Any& /*Origin*/, const uno::Any& Delimiter, const uno::Any& /*Editable*/, const uno::Any& /*Notify*/, const uno::Any& /*Converter*/, const uno::Any& /*AddToMru*/ ) throw (uno::RuntimeException) { // we need to detect if this is a URL, if not then assume its a file path - rtl::OUString aURL; + OUString aURL; INetURLObject aObj; aObj.SetURL( rFileName ); bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID; @@ -290,7 +290,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi uno::Sequence< beans::PropertyValue > sProps(0); - rtl::OUString sType = getFileFilterType( aURL ); + OUString sType = getFileFilterType( aURL ); // A text file means it needs to be processed as a csv file if ( isTextFile( sType ) ) { @@ -304,11 +304,11 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi // 6 Custom character (see the Delimiter argument // no format means use the current delimiter sProps.realloc( 3 ); - sProps[ nIndex ].Name = rtl::OUString("FilterOptions" ); + sProps[ nIndex ].Name = OUString("FilterOptions" ); sal_Int16 delims[] = { 0 /*default not used*/, 9/*tab*/, 44/*comma*/, 32/*space*/, 59/*semicolon*/ }; - static rtl::OUString sRestOfFormat(",34,0,1" ); + static OUString sRestOfFormat(",34,0,1" ); - rtl::OUString sFormat; + OUString sFormat; sal_Int16 nFormat = 0; // default indicator @@ -317,7 +317,7 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi Format >>= nFormat; // val of nFormat overwritten if extracted // validate param if ( nFormat < 1 || nFormat > 6 ) - throw uno::RuntimeException( rtl::OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Illegal value for Format" ), uno::Reference< uno::XInterface >() ); } sal_Int16 nDelim = getCurrentDelim(); @@ -330,29 +330,29 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi { // Need to check Delimiter param if ( !Delimiter.hasValue() ) - throw uno::RuntimeException( rtl::OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); - rtl::OUString sStr; + throw uno::RuntimeException( OUString( "Expected value for Delimiter" ), uno::Reference< uno::XInterface >() ); + OUString sStr; Delimiter >>= sStr; String aUniStr( sStr ); if ( aUniStr.Len() ) nDelim = aUniStr.GetChar(0); else - throw uno::RuntimeException( rtl::OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Incorrect value for Delimiter" ), uno::Reference< uno::XInterface >() ); } getCurrentDelim() = nDelim; //set new current - sFormat = rtl::OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; + sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; - sProps[ nIndex ].Name = rtl::OUString("FilterName"); - sProps[ nIndex++ ].Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); + sProps[ nIndex ].Name = OUString("FilterName"); + sProps[ nIndex++ ].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM("Text - txt - csv (StarCalc)") ); // Ensure WORKAROUND_CSV_TXT_BUG_i60158 gets called in typedetection.cxx so // csv is forced for deep detected 'writerxxx' types - sProps[ nIndex ].Name = rtl::OUString("DocumentService"); - sProps[ nIndex ].Value <<= rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); + sProps[ nIndex ].Name = OUString("DocumentService"); + sProps[ nIndex ].Value <<= OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( !isSpreadSheetFile( sType ) ) - throw uno::RuntimeException( rtl::OUString("Bad Format"), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString("Bad Format"), uno::Reference< uno::XInterface >() ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( openDocument( rFileName, ReadOnly, sProps ), uno::UNO_QUERY_THROW ); uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, mxParent ); @@ -362,20 +362,20 @@ ScVbaWorkbooks::Open( const rtl::OUString& rFileName, const uno::Any& /*UpdateLi return aRet; } -rtl::OUString +OUString ScVbaWorkbooks::getServiceImplName() { - return rtl::OUString("ScVbaWorkbooks"); + return OUString("ScVbaWorkbooks"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWorkbooks::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Workbooks"); + sNames[0] = OUString("ooo.vba.excel.Workbooks"); } return sNames; } diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 8191006d52a4..b7e7068529db 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -32,9 +32,9 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: - rtl::OUString getFileFilterType( const rtl::OUString& rString ); - bool isTextFile( const rtl::OUString& rString ); - bool isSpreadSheetFile( const rtl::OUString& rString ); + OUString getFileFilterType( const OUString& rString ); + bool isTextFile( const OUString& rString ); + bool isSpreadSheetFile( const OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -46,13 +46,13 @@ public: // ScVbaWorkbooks_BASE virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XWorkbooks virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException); virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Open( const ::rtl::OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException); }; #endif /* SC_VBA_WORKBOOKS_HXX */ diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 7377ef8726ba..d481cee78a90 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -108,10 +108,10 @@ using namespace com::sun::star; using namespace ooo::vba; -static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) +static void getNewSpreadsheetName (OUString &aNewName, OUString aOldName, uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "getNewSpreadsheetName() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); static OUString aUnderScore( "_" ); int currentNum =2; aNewName = aOldName + aUnderScore + OUString::number(currentNum) ; @@ -122,10 +122,10 @@ static void getNewSpreadsheetName (rtl::OUString &aNewName, rtl::OUString aOldNa } } -static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, rtl::OUString aSheetName) +static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, OUString aSheetName) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "removeAllSheets() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference<sheet::XSpreadsheets> xSheets = xSpreadDoc->getSheets(); uno::Reference <container::XIndexAccess> xIndex( xSheets, uno::UNO_QUERY ); @@ -152,7 +152,7 @@ static void removeAllSheets( uno::Reference <sheet::XSpreadsheetDocument>& xSpre } static uno::Reference<frame::XModel> -openNewDoc(rtl::OUString aSheetName ) +openNewDoc(OUString aSheetName ) { uno::Reference<frame::XModel> xModel; try @@ -163,8 +163,8 @@ openNewDoc(rtl::OUString aSheetName ) uno::Reference <frame::XDesktop2 > xComponentLoader = frame::Desktop::create(xContext); uno::Reference<lang::XComponent > xComponent( xComponentLoader->loadComponentFromURL( - rtl::OUString( "private:factory/scalc" ), - rtl::OUString( "_blank" ), 0, + OUString( "private:factory/scalc" ), + OUString( "_blank" ), 0, uno::Sequence < ::com::sun::star::beans::PropertyValue >() ) ); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW ); if ( xSpreadDoc.is() ) @@ -191,7 +191,7 @@ ScVbaWorksheet::ScVbaWorksheet( uno::Sequence< uno::Any> const & args, if ( args.getLength() < 3 ) throw lang::IllegalArgumentException(); - rtl::OUString sSheetName; + OUString sSheetName; args[2] >>= sSheetName; uno::Reference< sheet::XSpreadsheetDocument > xSpreadDoc( mxModel, uno::UNO_QUERY_THROW ); @@ -214,7 +214,7 @@ const uno::Sequence<sal_Int8>& ScVbaWorksheet::getUnoTunnelId() } uno::Reference< ov::excel::XWorksheet > -ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) +ScVbaWorksheet::createSheetCopyInNewDoc(OUString aCurrSheetName) { uno::Reference< sheet::XSheetCellCursor > xSheetCellCursor = getSheet()->createCursor( ); uno::Reference<sheet::XUsedAreaCursor> xUsedCursor(xSheetCellCursor,uno::UNO_QUERY_THROW); @@ -235,7 +235,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) uno::Reference< sheet::XSpreadsheet > xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW); ScDocShell* pShell = excel::getDocShell( xModel ); - rtl::OUString aCodeName; + OUString aCodeName; pShell->GetDocument()->GetCodeName( 0, aCodeName ); return uno::Reference< excel::XWorksheet >( getUnoDocModule( aCodeName, pShell ), uno::UNO_QUERY_THROW ); } @@ -243,7 +243,7 @@ ScVbaWorksheet::createSheetCopyInNewDoc(rtl::OUString aCurrSheetName) css::uno::Reference< ov::excel::XWorksheet > ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool bAfter) { - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); ScVbaWorksheet* pDestSheet = excel::getImplFromDocModuleWrapper<ScVbaWorksheet>( xSheet ); uno::Reference <sheet::XSpreadsheetDocument> xDestDoc( pDestSheet->getModel(), uno::UNO_QUERY ); @@ -251,7 +251,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool b SCTAB nDest = 0; SCTAB nSrc = 0; - rtl::OUString aSheetName = xSheet->getName(); + OUString aSheetName = xSheet->getName(); bool bSameDoc = ( pDestSheet->getModel() == getModel() ); bool bDestSheetExists = ScVbaWorksheets::nameExists (xDestDoc, aSheetName, nDest ); bool bSheetExists = ScVbaWorksheets::nameExists (xSrcDoc, aCurrSheetName, nSrc ); @@ -282,7 +282,7 @@ ScVbaWorksheet::createSheetCopy(uno::Reference<excel::XWorksheet> xSheet, bool b return xNewSheet; } -::rtl::OUString +OUString ScVbaWorksheet::getName() throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); @@ -290,7 +290,7 @@ ScVbaWorksheet::getName() throw (uno::RuntimeException) } void -ScVbaWorksheet::setName(const ::rtl::OUString &rName ) throw (uno::RuntimeException) +ScVbaWorksheet::setName(const OUString &rName ) throw (uno::RuntimeException) { uno::Reference< container::XNamed > xNamed( getSheet(), uno::UNO_QUERY_THROW ); xNamed->setName( rName ); @@ -362,7 +362,7 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException) return excel::XlEnableSelection::xlNoSelection; } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -374,7 +374,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx (nSelection != excel::XlEnableSelection::xlUnlockedCells) && (nSelection != excel::XlEnableSelection::xlNoSelection) ) { - DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() ); + DebugHelper::exception(SbERR_BAD_PARAMETER, OUString() ); } uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); @@ -403,7 +403,7 @@ ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeEx } } else - throw uno::RuntimeException(::rtl::OUString( "Sheet Name does not exist. "), + throw uno::RuntimeException(OUString( "Sheet Name does not exist. "), uno::Reference< XInterface >() ); } @@ -517,7 +517,7 @@ sal_Bool ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) { SCTAB nTab = 0; - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); bool bSheetExists = ScVbaWorksheets::nameExists (xSpreadDoc, aSheetName, nTab); if ( bSheetExists ) @@ -555,7 +555,7 @@ void ScVbaWorksheet::Move( const uno::Any& Before, const uno::Any& After ) throw (uno::RuntimeException) { uno::Reference<excel::XWorksheet> xSheet; - rtl::OUString aCurrSheetName = getName(); + OUString aCurrSheetName = getName(); if (!(Before >>= xSheet) && !(After >>=xSheet)&& !(Before.hasValue()) && !(After.hasValue())) { @@ -617,7 +617,7 @@ void ScVbaWorksheet::Delete() throw (uno::RuntimeException) { uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW ); - rtl::OUString aSheetName = getName(); + OUString aSheetName = getName(); if ( xSpreadDoc.is() ) { SCTAB nTab = 0; @@ -667,7 +667,7 @@ ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObje // #TODO# #FIXME# is there anything we can do witht the unused param // can the implementation use anything else here uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->protect( aPasswd ); } @@ -676,7 +676,7 @@ void ScVbaWorksheet::Unprotect( const uno::Any& Password ) throw (uno::RuntimeException) { uno::Reference<util::XProtectable > xProtectable(getSheet(), uno::UNO_QUERY_THROW); - ::rtl::OUString aPasswd; + OUString aPasswd; Password >>= aPasswd; xProtectable->unprotect( aPasswd ); } @@ -700,7 +700,7 @@ void ScVbaWorksheet::CheckSpelling( const uno::Any& /*CustomDictionary*/,const uno::Any& /*IgnoreUppercase*/,const uno::Any& /*AlwaysSuggest*/, const uno::Any& /*SpellingLang*/ ) throw (uno::RuntimeException) { // #TODO# #FIXME# unused params above, can we do anything with those - rtl::OUString url = rtl::OUString( ".uno:SpellDialog"); + OUString url = OUString( ".uno:SpellDialog"); uno::Reference< frame::XModel > xModel( getModel() ); dispatchRequests(xModel,url); } @@ -802,7 +802,7 @@ ScVbaWorksheet::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeExceptio // #163498# initialize Names object with correct parent (this worksheet) // TODO: real sheet-local names... uno::Reference< beans::XPropertySet > xProps( mxModel, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); + uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( OUString("NamedRanges") ), uno::UNO_QUERY_THROW ); uno::Reference< XCollection > xNames( new ScVbaNames( this, mxContext, xNamedRanges, mxModel ) ); if ( aIndex.hasValue() ) return uno::Any( xNames->Item( aIndex, uno::Any() ) ); @@ -913,7 +913,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException) +ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException) { // #TODO Evaluate allows other things to be evaluated, e.g. functions // I think ( like SIN(3) etc. ) need to investigate that @@ -930,32 +930,32 @@ ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWorksheet::invoke( const ::rtl::OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { OSL_TRACE("** ScVbaWorksheet::invoke( %s ), will barf", - rtl::OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() ); throw uno::RuntimeException(); // unsupported operation } void SAL_CALL -ScVbaWorksheet::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWorksheet::setValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { setDefaultPropByIntrospection( uno::makeAny( getValue( aPropertyName ) ), aValue ); } uno::Any SAL_CALL -ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWorksheet::getValue( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW ); uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( OUString( "ooo.vba.ControlProvider" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) ); return uno::makeAny( xControl ); } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) +ScVbaWorksheet::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException) { return false; } @@ -984,7 +984,7 @@ ScVbaWorksheet::getFormControls() } ::sal_Bool SAL_CALL -ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) +ScVbaWorksheet::hasProperty( const OUString& aName ) throw (uno::RuntimeException) { uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) @@ -993,7 +993,7 @@ ScVbaWorksheet::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeE } uno::Any -ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) +ScVbaWorksheet::getControlShape( const OUString& sName ) { // ideally we would get an XControl object but it appears an XControl // implementation only exists for a Control implementation optained from the @@ -1026,10 +1026,10 @@ ScVbaWorksheet::getControlShape( const ::rtl::OUString& sName ) } -rtl::OUString +OUString ScVbaWorksheet::getServiceImplName() { - return rtl::OUString("ScVbaWorksheet"); + return OUString("ScVbaWorksheet"); } void SAL_CALL @@ -1045,23 +1045,23 @@ ScVbaWorksheet::getEnableCalculation( ) throw (css::script::BasicErrorException return xCalculatable->isAutomaticCalculationEnabled(); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWorksheet::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.Worksheet" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.Worksheet" ); } return aServiceNames; } -rtl::OUString SAL_CALL +OUString SAL_CALL ScVbaWorksheet::getCodeName() throw (css::uno::RuntimeException) { uno::Reference< beans::XPropertySet > xSheetProp( mxSheet, uno::UNO_QUERY_THROW ); - return xSheetProp->getPropertyValue( ::rtl::OUString( "CodeName" ) ).get< ::rtl::OUString >(); + return xSheetProp->getPropertyValue( OUString( "CodeName" ) ).get< OUString >(); } sal_Int16 diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 53efc595db1f..c3e40110dfdb 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -61,7 +61,7 @@ class ScVbaWorksheet : public WorksheetImpl_BASE css::uno::Reference< ov::excel::XRange > getSheetRange() throw (css::uno::RuntimeException); css::uno::Reference< css::container::XNameAccess > getFormControls(); - css::uno::Any getControlShape( const rtl::OUString& sName ); + css::uno::Any getControlShape( const OUString& sName ); public: ScVbaWorksheet( const css::uno::Reference< ov::XHelperInterface >& xParent, @@ -77,12 +77,12 @@ public: virtual css::uno::Reference< css::sheet::XSpreadsheet > getSheet() { return mxSheet; } static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); - css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( rtl::OUString); + css::uno::Reference< ov::excel::XWorksheet > createSheetCopyInNewDoc( OUString); css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); // Attributes - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString &rName ) throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException); virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException); @@ -123,7 +123,7 @@ public: virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException); @@ -147,19 +147,19 @@ public: virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException); // XInvocation virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException); // CodeName - virtual rtl::OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException); sal_Int16 getSheetID() throw (css::uno::RuntimeException); virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); // XUnoTunnel virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException); }; diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 3986dcab2700..581f14f030e3 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -93,16 +93,16 @@ public: virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return sheet::XSpreadsheet::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mSheetMap.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { - uno::Sequence< rtl::OUString > sNames( mSheetMap.size() ); - rtl::OUString* pString = sNames.getArray(); + uno::Sequence< OUString > sNames( mSheetMap.size() ); + OUString* pString = sNames.getArray(); SheetMap::iterator it = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -113,7 +113,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException) { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -221,7 +221,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, if ( isSelectedSheets() ) return uno::Any(); // or should we throw? - rtl::OUString aStringSheet; + OUString aStringSheet; sal_Bool bBefore(sal_True); SCTAB nSheetIndex = 0; SCTAB nNewSheets = 1, nType = 0; @@ -361,7 +361,7 @@ ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeExcep } } else - throw uno::RuntimeException( rtl::OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Visible property doesn't support non boolean #FIXME" ), uno::Reference< uno::XInterface >() ); } void SAL_CALL @@ -369,7 +369,7 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException) { ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel ); if ( !pViewShell ) - throw uno::RuntimeException( rtl::OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); + throw uno::RuntimeException( OUString( "Cannot obtain view shell" ), uno::Reference< uno::XInterface >() ); ScMarkData& rMarkData = pViewShell->GetViewData()->GetMarkData(); sal_Bool bReplace = sal_True; @@ -465,33 +465,33 @@ ScVbaWorksheets::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (u } uno::Any -ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException) +ScVbaWorksheets::getItemByStringIndex( const OUString& sIndex ) throw (uno::RuntimeException) { return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex ); } -rtl::OUString +OUString ScVbaWorksheets::getServiceImplName() { - return rtl::OUString("ScVbaWorksheets"); + return OUString("ScVbaWorksheets"); } -css::uno::Sequence<rtl::OUString> +css::uno::Sequence<OUString> ScVbaWorksheets::getServiceNames() { - static uno::Sequence< rtl::OUString > sNames; + static uno::Sequence< OUString > sNames; if ( sNames.getLength() == 0 ) { sNames.realloc( 1 ); - sNames[0] = rtl::OUString("ooo.vba.excel.Worksheets"); + sNames[0] = OUString("ooo.vba.excel.Worksheets"); } return sNames; } -bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) +bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException ) { if (!xSpreadDoc.is()) - throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); + throw lang::IllegalArgumentException( OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 ); uno::Reference <container::XIndexAccess> xIndex( xSpreadDoc->getSheets(), uno::UNO_QUERY ); if ( xIndex.is() ) { diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index e011c43ff67e..61e6a52bfa6e 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -40,7 +40,7 @@ class ScVbaWorksheets : public ScVbaWorksheets_BASE css::uno::Reference< css::sheet::XSpreadsheets > m_xSheets; protected: // ScVbaWorksheets_BASE - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); public: ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xSheets, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XEnumerationAccess >& xEnum, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -66,10 +66,10 @@ public: // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); - static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); + static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); }; #endif /* SC_VBA_WORKSHEETS_HXX */ diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 4f507edfd91e..e629922fe88f 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -78,7 +78,7 @@ ScVbaWSFunction::getIntrospection(void) throw(uno::RuntimeException) } uno::Any SAL_CALL -ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno::Any >& Params, uno::Sequence< sal_Int16 >& /*OutParamIndex*/, uno::Sequence< uno::Any >& /*OutParam*/) throw(lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { // create copy of parameters, replace Excel range objects with UNO range objects uno::Sequence< uno::Any > aParamTemp( Params ); @@ -122,9 +122,9 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } - else if ( aType.equals( getCppuType( (uno::Sequence<rtl::OUString>*)0 ) ) ) + else if ( aType.equals( getCppuType( (uno::Sequence<OUString>*)0 ) ) ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aTmp(1); + uno::Sequence< uno::Sequence< OUString > > aTmp(1); (*pArray) >>= aTmp[ 0 ]; (*pArray) <<= aTmp; } @@ -139,7 +139,7 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< default: break; } - OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), rtl::OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("Param[%d] is %s", (int)(pArray - aParamTemp.getConstArray()), OUStringToOString( comphelper::anyToString( *pArray ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -179,10 +179,10 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< { uno::Reference< lang::XMultiComponentFactory > xSMgr( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); uno::Reference< sheet::XFunctionAccess > xFunctionAccess( xSMgr->createInstanceWithContext( - ::rtl::OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), + OUString( "com.sun.star.sheet.FunctionAccess" ), mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropSet( xFunctionAccess, uno::UNO_QUERY_THROW ); - xPropSet->setPropertyValue( ::rtl::OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); + xPropSet->setPropertyValue( OUString( "IsArrayFunction" ), uno::Any( bAsArray ) ); aRet = xFunctionAccess->callFunction( FunctionName, aParamTemp ); } @@ -245,19 +245,19 @@ ScVbaWSFunction::invoke(const rtl::OUString& FunctionName, const uno::Sequence< } void SAL_CALL -ScVbaWSFunction::setValue(const rtl::OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) +ScVbaWSFunction::setValue(const OUString& /*PropertyName*/, const uno::Any& /*Value*/) throw(beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } uno::Any SAL_CALL -ScVbaWSFunction::getValue(const rtl::OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) +ScVbaWSFunction::getValue(const OUString& /*PropertyName*/) throw(beans::UnknownPropertyException, uno::RuntimeException) { throw beans::UnknownPropertyException(); } sal_Bool SAL_CALL -ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeException) +ScVbaWSFunction::hasMethod(const OUString& Name) throw(uno::RuntimeException) { sal_Bool bIsFound = false; try @@ -277,34 +277,34 @@ ScVbaWSFunction::hasMethod(const rtl::OUString& Name) throw(uno::RuntimeExcepti } sal_Bool SAL_CALL -ScVbaWSFunction::hasProperty(const rtl::OUString& /*Name*/) throw(uno::RuntimeException) +ScVbaWSFunction::hasProperty(const OUString& /*Name*/) throw(uno::RuntimeException) { return false; } -::rtl::OUString SAL_CALL -ScVbaWSFunction::getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException) +OUString SAL_CALL +ScVbaWSFunction::getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException) { - rtl::OUString sName = aApproximateName.toAsciiUpperCase(); + OUString sName = aApproximateName.toAsciiUpperCase(); if ( !hasMethod( sName ) ) - return rtl::OUString(); + return OUString(); return sName; } -rtl::OUString +OUString ScVbaWSFunction::getServiceImplName() { - return rtl::OUString("ScVbaWSFunction"); + return OUString("ScVbaWSFunction"); } -uno::Sequence< rtl::OUString > +uno::Sequence< OUString > ScVbaWSFunction::getServiceNames() { - static uno::Sequence< rtl::OUString > aServiceNames; + static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) { aServiceNames.realloc( 1 ); - aServiceNames[ 0 ] = rtl::OUString("ooo.vba.excel.WorksheetFunction" ); + aServiceNames[ 0 ] = OUString("ooo.vba.excel.WorksheetFunction" ); } return aServiceNames; } diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index cf6b439bd844..ce0f3cd87a91 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -35,15 +35,15 @@ public: virtual ~ScVbaWSFunction(){} virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL invoke(const rtl::OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual void SAL_CALL setValue(const rtl::OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getValue(const rtl::OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasMethod(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasProperty(const rtl::OUString& Name) throw(css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExactName( const ::rtl::OUString& aApproximateName ) throw (css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException); // XHelperInterface - virtual rtl::OUString getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual OUString getServiceImplName(); + virtual css::uno::Sequence<OUString> getServiceNames(); }; #endif |