diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 10:20:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-08-05 12:18:18 +0200 |
| commit | c376b2428718a48ce4283fe002c0d493bfe1232e (patch) | |
| tree | 3553a10535f6451ce1221ee6ed5b8ad0e493d868 /extensions | |
| parent | 2a5ba0a0096334b5097fd6aeec54c18c876e94d4 (diff) | |
fix --enable-online-update after
commit 14cfff500e93f0d6cbf8412065feea85c01ea81d
Pass context and resource string down to boost::locale separately
Change-Id: I10336d0081c03090d63f48636ee8283b327304aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120058
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/update/check/updatehdl.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/update/check/updatehdl.hxx | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 2f54e60dfd32..9374aec98a0b 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -585,7 +585,7 @@ void UpdateHandler::updateState( UpdateState eState ) } OUString UpdateHandler::loadString(const std::locale& rLocale, - const char* pResourceId) + TranslateId pResourceId) { return Translate::get(pResourceId, rLocale); } @@ -642,7 +642,7 @@ void UpdateHandler::loadStrings() msResumeBtn = loadString( loc, RID_UPDATE_BTN_RESUME ); msCancelBtn = loadString( loc, RID_UPDATE_BTN_CANCEL ); - std::pair<const char*, const char*> RID_UPDATE_BUBBLE[] = + std::pair<TranslateId, TranslateId> RID_UPDATE_BUBBLE[] = { { RID_UPDATE_BUBBLE_UPDATE_AVAIL, RID_UPDATE_BUBBLE_T_UPDATE_AVAIL }, { RID_UPDATE_BUBBLE_UPDATE_NO_DOWN, RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN }, diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 12ed917a76b4..6597176468bd 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -36,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" @@ -142,7 +143,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, |