diff options
| author | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-12 20:42:03 +0200 |
|---|---|---|
| committer | Christina Rossmanith <ChrRossmanith@web.de> | 2011-04-12 20:42:49 +0200 |
| commit | 5c621892f834422513caee4d96d6f335d4132589 (patch) | |
| tree | d0f1106443d62227a479943405a71a8acc719e38 /basic | |
| parent | c0652ef108ad0de4536c51ca060724232d84ddb8 (diff) | |
Finished removal of _USE_UNO
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 97106afaf8..4901862798 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -243,9 +243,7 @@ int BasicApp::Main( ) try { -#ifdef _USE_UNO uno::Reference< XContentProviderManager > xUcb = InitializeUCB(); -#endif { DirEntry aIniPath( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) ); diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 9caeff78fd..8759f9dda5 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -171,8 +171,6 @@ void SbiStream::MapError() } } -#ifdef _USE_UNO - // TODO: Code is copied from daemons2/source/uno/asciiEncoder.cxx ::rtl::OUString findUserInDescription( const ::rtl::OUString& aDescription ) @@ -205,15 +203,11 @@ void SbiStream::MapError() return user; } -#endif - - // Hack for #83750 sal_Bool runsInSetup( void ); sal_Bool needSecurityRestrictions( void ) { -#ifdef _USE_UNO static sal_Bool bNeedInit = sal_True; static sal_Bool bRetVal = sal_True; @@ -290,9 +284,6 @@ sal_Bool needSecurityRestrictions( void ) } return bRetVal; -#else - return sal_False; -#endif } // Returns sal_True if UNO is available, otherwise the old file @@ -300,7 +291,6 @@ sal_Bool needSecurityRestrictions( void ) // #89378 New semantic: Don't just ask for UNO but for UCB sal_Bool hasUno( void ) { -#ifdef _USE_UNO static sal_Bool bNeedInit = sal_True; static sal_Bool bRetVal = sal_True; @@ -326,9 +316,6 @@ sal_Bool hasUno( void ) } } return bRetVal; -#else - return sal_False; -#endif } @@ -421,8 +408,6 @@ void OslStream::SetSize( sal_uIntPtr nSize ) } -#ifdef _USE_UNO - class UCBStream : public SvStream { Reference< XInputStream > xIS; @@ -585,7 +570,6 @@ void UCBStream::SetSize( sal_uIntPtr nSize ) SetError( ERRCODE_IO_GENERAL ); } -#endif // Oeffnen eines Streams SbError SbiStream::Open @@ -601,7 +585,6 @@ SbError SbiStream::Open String aStr( rName, gsl_getSystemTextEncoding() ); String aNameStr = getFullPath( aStr ); -#ifdef _USE_UNO if( hasUno() ) { Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory(); @@ -646,7 +629,6 @@ SbError SbiStream::Open } } -#endif if( !pStrm ) { pStrm = new OslStream( aNameStr, nStrmMode ); |