1 files changed, 6 insertions, 9 deletions
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 0d074f1f610b..3a02dbbee641 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
-#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
+#pragma once
 
 #include "PlacesListBox.hxx"
 
@@ -49,7 +48,7 @@ private:
     OUString m_aType;    // filter wildcard - if empty, the entry marks a group
 
 public:
-    SvtFileDialogFilter_Impl( const OUString& rName, const OUString& rType );
+    SvtFileDialogFilter_Impl( OUString aName, OUString aType );
     ~SvtFileDialogFilter_Impl();
 
     const OUString&     GetName() const     { return m_aName; }
@@ -87,7 +86,7 @@ public:
                      std::unique_ptr<weld::Menu> xMenu,
                      SvtFileDialog* pDlg);
 
-    void set_help_id(const OString& rHelpId) { m_xToolbar->set_help_id(rHelpId); }
+    void set_help_id(const OUString& rHelpId) { m_xToolbar->set_help_id(rHelpId); }
     void show() { m_xToolbar->show(); }
 
     void FillURLMenu();
@@ -96,8 +95,8 @@ public:
 
 private:
 
-    DECL_LINK(SelectHdl, const OString&, void);
-    DECL_LINK(ClickHdl, const OString&, void);
+    DECL_LINK(SelectHdl, const OUString&, void);
+    DECL_LINK(ClickHdl, const OUString&, void);
 };
 
 class SvtURLBox;
@@ -186,7 +185,7 @@ public:
     SvtFileDialogFilter_Impl* GetSelectedFilterEntry( OUString& rDisplayName ) const
     {
         rDisplayName = m_xLbFilter->get_active_text();
-        return reinterpret_cast<SvtFileDialogFilter_Impl*>(m_xLbFilter->get_active_id().toInt64());
+        return weld::fromId<SvtFileDialogFilter_Impl*>(m_xLbFilter->get_active_id());
     }
 
     // access to the current filter via methods only - need to care for consistency between m_pCurFilter and m_sCurrentFilterDisplayName
@@ -203,6 +202,4 @@ public:
     void SetCurFilter( SvtFileDialogFilter_Impl const * _pFilter, const OUString& rDisplayName );
 };
 
-#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */