split out border page and adapt code

Change-Id: I1c6b8c0fdbd82d54920e168afbe5c33a29244202

cui/UI_cui.mk

@@ -10,6 +10,7 @@
 $(eval $(call gb_UI_UI,cui))
 
 $(eval $(call gb_UI_add_uifiles,cui,\
+	cui/uiconfig/ui/borderpage \
 	cui/uiconfig/ui/charnamepage \
 	cui/uiconfig/ui/effectspage \
 	cui/uiconfig/ui/hyphenate \

cui/source/inc/border.hxx

@@ -59,46 +59,37 @@ private:
     ~SvxBorderTabPage();
 
     // Controls
-    FixedLine           aFlBorder;
-    FixedText           aDefaultFT;
-    ValueSet            aWndPresets;
-    FixedText           aUserDefFT;
-    svx::FrameSelector  aFrameSel;
-
-    FixedLine           aFlSep1;
-    FixedLine           aFlLine;
-    FixedText           aStyleFT;
-    LineListBox    aLbLineStyle;
-    FixedText           aColorFT;
-    ColorListBox        aLbLineColor;
-    FixedText           aWidthFT;
-    MetricField         aLineWidthMF;
-
-    FixedLine           aFlSep2;
-    FixedLine           aDistanceFL;
-    FixedText           aLeftFT;
-    MetricField         aLeftMF;
-    FixedText           aRightFT;
-    MetricField         aRightMF;
-    FixedText           aTopFT;
-    MetricField         aTopMF;
-    FixedText           aBottomFT;
-    MetricField         aBottomMF;
-    CheckBox            aSynchronizeCB;
-
-    FixedLine           aFlShadow;
-    FixedText           aFtShadowPos;
-    ValueSet            aWndShadows;
-    FixedText           aFtShadowSize;
-    MetricField         aEdShadowSize;
-    FixedText           aFtShadowColor;
-    ColorListBox        aLbShadowColor;
-
-
-    FixedLine           aPropertiesFL;///< properties - "Merge with next paragraph" in Writer
-    CheckBox            aMergeWithNextCB;
+    ValueSet*           m_pWndPresets;
+    FixedText*          m_pUserDefFT;
+    svx::FrameSelector* m_pFrameSel;
+
+    LineListBox*        m_pLbLineStyle;
+    ColorListBox*       m_pLbLineColor;
+    MetricField*        m_pLineWidthMF;
+
+    VclContainer*       m_pSpacingFrame;
+    FixedText*          m_pLeftFT;
+    MetricField*        m_pLeftMF;
+    FixedText*          m_pRightFT;
+    MetricField*        m_pRightMF;
+    FixedText*          m_pTopFT;
+    MetricField*        m_pTopMF;
+    FixedText*          m_pBottomFT;
+    MetricField*        m_pBottomMF;
+    CheckBox*           m_pSynchronizeCB;
+
+    VclContainer*       m_pShadowFrame;
+    ValueSet*           m_pWndShadows;
+    FixedText*          m_pFtShadowSize;
+    MetricField*        m_pEdShadowSize;
+    FixedText*          m_pFtShadowColor;
+    ColorListBox*       m_pLbShadowColor;
+
+
+    VclContainer*       m_pPropertiesFrame;///< properties - "Merge with next paragraph" in Writer
+    CheckBox*           m_pMergeWithNextCB;
     // #i29550#
-    CheckBox            aMergeAdjacentBordersCB;
+    CheckBox*           m_pMergeAdjacentBordersCB;
 
     ImageList           aShadowImgLstH;
     ImageList           aShadowImgLst;
@@ -115,7 +106,6 @@ private:
     bool                mbUseMarginItem;
     bool                mbSync;
 
-#ifdef _SVX_BORDER_CXX
     // Handler
     DECL_LINK( SelStyleHdl_Impl, ListBox* pLb );
     DECL_LINK( SelColHdl_Impl, ListBox* pLb );
@@ -140,7 +130,6 @@ private:
     void                ResetFrameLine_Impl( svx::FrameBorderType eBorder,
                                              const editeng::SvxBorderLine* pCurLine,
                                              bool bValid );
-#endif
 };
 
 

cui/source/inc/helpid.hrc

@@ -276,9 +276,6 @@
 #define HID_BACKGROUND "CUI_HID_BACKGROUND"
 #define HID_BACKGROUND_CTL_BGDCOLORSET "CUI_HID_BACKGROUND_CTL_BGDCOLORSET"
 #define HID_BACKGROUND_CTL_POSITION "CUI_HID_BACKGROUND_CTL_POSITION"
-#define HID_BORDER "CUI_HID_BORDER"
-#define HID_BORDER_CTL_PRESETS "CUI_HID_BORDER_CTL_PRESETS"
-#define HID_BORDER_CTL_SHADOWS "CUI_HID_BORDER_CTL_SHADOWS"
 #define HID_PAGE_CONNECTION "CUI_HID_PAGE_CONNECTION"
 #define HID_PAGE_CONNECTION_CTL_PREVIEW "CUI_HID_PAGE_CONNECTION_CTL_PREVIEW"
 #define HID_PAGE_DISTRIBUTE "CUI_HID_PAGE_DISTRIBUTE"

cui/source/tabpages/border.hrc

@@ -18,46 +18,6 @@
 #ifndef _SVX_BORDER_HRC
 #define _SVX_BORDER_HRC
 
-// defines ------------------------------------------------------------------
-
-#define FL_BORDER               10
-#define WIN_PRESETS             11
-#define WIN_FRAMESEL            12
-
-#define FL_SEPARATOR1           19
-#define FL_LINE                 20
-#define LB_LINESTYLE            21
-#define LB_LINECOLOR            22
-#define MF_LINEWIDTH            23
-
-#define FL_SEPARATOR2           29
-#define FL_SHADOW               30
-#define FT_SHADOWPOS            31
-#define WIN_SHADOWS             32
-#define FT_SHADOWSIZE           33
-#define ED_SHADOWSIZE           34
-#define FT_SHADOWCOLOR          35
-#define LB_SHADOWCOLOR          36
-
-#define FL_DISTANCE             50
-#define FT_LEFT                 51
-#define MF_LEFT                 52
-#define FT_RIGHT                53
-#define MF_RIGHT                54
-#define FT_TOP                  55
-#define MF_TOP                  56
-#define FT_BOTTOM               57
-#define MF_BOTTOM               58
-#define CB_SYNC                 59
-#define FT_DEFAULT              60
-#define FT_USERDEF              61
-#define FT_STYLE                62
-#define FT_COLOR                63
-#define FL_PROPERTIES           64
-#define CB_MERGEWITHNEXT        65
-#define CB_MERGEADJACENTBORDERS 66
-#define FT_WIDTH                67
-
 // ImageList for ValueSets:
 #define IL_PRE_BITMAPS          1400
 #define IID_PRE_CELL_NONE       1
@@ -89,6 +49,5 @@
 #define IID_SHADOW_TOP_RIGHT    4
 #define IID_SHADOW_TOP_LEFT     5
 
-
 #endif
 

svtools/source/control/valueset.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <tools/debug.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/scrbar.hxx>
@@ -101,6 +102,11 @@ ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientCh
     mbIsTransientChildrenDisabled = bDisableTransientChildren;
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, VclBuilder::stringmap &)
+{
+    return new ValueSet(pParent, WB_TABSTOP);
+}
+
 // -----------------------------------------------------------------------
 
 ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) :