summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2022-05-04 19:02:52 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2022-05-05 10:50:45 +0200
commit08c979e235aa993f50e54224f8c715bb70697c33 (patch)
tree20e44f55e677a01ea023e74e59808561945408aa
parentcb64a52afc92891ab853b9bb1294610bb9ca98d0 (diff)
sfx2: remove misplaced try-catch
The exception is actually caught in an inner catch block; it was like this already when added in commit b4576f3da4d90139fc5140962d13cb91dab98797. Change-Id: I054c59493efe7d2d69877559b048bcf3c1f173e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133837 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sfx2/source/doc/docfile.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f38fcfc70fad..131fbf30a4c4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1270,7 +1270,6 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
if (!IsWebDAVLockingUsed())
return LockFileResult::Succeeded;
- try
{
bool bResult = pImpl->m_bLocked;
bool bIsTemplate = false;
@@ -1362,7 +1361,9 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
// exception available
}
catch( uno::Exception& )
- {}
+ {
+ TOOLS_WARN_EXCEPTION( "sfx.doc", "Locking exception: WebDAV while trying to lock the file" );
+ }
}
} while( !bResult && bUIStatus == ShowLockResult::Try );
}
@@ -1388,10 +1389,6 @@ SfxMedium::LockFileResult SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
if ( bResult )
eResult = LockFileResult::Succeeded;
}
- catch ( const uno::Exception& )
- {
- TOOLS_WARN_EXCEPTION( "sfx.doc", "Locking exception: WebDAV while trying to lock the file" );
- }
return eResult;
}