diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | ca39c0ee5fb571693f96fe32f55b814d74e5b756 (patch) | |
| tree | 61059dca291da35c9eac7e275d0866598eeff2ee /basic | |
| parent | 9e1f58bf469984c19cd60031074eb60da56453a2 (diff) | |
| parent | d974d2ada8a61acf48fb0a9e3e4fa4744016dcda (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index aeeb46acc4d7..558a01353fbd 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -243,8 +243,8 @@ int BasicApp::Main( ) try { + // this line is not ( afaics ) necessary ( remove from master ) uno::Reference< XContentProviderManager > xUcb = InitializeUCB(); - { 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 f4dc783ee878..b71558b0fb7e 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -570,7 +570,6 @@ void UCBStream::SetSize( sal_uIntPtr nSize ) SetError( ERRCODE_IO_GENERAL ); } - // Oeffnen eines Streams SbError SbiStream::Open ( short nCh, const ByteString& rName, short nStrmMode, short nFlags, short nL ) |