diff options
| -rw-r--r-- | uui/source/iahndl.cxx | 57 | ||||
| -rw-r--r-- | uui/source/iahndl.hxx | 7 | ||||
| -rw-r--r-- | uui/source/ids.hrc | 6 | ||||
| -rw-r--r-- | uui/source/ids.src | 30 | ||||
| -rw-r--r-- | uui/util/uui.xml | 1 |
5 files changed, 10 insertions, 91 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 0ebccede0333..afc7ca92e24c 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: sb $ $Date: 2001-08-29 13:41:20 $ + * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,9 +130,6 @@ #ifndef _COM_SUN_STAR_UCB_INTERACTIVECHAOSEXCEPTION_HPP_ #include "com/sun/star/ucb/InteractiveCHAOSException.hpp" #endif -#ifndef _COM_SUN_STAR_UCB_INTERACTIVEFILEIOEXCEPTION_HPP_ -#include "com/sun/star/ucb/InteractiveFileIOException.hpp" -#endif #ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKCONNECTEXCEPTION_HPP_ #include "com/sun/star/ucb/InteractiveNetworkConnectException.hpp" #endif @@ -312,23 +309,6 @@ bool ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString) return true; } -//TODO! should be part of rtl::OUString (and optimized when rOld is char *) -rtl::OUString replace(rtl::OUString const & rOriginal, - rtl::OUString const & rOld, - rtl::OUString const & rNew) -{ - rtl::OUString aResult(rOriginal); - for (sal_Int32 i = 0;;) - { - i = aResult.indexOf(rOld, i); - if (i == -1) - break; - aResult = aResult.replaceAt(i, rOld.getLength(), rNew); - i += rNew.getLength(); - } - return aResult; -} - void getContinuations( star::uno::Sequence< star::uno::Reference< @@ -542,30 +522,6 @@ UUIInteractionHandler::handle( star::ucb::InteractiveIOException aIoException; if (aAnyRequest >>= aIoException) { - rtl::OUString aContext; - star::ucb::InteractiveFileIOException aFileIoException; - if (aAnyRequest >>= aFileIoException) - { - //TODO! context string should rather be passed to the - // interaction handler upon initialization... - - { - //TODO! use SimpleResMgr instead? - vos::OGuard aGuard(Application::GetSolarMutex()); - std::auto_ptr< ResMgr > - xManager(ResMgr::CreateResMgr( - CREATEVERSIONRESMGR_NAME(uui))); - aContext - = UniString(ResId(STR_ERROR_FILEIO, xManager.get())); - } - aContext = replace(aContext, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( - "($URL1)")), - aFileIoException.FileName); - } - else - aContext = getContextProperty(); - star::uno::Sequence< star::uno::Any > aRequestArguments; star::ucb::InteractiveAugmentedIOException aAugmentedIoException; if (aAnyRequest >>= aAugmentedIoException) @@ -807,7 +763,6 @@ UUIInteractionHandler::handle( } handleErrorRequest(aIoException.Classification, - aContext, nErrorCode, aArguments, rRequest->getContinuations()); @@ -850,7 +805,6 @@ UUIInteractionHandler::handle( else nErrorCode = ERRCODE_INET_GENERAL; handleErrorRequest(aNetworkException.Classification, - getContextProperty(), nErrorCode, aArguments, rRequest->getContinuations()); @@ -871,7 +825,6 @@ UUIInteractionHandler::handle( for (sal_Int32 i = 0; i < nCount; ++i) aArguments.push_back(aChaosException.Arguments[i]); handleErrorRequest(aChaosException.Classification, - getContextProperty(), aChaosException.ID, aArguments, rRequest->getContinuations()); @@ -886,7 +839,6 @@ UUIInteractionHandler::handle( std::vector< rtl::OUString > aArguments; aArguments.push_back(UniString::CreateFromInt32(nMedium + 1)); handleErrorRequest(aWrongMediumException.Classification, - getContextProperty(), ERRCODE_UUI_WRONGMEDIUM, aArguments, rRequest->getContinuations()); @@ -927,7 +879,6 @@ UUIInteractionHandler::handle( LowestSupportedVersion); } handleErrorRequest(star::task::InteractionClassification_ERROR, - getContextProperty(), nErrorCode, aArguments, rRequest->getContinuations()); @@ -947,7 +898,6 @@ UUIInteractionHandler::handle( aArguments.push_back(aBadPartnershipException.Partnership); } handleErrorRequest(star::task::InteractionClassification_ERROR, - getContextProperty(), nErrorCode, aArguments, rRequest->getContinuations()); @@ -1564,7 +1514,6 @@ UUIInteractionHandler::handleCookiesRequest( void UUIInteractionHandler::handleErrorRequest( star::task::InteractionClassification eClassification, - rtl::OUString const & rContext, ErrCode nErrorCode, std::vector< rtl::OUString > const & rArguments, star::uno::Sequence< star::uno::Reference< @@ -1632,7 +1581,7 @@ UUIInteractionHandler::handleErrorRequest( return; //TODO! remove this backwards compatibility? - rtl::OUString aContext(rContext); + rtl::OUString aContext(getContextProperty()); if (aContext.getLength() == 0 && nErrorCode != 0) { vos::OGuard aGuard(Application::GetSolarMutex()); diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 7f0d6d0410b0..e57cd39659df 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: iahndl.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sb $ $Date: 2001-08-24 13:14:09 $ + * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -253,9 +253,6 @@ private: void handleErrorRequest( com::sun::star::task::InteractionClassification eClassification, - rtl::OUString const & rContext, - //TODO! only InteractiveFileIOException needs to override the - // context (otherwise, it could be removed from this interface) ErrCode nErrorCode, std::vector< rtl::OUString > const & rArguments, com::sun::star::uno::Sequence< diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index fb1b987d8e5d..726f24e0ee85 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -2,9 +2,9 @@ * * $RCSfile: ids.hrc,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: sb $ $Date: 2001-08-29 13:41:21 $ + * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ #define STR_COOKIES_SEND_START (RID_UUI_START + 7) #define STR_COOKIES_SEND_COOKIES (RID_UUI_START + 8) #define STR_COOKIES_SEND_TITLE (RID_UUI_START + 9) -#define STR_ERROR_FILEIO (RID_UUI_START + 10) +// RID_UUI_START + 10 removed // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM #define DLG_UUI_PASSWORD (RID_UUI_START + 12) #define STR_ERROR_PASSWORDS_NOT_IDENTICAL (RID_UUI_START + 13) diff --git a/uui/source/ids.src b/uui/source/ids.src index 3e8655d744a7..c5a7705b9433 100644 --- a/uui/source/ids.src +++ b/uui/source/ids.src @@ -2,9 +2,9 @@ * * $RCSfile: ids.src,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: sb $ $Date: 2001-08-29 13:41:21 $ + * last change: $Author: sb $ $Date: 2001-08-31 13:08:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,32 +121,6 @@ String RID_SAVE_PASSWORD Text[ finnish ] = "~Muista salasana"; }; -String STR_ERROR_FILEIO -{ - Text = "Fehler beim Zugriff auf die Datei ($URL1)"; - Text[english] = "Error accessing file ($URL1)"; - Text[ arabic ] = " ($URL1)"; - Text[ chinese_simplified ] = "在读取文件($URL1)时发生错误"; - Text[ chinese_traditional ] = "存取檔案 ($URL1) 發生錯誤"; - Text[ danish ] = "Fejl ved adgang til filen ($URL1)"; - Text[ dutch ] = "Fout bij toegang tot bestand ($URL1)"; - Text[ english_us ] = "Error accessing file ($URL1)"; - Text[ french ] = "Erreur lors de l'accs au fichier ($URL1)"; - Text[ greek ] = " ($URL1)"; - Text[ italian ] = "Errore di accesso al file ($URL1)"; - Text[ japanese ] = "($URL1) ﾌｧｲﾙへｱｸｾｽする際のｴﾗｰ"; - Text[ korean ] = "파일 ($URL1)에 접근시에 오류"; - Text[ polish ] = "Bd przy dostpie do pliku ($URL1)"; - Text[ portuguese ] = "Erro de acesso ao ficheiro ($URL1)"; - Text[ portuguese_brazilian ] = "Error accessing file ($URL1)"; - Text[ russian ] = " ($URL1)"; - Text[ spanish ] = "Error de acceso al archivo ($URL1)"; - Text[ swedish ] = "Fel vid tkomst till filen ($URL1)"; - Text[ turkish ] = "Error accessing file ($URL1)"; - Text[ catalan ] = "Error de acceso al archivo ($URL1)"; - Text[ finnish ] = "On ilmennyt virhe kytettess tiedostoa ($URL1)"; -}; - Resource RID_UUI_ERRHDL { String (ERRCODE_UUI_IO_ABORT & ERRCODE_RES_MASK) diff --git a/uui/util/uui.xml b/uui/util/uui.xml index 71cfb02dd70c..f193759f2ffc 100644 --- a/uui/util/uui.xml +++ b/uui/util/uui.xml @@ -61,7 +61,6 @@ <type>com.sun.star.ucb.HandleCookiesRequest</type> <type>com.sun.star.ucb.InteractiveAugmentedIOException</type> <type>com.sun.star.ucb.InteractiveCHAOSException</type> - <type>com.sun.star.ucb.InteractiveFileIOException</type> <type>com.sun.star.ucb.InteractiveNetworkConnectException</type> <type>com.sun.star.ucb.InteractiveNetworkException</type> <type>com.sun.star.ucb.InteractiveNetworkGeneralException</type> |