diff options
| author | obo <obo@openoffice.org> | 2010-06-14 15:08:15 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-14 15:08:15 +0200 |
| commit | 4f8b5956e864b62001117c22e84f9e883397b145 (patch) | |
| tree | 96fa1ea6f8bb338601f781af7d3cf20602632a3d /uui | |
| parent | d63595b8f91f6dbe9a1cf05892ef98cb118fb4b2 (diff) | |
| parent | cfe1ec924623e90fab8aa7ba122399e333e0c96b (diff) | |
CWS-TOOLING: integrate CWS dv12
Diffstat (limited to 'uui')
| -rwxr-xr-x[-rw-r--r--] | uui/source/iahndl.cxx | 24 | ||||
| -rwxr-xr-x[-rw-r--r--] | uui/source/iahndl.hxx | 3 |
2 files changed, 18 insertions, 9 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 2c1d4d7395..e90a064993 100644..100755 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -868,14 +868,15 @@ UUIInteractionHelper::handleRequest_impl( return true; // @@@ Todo #i29340#: activate! -// ucb::NameClashResolveRequest aNameClashResolveRequest; -// if (aAnyRequest >>= aNameClashResolveRequest) -// { -// handleNameClashResolveRequest(aNameClashResolveRequest, -// rRequest->getContinuations()); -// return true; -// } - +#if 0 + ucb::NameClashResolveRequest aNameClashResolveRequest; + if (aAnyRequest >>= aNameClashResolveRequest) + { + handleNameClashResolveRequest(aNameClashResolveRequest, + rRequest->getContinuations()); + return true; + } +#endif if ( handleMasterPasswordRequest( rRequest ) ) return true; @@ -1187,6 +1188,8 @@ executeMessageBox( return aResult; } +// @@@ Todo #i29340#: activate! +#if 0 enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; NameClashResolveDialogResult @@ -1214,9 +1217,11 @@ executeSimpleNameClashResolveDialog( "executeSimpleNameClashResolveDialog not yet implemented!" ); return ABORT; } - +#endif } // namespace +// @@@ Todo #i29340#: activate! +#if 0 void UUIInteractionHelper::handleNameClashResolveRequest( ucb::NameClashResolveRequest const & rRequest, @@ -1284,6 +1289,7 @@ UUIInteractionHelper::handleNameClashResolveRequest( break; } } +#endif void UUIInteractionHelper::handleGenericErrorRequest( diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index b77032e3cf..0f54e9ee8a 100644..100755 --- 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( |