[Libreoffice-commits] .: Branch 'libreoffice-3-4' - basic/source

[Noel Power]

 basic/source/app/app.cxx       |    4 +---
 basic/source/runtime/iosys.cxx |   16 ----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 4e019509ca8a17a81f71141157ed240ed827fccb
Author: Noel Power <noel.power at novell.com>
Date:   Fri May 6 14:46:17 2011 +0100

    fix for fdo#36898
    
    remove some extra _USE_UNO #ifdef(s) that should have been removed when the associated define _USE_UNO was removed

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 97106af..b40576e 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -243,10 +243,8 @@ int BasicApp::Main( )
 
     try
     {
-#ifdef _USE_UNO
+    // this line is not ( afaics ) necessary  ( remove from master )
     uno::Reference< XContentProviderManager > xUcb = InitializeUCB();
-#endif
-
     {
         DirEntry aIniPath( Config::GetConfigName( Config::GetDefDirectory(), CUniString("testtool") ) );
         if ( !aIniPath.Exists() )
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 9caeff7..fb24685 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,7 +203,6 @@ void SbiStream::MapError()
     return user;
 }
 
-#endif
 
 
 // Hack for #83750
@@ -213,7 +210,6 @@ 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 +286,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 +293,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 +318,6 @@ sal_Bool hasUno( void )
         }
     }
     return bRetVal;
-#else
-    return sal_False;
-#endif
 }
 
 
@@ -421,7 +410,6 @@ void OslStream::SetSize( sal_uIntPtr nSize )
 }
 
 
-#ifdef _USE_UNO
 
 class UCBStream : public SvStream
 {
@@ -585,8 +573,6 @@ void	UCBStream::SetSize( sal_uIntPtr nSize )
     SetError( ERRCODE_IO_GENERAL );
 }
 
-#endif
-
 // Oeffnen eines Streams
 SbError SbiStream::Open
 ( short nCh, const ByteString& rName, short nStrmMode, short nFlags, short nL )
@@ -601,7 +587,6 @@ SbError SbiStream::Open
     String aStr( rName, gsl_getSystemTextEncoding() );
     String aNameStr = getFullPath( aStr );
 
-#ifdef _USE_UNO
     if( hasUno() )
     {
         Reference< XMultiServiceFactory > xSMgr = getProcessServiceFactory();
@@ -646,7 +631,6 @@ SbError SbiStream::Open
         }
     }
 
-#endif
     if( !pStrm )
     {
         pStrm = new OslStream( aNameStr, nStrmMode );