1 files changed, 18 insertions, 17 deletions
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 5cf1ab54f6d7..e31aaa74e0db 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -20,6 +20,7 @@
 
 #include <rtl/ustring.hxx>
 #include <sfx2/tabdlg.hxx>
+#include <utility>
 
 // forward-declarations
 struct IconChoicePageData;
@@ -31,21 +32,6 @@ class SfxItemSet;
 // Create-Function
 typedef std::unique_ptr<IconChoicePage> (*CreatePage)(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pAttrSet);
 
-/// Data-structure for pages in dialog
-struct IconChoicePageData
-{
-    OString sId;
-    std::unique_ptr<IconChoicePage> xPage;      ///< the TabPage itself
-    bool bRefresh;          ///< Flag: page has to be newly initialized
-
-    // constructor
-    IconChoicePageData(const OString& rId, std::unique_ptr<IconChoicePage> xInPage)
-        : sId(rId)
-        , xPage(std::move(xInPage))
-        , bRefresh(false)
-    {}
-};
-
 class IconChoicePage
 {
 protected:
@@ -58,12 +44,12 @@ private:
 
 protected:
 
-    IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet* pItemSet);
+    IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pItemSet);
 
 public:
     virtual ~IconChoicePage();
 
-    OString GetHelpId() const { return xContainer->get_help_id(); }
+    OUString GetHelpId() const { return xContainer->get_help_id(); }
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
@@ -78,4 +64,19 @@ public:
     virtual bool        QueryClose();
 };
 
+/// Data-structure for pages in dialog
+struct IconChoicePageData
+{
+    OUString sId;
+    std::unique_ptr<IconChoicePage> xPage;      ///< the TabPage itself
+    bool bRefresh;          ///< Flag: page has to be newly initialized
+
+    // constructor
+    IconChoicePageData(OUString aId, std::unique_ptr<IconChoicePage> xInPage)
+        : sId(std::move(aId))
+        , xPage(std::move(xInPage))
+        , bRefresh(false)
+    {}
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */