[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/Library_cui.mk cui/source

[Efe Gürkan YALAMAN]

 cui/Library_cui.mk                    |    1 +
 cui/source/options/optaboutconfig.cxx |    7 +++++--
 cui/source/options/optaboutconfig.hxx |    8 +++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 36abcf55e73766f9230fb114e72a4b1fec65cfea
Author: Efe Gürkan YALAMAN <efeyalaman at gmail.com>
Date:   Tue Jun 25 18:03:57 2013 +0300

    Module is compileable again.
    
    Fixed a few more mistakes which makes cui uncompileable. Files added
    to Library_cui.mk.
    
    Change-Id: I4b24c007beeae40449d7102a2656a6446abd25a5

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index fc27d59..984febb 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
     cui/source/options/doclinkdialog \
     cui/source/options/fontsubs \
     cui/source/options/internationaloptions \
+	cui/source/options/optaboutconfig \
     cui/source/options/optaccessibility \
     cui/source/options/optasian \
     cui/source/options/optchart \
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index e96829c..55870f9 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -8,14 +8,17 @@
  */
 
 #include "optaboutconfig.hxx"
+#include "optHeaderTabListbox.hxx"
+
+using namespace svx;
 
 CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet )
-    :SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui")
+    :SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui", rItemSet)
 {
 //    get(m_pEditBtn, "");
 
     WinBits nBits = WB_SCROLL | WB_SORT;
-    pPrefBox = new OptHeaderTabListBox( pPrefCtrl, nbits );
+    pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
 }
 
 CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 3d7859d..e0d8815 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -8,11 +8,13 @@
  */
 
 #ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
-#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
+#define INCLUDED_CUI_OPTABOUTCONFIG_HXX
 
+#include <sfx2/tabdlg.hxx>
 #include <svx/simptabl.hxx>
+#include "optHeaderTabListbox.hxx"
 
-namespace cui
+namespace svx
 {
     class OptHeaderTabListBox;
 }
@@ -26,7 +28,7 @@ private:
     //PushButton* m_pDefaultBtn
     PushButton* m_pEditBtn;
 
-    ::cui::OptHeaderTabListBox* pPrefBox;
+    ::svx::OptHeaderTabListBox* pPrefBox;
 public:
    CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
    ~CuiAboutConfigTabPage();