ditch over complex property buckets

A fairly small fixed number of properties are needed, so simplify

Change-Id: Iedce02264816666dbac53d7ad3cfb64be8e1c8bb

2 files changed, 21 insertions, 71 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 96e494046c33..3abe301e4508 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -173,11 +173,7 @@ SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet)
 {
     FreeResource();
 
-    rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM("fill"));
-    rtl::OString sExpand(RTL_CONSTASCII_STRINGPARAM("expand"));
-
-    m_aBox.setChildProperty(sFill, true);
-    m_aBox.setChildProperty(sExpand, true);
+    m_aBox.set_expand(true);
 
     m_aGrid.set_column_spacing(7);
     m_aGrid.set_row_spacing(2);
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 4f34c59a61d6..e89bc1eb4d33 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -82,82 +82,36 @@ SwWordCountDialog::SwWordCountDialog(Dialog* pParent)
     aDocCharacterFI.SetText(sForceInitialSize);
     aDocCharacterExcludingSpacesFI.SetText(sForceInitialSize);
 
-    rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM("fill"));
-    rtl::OString sExpand(RTL_CONSTASCII_STRINGPARAM("expand"));
-    rtl::OString sPackType(RTL_CONSTASCII_STRINGPARAM("pack-type"));
+    content_area.set_expand(true);
 
-    vbox.setChildProperty(sFill, true);
+    aCurrentSelectionLine.set_expand(true);
 
-    action_area.setChildProperty(sFill, true);
+    aSelectionBox.set_border_width(7);
 
-    content_area.setChildProperty(sFill, true);
-    content_area.setChildProperty(sExpand, true);
+    aSelectionRow1.set_expand(true);
+    aCurrentWordFI.set_expand(true);
 
-    aCurrentSelection.setChildProperty(sFill, true);
-    aCurrentSelectionText.setChildProperty(sFill, true);
-    aCurrentSelectionLine.setChildProperty(sFill, true);
-    aCurrentSelectionLine.setChildProperty(sExpand, true);
+    aSelectionRow2.set_expand(true);
+    aCurrentCharacterFI.set_expand(true);
+    aSelectionRow3.set_expand(true);
+    aCurrentCharacterExcludingSpacesFI.set_expand(true);
 
-    aSelectionBox.setChildProperty(sFill, true);
-    aSelectionBox.set_border_width(7);
+    aDocLine.set_expand(true);
 
-    aSelectionRow1.setChildProperty(sFill, true);
-    aSelectionRow1.setChildProperty(sExpand, true);
-    aCurrentWordFT.setChildProperty(sFill, true);
-    aCurrentWordFI.setChildProperty(sFill, true);
-    aCurrentWordFI.setChildProperty(sExpand, true);
-
-    aSelectionRow2.setChildProperty(sFill, true);
-    aSelectionRow2.setChildProperty(sExpand, true);
-    aCurrentCharacterFT.setChildProperty(sFill, true);
-    aCurrentCharacterFI.setChildProperty(sFill, true);
-    aCurrentCharacterFI.setChildProperty(sExpand, true);
-    aSelectionRow3.setChildProperty(sFill, true);
-    aSelectionRow3.setChildProperty(sExpand, true);
-    aCurrentCharacterExcludingSpacesFT.setChildProperty(sFill, true);
-    aCurrentCharacterExcludingSpacesFI.setChildProperty(sFill, true);
-    aCurrentCharacterExcludingSpacesFI.setChildProperty(sExpand, true);
-
-    aDoc.setChildProperty(sFill, true);
-    aDocText.setChildProperty(sFill, true);
-    aDocLine.setChildProperty(sFill, true);
-    aDocLine.setChildProperty(sExpand, true);
-
-    aDocBox.setChildProperty(sFill, true);
     aDocBox.set_border_width(7);
 
-    aDocRow1.setChildProperty(sFill, true);
-    aDocRow1.setChildProperty(sExpand, true);
-    aDocWordFT.setChildProperty(sFill, true);
-    aDocWordFI.setChildProperty(sFill, true);
-    aDocWordFI.setChildProperty(sExpand, true);
-
-    aDocRow2.setChildProperty(sFill, true);
-    aDocRow2.setChildProperty(sExpand, true);
-    aDocCharacterFT.setChildProperty(sFill, true);
-    aDocCharacterFI.setChildProperty(sFill, true);
-    aDocCharacterFI.setChildProperty(sExpand, true);
-    aDocRow3.setChildProperty(sFill, true);
-    aDocRow3.setChildProperty(sExpand, true);
-    aDocCharacterExcludingSpacesFT.setChildProperty(sFill, true);
-    aDocCharacterExcludingSpacesFI.setChildProperty(sFill, true);
-    aDocCharacterExcludingSpacesFI.setChildProperty(sExpand, true);
-
-    aBottomFL.setChildProperty(sFill, true);
-    aBottomFL.setChildProperty(sFill, true);
-
-    aOK.setChildProperty<sal_Int32>(sPackType, VCL_PACK_END);
-    aHelp.setChildProperty<sal_Int32>(sPackType, VCL_PACK_END);
+    aDocRow1.set_expand(true);
+    aDocWordFT.set_expand(true);
 
-    aOK.SetClickHdl(LINK(this, SwWordCountDialog, OkHdl));
+    aDocRow2.set_expand(true);
+    aDocCharacterFI.set_expand(true);
+    aDocRow3.set_expand(true);
+    aDocCharacterExcludingSpacesFI.set_expand(true);
 
-    fprintf(stderr, "aOk is %p\n", &aOK);
-    fprintf(stderr, "aHelp is %p\n", &aHelp);
-    fprintf(stderr, "action_area is is %p\n", &action_area);
-    fprintf(stderr, "aCurrentSelectionLine is is %p\n", &aCurrentSelectionLine);
-    fprintf(stderr, "aCurrentSelectionText is is %p\n", &aCurrentSelectionText);
-    fprintf(stderr, "aCurrentSelection is is %p\n", &aCurrentSelection);
-    fprintf(stderr, "vbox is is %p\n", &vbox);
+    aOK.set_pack_type(VCL_PACK_END);
+    aHelp.set_pack_type(VCL_PACK_END);
+
+    aOK.SetClickHdl(LINK(this, SwWordCountDialog, OkHdl));
 
     pParent->SetMinOutputSizePixel(vbox.GetOptimalSize(WINDOWSIZE_PREFERRED));