From 87b5cdd5ed13f5d05fe90b11b01e3832e5725b72 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 10 Sep 2012 16:59:55 +0100
Subject: convert writer, draw, impress, calc and starmath printer dialogs

to new-style widget layout mostly described in .ui format

Change-Id: I8ead53a246a8ac3e2d446d158f06d7e2e436ce60
---
 basctl/source/basicide/basicrenderable.cxx | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 8aafe05d423a..9fe4ae711ef5 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -44,37 +44,33 @@ Renderable::Renderable (BaseWindow* pWin)
 
     m_aUIProperties.realloc( 3 );
 
-    // create Subgroup for print range
+    // show Subgroup for print range
     vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
     aPrintRangeOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) );
     aPrintRangeOpt.mbInternalOnly = true;
-    m_aUIProperties[0].Value = getSubgroupControlOpt( rtl::OUString( aStrings.GetString( 0 ) ),
-                                                      rtl::OUString(),
-                                                      aPrintRangeOpt
-                                                      );
+    m_aUIProperties[0].Value = setSubgroupControlOpt("printrange",
+        rtl::OUString(aStrings.GetString(0)), rtl::OUString(), aPrintRangeOpt);
 
     // create a choice for the range to print
     rtl::OUString aPrintContentName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) );
     Sequence< rtl::OUString > aChoices( 2 );
     Sequence< rtl::OUString > aHelpIds( 2 );
+    Sequence< rtl::OUString > aWidgetIds( 2 );
     aChoices[0] = aStrings.GetString( 1 );
     aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ) );
     aChoices[1] = aStrings.GetString( 2 );
     aHelpIds[1] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ) );
-    m_aUIProperties[1].Value = getChoiceControlOpt( rtl::OUString(),
-                                                    aHelpIds,
-                                                    aPrintContentName,
-                                                    aChoices,
-                                                    0 );
+    aWidgetIds[0] = rtl::OUString("printallpages");
+    aWidgetIds[1] = rtl::OUString("printpages");
+    m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, rtl::OUString(),
+                                                   aHelpIds, aPrintContentName,
+                                                   aChoices, 0);
 
     // create a an Edit dependent on "Pages" selected
     vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt(aPrintContentName, 1, true);
-    m_aUIProperties[2].Value = getEditControlOpt( rtl::OUString(),
-                                                  rtl::OUString(),
-                                                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
-                                                  rtl::OUString(),
-                                                  aPageRangeOpt
-                                                  );
+    m_aUIProperties[2].Value = setEditControlOpt("pagerange", rtl::OUString(),
+                                                 rtl::OUString(), "PageRange",
+                                                 rtl::OUString(), aPageRangeOpt);
 }
 
 Renderable::~Renderable()
-- 
cgit