From d666c2f87d56da1f4dd3d421665ac3078c447a17 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 18 May 2017 21:14:00 +0100 Subject: make string translation loading more uniform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit change various ResId classes that use conversion operator to OUString to functions that return a OUString drop various defines drop unnecessary toString calls Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92 Reviewed-on: https://gerrit.libreoffice.org/37817 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 2155e04d6343638ca9815d394cbc4f78c2b17c3a) drop toString Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5 (cherry picked from commit 8b1101023f01b2c7478a014b5ead73ada4fd4861) pNameResId is unused Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7 (cherry picked from commit c2667d7ff558a1b7bf83e694909465f00d1a16f6) Reviewed-on: https://gerrit.libreoffice.org/37843 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/window/splitwin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/source/window/splitwin.cxx') diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index a5b71d093363..18c82e76b782 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2351,7 +2351,7 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) OUString aStr; ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) - aStr = ResId( nHelpResId, *pResMgr ).toString(); + aStr = ResId( nHelpResId, *pResMgr ); if ( rHEvt.GetMode() & HelpEventMode::BALLOON ) Help::ShowBalloon( this, aHelpRect.Center(), aHelpRect, aStr ); else -- cgit