diff options
author | Palenik Mihály <palenik.mihaly@gmail.com> | 2014-08-04 20:06:46 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-08-04 19:22:05 +0000 |
commit | 0db94ccc3ffd243af6d3a626a8a211ff106b7d48 (patch) | |
tree | c04cc939b278cff041376a205f0074bd6d48cbfb /sc/source/ui | |
parent | 922b03f0818baa65e4c036f58fe7f8c29776b81e (diff) |
Convert RID_SCDLG_DPSHOWDETAIL to .ui
Change-Id: If515e8f554f36e4ba203474d08d5ebe9caa023fa
Reviewed-on: https://gerrit.libreoffice.org/10739
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dbgui/pvfundlg.cxx | 29 | ||||
-rw-r--r-- | sc/source/ui/dbgui/pvfundlg.src | 48 | ||||
-rw-r--r-- | sc/source/ui/inc/pvfundlg.hxx | 7 |
3 files changed, 15 insertions, 69 deletions
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 7aca31e47956..8813613b4a08 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -34,7 +34,7 @@ #include "scresid.hxx" #include "dpobject.hxx" #include "dpsave.hxx" -#include "pvfundlg.hrc" +#include "sc.hrc" #include "globstr.hrc" #include "dputil.hxx" @@ -758,16 +758,11 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) } ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ), - maFtDims ( this, ScResId( FT_DIMS ) ), - maLbDims ( this, ScResId( LB_DIMS ) ), - maBtnOk ( this, ScResId( BTN_OK ) ), - maBtnCancel ( this, ScResId( BTN_CANCEL ) ), - maBtnHelp ( this, ScResId( BTN_HELP ) ), - + ModalDialog ( pParent, "ShowDetail", "modules/scalc/ui/showdetaildialog.ui" ), mrDPObj(rDPObj) { - FreeResource(); + get(mpLbDims, "dimsTreeview"); + get(mpBtnOk, "ok"); ScDPSaveData* pSaveData = rDPObj.GetSaveData(); long nDimCount = rDPObj.GetDimCount(); @@ -787,27 +782,27 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_u if (pLayoutName) aName = *pLayoutName; } - maLbDims.InsertEntry( aName ); + mpLbDims->InsertEntry( aName ); maNameIndexMap.insert(DimNameIndexMap::value_type(aName, nDim)); } } } - if( maLbDims.GetEntryCount() ) - maLbDims.SelectEntryPos( 0 ); + if( mpLbDims->GetEntryCount() ) + mpLbDims->SelectEntryPos( 0 ); - maLbDims.SetDoubleClickHdl( LINK( this, ScDPShowDetailDlg, DblClickHdl ) ); + mpLbDims->SetDoubleClickHdl( LINK( this, ScDPShowDetailDlg, DblClickHdl ) ); } short ScDPShowDetailDlg::Execute() { - return maLbDims.GetEntryCount() ? ModalDialog::Execute() : static_cast<short>(RET_CANCEL); + return mpLbDims->GetEntryCount() ? ModalDialog::Execute() : static_cast<short>(RET_CANCEL); } OUString ScDPShowDetailDlg::GetDimensionName() const { // Look up the internal dimension name which may be different from the // displayed field name. - OUString aSelectedName = maLbDims.GetSelectEntry(); + OUString aSelectedName = mpLbDims->GetSelectEntry(); DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName); if (itr == maNameIndexMap.end()) // This should never happen! @@ -820,8 +815,8 @@ OUString ScDPShowDetailDlg::GetDimensionName() const IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox ) { - if( pLBox == &maLbDims ) - maBtnOk.Click(); + if( pLBox == mpLbDims ) + mpBtnOk->Click(); return 0; } diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index 14a42ae79afb..fe33cf80ebab 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "pvfundlg.hrc" +#include "sc.hrc" StringArray SCSTR_DPFUNCLISTBOX { @@ -37,50 +37,4 @@ StringArray SCSTR_DPFUNCLISTBOX }; }; -ModalDialog RID_SCDLG_DPSHOWDETAIL -{ - OutputSize = TRUE; - HelpId = HID_SC_DPSHOWDETAIL; - SVLook = TRUE; - Size = MAP_APPFONT( 200, 116 ); - Moveable = TRUE; - Closeable = FALSE; - FixedText FT_DIMS - { - Pos = MAP_APPFONT( 6, 3 ); - Size = MAP_APPFONT( 132, 24 ); - WordBreak = TRUE; - Text [ en-US ] = "~Choose the field containing the detail you want to show"; - }; - ListBox LB_DIMS - { - HelpID = "sc:ListBox:RID_SCDLG_DPSHOWDETAIL:LB_DIMS"; - Pos = MAP_APPFONT( 6, 30 ); - Size = MAP_APPFONT( 132, 80 ); - TabStop = TRUE; - Border = TRUE; - DropDown = FALSE; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT( 144, 6 ); - Size = MAP_APPFONT( 50, 14 ); - TabStop = TRUE; - DefButton = TRUE; - }; - CancelButton BTN_CANCEL - { - Pos = MAP_APPFONT( 144, 23 ); - Size = MAP_APPFONT( 50, 14 ); - TabStop = TRUE; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT( 144, 43 ); - Size = MAP_APPFONT( 50, 14 ); - TabStop = TRUE; - }; - Text [ en-US ] = "Show Detail"; -}; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 06818703a913..986c9e09a6f5 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -202,11 +202,8 @@ private: DECL_LINK( DblClickHdl, ListBox* ); private: - FixedText maFtDims; - ListBox maLbDims; - OKButton maBtnOk; - CancelButton maBtnCancel; - HelpButton maBtnHelp; + ListBox* mpLbDims; + OKButton* mpBtnOk; typedef ::boost::unordered_map<OUString, long, OUStringHash> DimNameIndexMap; DimNameIndexMap maNameIndexMap; |