diff options
Diffstat (limited to 'extensions/source/update/check/updatehdl.hxx')
| -rw-r--r-- | extensions/source/update/check/updatehdl.hxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 71d59a97edd5..aa4e16fc765b 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX -#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX +#pragma once #include <sal/config.h> @@ -37,6 +36,7 @@ #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <cppuhelper/implbase.hxx> +#include <unotools/resmgr.hxx> #include <rtl/ref.hxx> #include "actionlistener.hxx" @@ -46,7 +46,6 @@ enum DialogControls CANCEL_BUTTON = 0, PAUSE_BUTTON, RESUME_BUTTON, - INSTALL_BUTTON, DOWNLOAD_BUTTON, CLOSE_BUTTON, HELP_BUTTON, @@ -111,8 +110,6 @@ private: OUString msDownloading; // RID_UPDATE_STR_DOWNLOADING OUString msReady2Install; // RID_UPDATE_STR_READY_INSTALL OUString msCancelMessage; // RID_UPDATE_STR_CANCEL_DOWNLOAD - OUString msInstallMessage; // RID_UPDATE_STR_BEGIN_INSTALL - OUString msInstallError; // RID_UPDATE_STR_INSTALL_ERROR OUString msOverwriteWarning; // RID_UPDATE_STR_OVERWRITE_WARNING OUString msPercent; // RID_UPDATE_STR_PERCENT OUString msReloadWarning; // RID_UPDATE_STR_OVERWRITE_WARNING @@ -122,7 +119,6 @@ private: OUString msDescription; // RID_UPDATE_FT_DESCRIPTION OUString msClose; // RID_UPDATE_BTN_CLOSE OUString msDownload; // RID_UPDATE_BTN_DOWNLOAD - OUString msInstall; // RID_UPDATE_BTN_INSTALL OUString msPauseBtn; // RID_UPDATE_BTN_PAUSE OUString msResumeBtn; // RID_UPDATE_BTN_RESUME OUString msCancelBtn; // RID_UPDATE_BTN_CANCEL @@ -143,7 +139,7 @@ private: void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); static OUString loadString(const std::locale& rLocale, - const char* pResourceId); + TranslateId pResourceId); OUString substVariables( const OUString &rSource ) const; static void insertControlModel( css::uno::Reference< css::awt::XControlModel > const & rxDialogModel, OUString const & rServiceName, @@ -166,14 +162,13 @@ public: void setProgress( sal_Int32 nPercent ); void setNextVersion( const OUString &rNextVersion ) { msNextVersion = rNextVersion; } void setDownloadPath( const OUString &rPath ) { msDownloadPath = rPath; } - void setDownloadFile( const OUString &rPath ); + void setDownloadFile( std::u16string_view rPath ); void setErrorMessage( const OUString &rErrorMsg ); void setDescription( const OUString &rDescription ){ msDescriptionMsg = rDescription; } void setState( UpdateState eState ); OUString getBubbleText( UpdateState eState ); OUString getBubbleTitle( UpdateState eState ); - OUString getDefaultInstErrMsg(); bool showWarning( const OUString &rWarning ) const; bool showWarning( const OUString &rWarning, const OUString& rBtnText_1, const OUString& rBtnText_2 ) const; bool showOverwriteWarning( std::u16string_view rFileName ) const; @@ -204,6 +199,4 @@ public: virtual void SAL_CALL notifyTermination( const css::lang::EventObject& e ) override; }; -#endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |