diff options
| author | Dirk Voelzke <dv@openoffice.org> | 2010-07-01 08:50:48 +0200 |
|---|---|---|
| committer | Dirk Voelzke <dv@openoffice.org> | 2010-07-01 08:50:48 +0200 |
| commit | 31a03a0a01cb6444883fa8fab59c71dad3da093c (patch) | |
| tree | 1c03f23656e6434152eaa70c137b228fc657d130 /uui/source/iahndl.hxx | |
| parent | f2d46d70f58a92542e9c4e7d54fb8e32d0369012 (diff) | |
| parent | a2e7c2e0d002d75a6b77a629a4e904ab54bf8375 (diff) | |
dv19: merge with DEV300_m84
Diffstat (limited to 'uui/source/iahndl.hxx')
| -rw-r--r-- | uui/source/iahndl.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 6402653d3bda..581099462845 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -215,6 +215,8 @@ private: com::sun::star::task::XInteractionRequest > const & rRequest) SAL_THROW((com::sun::star::uno::RuntimeException)); +// @@@ Todo #i29340#: activate! +#if 0 void handleNameClashResolveRequest( com::sun::star::ucb::NameClashResolveRequest const & rRequest, @@ -223,6 +225,7 @@ private: com::sun::star::task::XInteractionContinuation > > const & rContinuations) SAL_THROW((com::sun::star::uno::RuntimeException)); +#endif bool handleMasterPasswordRequest( |