convert captions option page to .ui

Change-Id: I571cc68bacce315ceafbe54deed6efeac51a6f1f

4 files changed, 34 insertions, 38 deletions

diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index d28ae331c9da..373478813a66 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -101,10 +101,14 @@
 #define STR_SIMPLE                      (RC_APP_BEGIN + 129)
 #define STR_AUTHMRK_EDIT                (RC_APP_BEGIN + 130)
 #define STR_AUTHMRK_INSERT              (RC_APP_BEGIN + 131)
-
 #define STR_ROTATE_TO_STANDARD_ORIENTATION  (RC_APP_BEGIN + 132)
+#define STR_CAPTION_TABLE               (RC_APP_BEGIN + 133)
+#define STR_CAPTION_FRAME               (RC_APP_BEGIN + 134)
+#define STR_CAPTION_GRAPHIC             (RC_APP_BEGIN + 135)
+#define STR_CAPTION_OLE                 (RC_APP_BEGIN + 136)
+#define STR_CATEGORY_NONE               (RC_APP_BEGIN + 137)
 
-#define APP_ACT_END                     STR_ROTATE_TO_STANDARD_ORIENTATION
+#define APP_ACT_END                     STR_CATEGORY_NONE
 
 #if APP_ACT_END > RC_APP_END
 #error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx
index f57ad5896bb0..372df26ee9e4 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/ui/inc/bookmark.hxx
@@ -37,7 +37,7 @@ class BookmarkCombo : public SwComboBox
 
     virtual long    PreNotify(NotifyEvent& rNEvt);
 public:
-    BookmarkCombo( Window* pWin );
+    BookmarkCombo(Window* pWin, WinBits nStyle);
 
     sal_uInt16          GetSelectEntryCount() const;
     sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const;
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx
index 0e5fff175133..3bf231e5bbde 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/ui/inc/optload.hxx
@@ -23,6 +23,7 @@
 
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/field.hxx>
 #include <svx/strarray.hxx>
@@ -81,8 +82,8 @@ protected:
     virtual void KeyInput( const KeyEvent& );
 
 public:
-    CaptionComboBox( Window* pParent, const ResId& rResId)
-        : SwComboBox(pParent, rResId)
+    CaptionComboBox(Window* pParent, WinBits nStyle)
+        : SwComboBox(pParent, nStyle)
     {}
 };
 
@@ -92,47 +93,38 @@ private:
     OUString maText;
     Point    maDrawPos;
 public:
-    SwCaptionPreview( Window* pParent );
-    SwCaptionPreview( Window* pParent, const ResId& rResId );
+    SwCaptionPreview( Window* pParent, WinBits nStyle );
     void Init();
     void SetPreviewText( const OUString& rText );
     virtual void Paint( const Rectangle& rRect );
+    virtual Size GetOptimalSize() const;
 };
 
 class SwCaptionOptPage : public SfxTabPage
 {
 private:
-    FixedText       aCheckFT;
-    SvxCheckListBox aCheckLB;
-
-    FixedText       aFtCaptionOrder;
-    ListBox         aLbCaptionOrder;
-
-    SwCaptionPreview    aPreview;
-
-    FixedLine       aSettingsGroupFL;
-    FixedText       aCategoryText;
-    CaptionComboBox aCategoryBox;
-    FixedText       aFormatText;
-    ListBox         aFormatBox;
+    SvxCheckListBox*  m_pCheckLB;
+    ListBox*          m_pLbCaptionOrder;
+    SwCaptionPreview* m_pPreview;
+
+    VclContainer*     m_pSettingsGroup;
+    CaptionComboBox*  m_pCategoryBox;
+    FixedText*        m_pFormatText;
+    ListBox*          m_pFormatBox;
     //#i61007# order of captions
-    FixedText       aNumberingSeparatorFT;
-    Edit            aNumberingSeparatorED;
-    FixedText       aTextText;
-    Edit            aTextEdit;
-    FixedText       aPosText;
-    ListBox         aPosBox;
-
-    FixedLine       aNumCaptFL;
-    FixedText       aFtLevel;
-    ListBox         aLbLevel;
-    FixedText       aFtDelim;
-    Edit            aEdDelim;
-
-    FixedLine       aCategoryFL;
-    FixedText       aCharStyleFT;
-    ListBox         aCharStyleLB;
-    CheckBox        aApplyBorderCB;
+    FixedText*        m_pNumberingSeparatorFT;
+    Edit*             m_pNumberingSeparatorED;
+    FixedText*        m_pTextText;
+    Edit*             m_pTextEdit;
+    ListBox*          m_pPosBox;
+
+    VclContainer*     m_pNumCapt;
+    ListBox*          m_pLbLevel;
+    Edit*             m_pEdDelim;
+
+    VclContainer*     m_pCategory;
+    ListBox*          m_pCharStyleLB;
+    CheckBox*         m_pApplyBorderCB;
 
     OUString        m_sSWTable;
     OUString        m_sSWFrame;
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx
index 0ae0b7400934..747ffb76dd08 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/ui/inc/swlbox.hxx
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox
 
 public:
 
-    SwComboBox(Window* pParent);
+    SwComboBox(Window* pParent, WinBits nStyle);
     SwComboBox(Window* pParent, const ResId& rId);
     ~SwComboBox();