diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-12 18:57:32 -0600 |
| commit | 9cd038e5b89c978ea24ba7efa7c3152801190455 (patch) | |
| tree | 7d938fd9373eb827095787955e2feffca942b8fd /uui | |
| parent | e65c0fe553a9d1b85dcacfff7af9df8231427876 (diff) | |
fix mis-merge all-around.
Diffstat (limited to 'uui')
| -rwxr-xr-x | uui/source/iahndl.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index f45eb2f167a4..f02a6a07fb12 100755 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -216,6 +216,15 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); + void + handleNameClashResolveRequest( + com::sun::star::ucb::NameClashResolveRequest const & rRequest, + com::sun::star::uno::Sequence< + com::sun::star::uno::Reference< + com::sun::star::task::XInteractionContinuation > > const & + rContinuations) + SAL_THROW((com::sun::star::uno::RuntimeException)); + bool handleMasterPasswordRequest( com::sun::star::uno::Reference< |