2 files changed, 8 insertions, 14 deletions
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 9d719bebe032..c43e559147bd 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/ui/dialogs/ControlActions.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <vcl/fpicker.hrc>
+#include <fpicker/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/syswin.hxx>
@@ -58,7 +58,7 @@
 
 #include "unx/geninst.h"
 
-#include "svids.hrc"
+#include "strings.hrc"
 
 // The dialog should check whether LO also supports the protocol
 // provided by KIO, and KFileWidget::dirOperator() is only 4.3+ .
@@ -508,20 +508,14 @@ OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
     return toOUString(label);
 }
 
-QString KDE4FilePicker::getResString( sal_Int16 aRedId )
+QString KDE4FilePicker::getResString(const char *pResId)
 {
     QString aResString;
 
-    if( aRedId < 0 )
+    if (pResId == nullptr)
         return aResString;
 
-    try
-    {
-        aResString = toQString(ResId(aRedId, *ImplGetResMgr()));
-    }
-    catch(...)
-    {
-    }
+    aResString = toQString(VclResId(pResId));
 
     return aResString.replace('~', '&');
 }
@@ -529,7 +523,7 @@ QString KDE4FilePicker::getResString( sal_Int16 aRedId )
 void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
 {
     QWidget* widget = nullptr;
-    sal_Int32 resId = -1;
+    const char* resId = nullptr;
 
     switch (controlId)
     {
@@ -723,7 +717,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 
     _dialog->setOperationMode( operationMode );
 
-    sal_Int16 resId = -1;
+    const char *resId = nullptr;
     switch (_dialog->operationMode())
     {
     case KFileDialog::Opening:
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 96d94a9868e2..fb714a50b704 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -243,7 +243,7 @@ private:
     //add a custom control widget to the file dialog
     void addCustomControl(sal_Int16 controlId);
 
-    static QString getResString( sal_Int16 aRedId );
+    static QString getResString(const char* pRedId);
 
 private Q_SLOTS:
     void cleanupProxy();