convert character properties tabdialog to .ui

Change-Id: I73fc5fc19ae75971b0569b708f4104c79b9a9cc2

2 files changed, 43 insertions, 95 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index dfccdeca4cb0..e7efa9177250 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -58,13 +58,12 @@ using namespace ::com::sun::star::uno;
 using namespace ::sfx2;
 
 SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet,
-                     const String* pStr, sal_Bool bIsDrwTxtDlg) :
-    SfxTabDialog(pParent, SW_RES(DLG_CHAR), &rCoreSet, pStr != 0),
-    rView(rVw),
-    bIsDrwTxtMode(bIsDrwTxtDlg)
+    const String* pStr, bool bIsDrwTxtDlg)
+    : SfxTabDialog(0, pParent, "CharacterPropertiesDialog",
+        "modules/swriter/ui/characterproperties.ui", &rCoreSet, pStr != 0)
+    , rView(rVw)
+    , bIsDrwTxtMode(bIsDrwTxtDlg)
 {
-    FreeResource();
-
     if(pStr)
     {
         String aTmp( GetText() );
@@ -75,22 +74,22 @@ SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet,
     }
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
     OSL_ENSURE(pFact, "Dialogdiet fail!");
-    AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), 0 );
-    AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), 0 );
-    AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
-    AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 );
-    AddTabPage(TP_CHAR_URL, SwCharURLPage::Create, 0);
-    AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
+    m_nCharStdId = AddTabPage("font", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_NAME), 0);
+    m_nCharExtId = AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0);
+    m_nCharPosId = AddTabPage("position", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
+    m_nCharTwoId = AddTabPage("asianlayout", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), 0 );
+    m_nCharUrlId = AddTabPage("hyperlink", SwCharURLPage::Create, 0);
+    m_nCharBgdId = AddTabPage("background", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), 0 );
 
     SvtCJKOptions aCJKOptions;
     if(bIsDrwTxtMode)
     {
-        RemoveTabPage( TP_CHAR_URL );
-        RemoveTabPage( TP_BACKGROUND );
-        RemoveTabPage( TP_CHAR_TWOLN );
+        RemoveTabPage(m_nCharUrlId);
+        RemoveTabPage(m_nCharBgdId);
+        RemoveTabPage(m_nCharTwoId);
     }
     else if(!aCJKOptions.IsDoubleLinesEnabled())
-        RemoveTabPage( TP_CHAR_TWOLN );
+        RemoveTabPage(m_nCharTwoId);
 }
 
 SwCharDlg::~SwCharDlg()
@@ -104,36 +103,35 @@ SwCharDlg::~SwCharDlg()
 void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
-    switch( nId )
+    if (nId == m_nCharStdId)
+    {
+        SvxFontListItem aFontListItem( *( (SvxFontListItem*)
+           ( rView.GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ) );
+        aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
+            if(!bIsDrwTxtMode)
+                aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
+        rPage.PageCreated(aSet);
+    }
+    else if (nId == m_nCharExtId)
+    {
+        if(bIsDrwTxtMode)
+            aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
+
+        else
+        {
+            aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER|SVX_ENABLE_FLASH));
+        }
+        rPage.PageCreated(aSet);
+    }
+    else if (nId == m_nCharPosId)
+    {
+        aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
+        rPage.PageCreated(aSet);
+    }
+    else if (nId == m_nCharTwoId)
     {
-        case TP_CHAR_STD:
-            {
-            SvxFontListItem aFontListItem( *( (SvxFontListItem*)
-               ( rView.GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) ) );
-            aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
-                if(!bIsDrwTxtMode)
-                    aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
-            rPage.PageCreated(aSet);
-            }
-            break;
-        case TP_CHAR_EXT:
-            if(bIsDrwTxtMode)
-                aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
-
-            else
-            {
-                aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER|SVX_ENABLE_FLASH));
-            }
-            rPage.PageCreated(aSet);
-            break;
-        case TP_CHAR_POS:
-            aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
-            rPage.PageCreated(aSet);
-        break;
-        case TP_CHAR_TWOLN:
-            aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
-            rPage.PageCreated(aSet);
-        break;
+        aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_PREVIEW_CHARACTER));
+        rPage.PageCreated(aSet);
     }
 }
 
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index 5b392736a57d..44535230d4e9 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -20,56 +20,6 @@
 #include "chrdlg.hrc"
 #include "helpid.h"
 
-TabDialog DLG_CHAR
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Text [ en-US ] = "Character" ;
-    Moveable = TRUE ;
-    Sizeable = TRUE ;
-    TabControl 1
-    {
-        OutputSize = TRUE ;
-        PageList =
-        {
-            PageItem
-            {
-                Identifier = TP_CHAR_STD ;
-                Text [ en-US ] = "Font" ;
-                PageResID = TP_CHAR_STD ;
-            };
-            PageItem
-            {
-                Identifier = TP_CHAR_EXT ;
-                Text [ en-US ] = "Font Effects" ;
-                PageResID = TP_CHAR_EXT ;
-            };
-            PageItem
-            {
-                Identifier = TP_CHAR_POS ;
-                PageResID = TP_CHAR_POS ;
-                Text [ en-US ] = "Position";
-            };
-            PageItem
-            {
-                Identifier = TP_CHAR_TWOLN ;
-                PageResID = TP_CHAR_TWOLN;
-                Text [ en-US ] = "Asian Layout";
-            };
-            PageItem
-            {
-                Identifier = TP_CHAR_URL ;
-                Text [ en-US ] = "Hyperlink" ;
-            };
-            PageItem
-            {
-                Identifier = TP_BACKGROUND ;
-                Text [ en-US ] = "Background" ;
-                PageResID = TP_BACKGROUND ;
-            };
-        };
-    };
-};
 TabDialog DLG_DRAWCHAR
 {
     OutputSize = TRUE ;