diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-12-16 12:57:52 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-16 12:59:20 +0000 |
commit | 1bb4a66904509faf1954a87e95c7299f5f502580 (patch) | |
tree | d5760f577d425e2d218c459105382fb615278372 /cui/source | |
parent | 3b5c3d5a6cbbfd3ecbf30012b834bfca9b3953c2 (diff) |
convert goto record dialog to .ui
Change-Id: I2bc2c5837556da73cc60e0e5b906ddb4f01844d9
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/cuitbxform.cxx | 21 | ||||
-rw-r--r-- | cui/source/dialogs/fmsearch.hrc | 1 | ||||
-rw-r--r-- | cui/source/dialogs/tbxform.src | 60 | ||||
-rw-r--r-- | cui/source/inc/cuitbxform.hxx | 14 |
4 files changed, 11 insertions, 85 deletions
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 263102da1a3c..3c1f7cfd6bf9 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -30,25 +30,16 @@ #include "cuitbxform.hxx" #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -#include "fmsearch.hrc" - -//======================================================================== -// class FmInputRecordNoDialog -//======================================================================== FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) - :ModalDialog( pParent, CUI_RES(RID_SVX_DLG_INPUTRECORDNO)) - ,m_aLabel(this, CUI_RES(1)) - ,m_aRecordNo(this, CUI_RES(1)) - ,m_aOk(this, CUI_RES(1)) - ,m_aCancel(this, CUI_RES(1)) + : ModalDialog( pParent, "RecordNumberDialog", "cui/ui/recordnumberdialog.ui") { - m_aRecordNo.SetMin(1); - m_aRecordNo.SetMax(0x7FFFFFFF); - m_aRecordNo.SetStrictFormat(sal_True); - m_aRecordNo.SetDecimalDigits(0); + get(m_pRecordNo, "entry-nospin"); - FreeResource(); + m_pRecordNo->SetMin(1); + m_pRecordNo->SetMax(0x7FFFFFFF); + m_pRecordNo->SetStrictFormat(sal_True); + m_pRecordNo->SetDecimalDigits(0); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/fmsearch.hrc b/cui/source/dialogs/fmsearch.hrc index a58ecb80dc2f..3b65fdb85225 100644 --- a/cui/source/dialogs/fmsearch.hrc +++ b/cui/source/dialogs/fmsearch.hrc @@ -21,7 +21,6 @@ #include "svl/solar.hrc" -#define RID_SVX_DLG_INPUTRECORDNO (RID_FORMS_START + 10) #define RID_SVX_DLG_SHOWGRIDCOLUMNS (RID_FORMS_START + 11) #define RID_SVXDLG_SEARCHFORM (RID_FORMS_START + 7) #define RID_STR_SEARCH_ANYWHERE (RID_FORMS_START + 85) diff --git a/cui/source/dialogs/tbxform.src b/cui/source/dialogs/tbxform.src deleted file mode 100644 index 5b6fc4a2628c..000000000000 --- a/cui/source/dialogs/tbxform.src +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include "fmsearch.hrc" - -ModalDialog RID_SVX_DLG_INPUTRECORDNO -{ - HelpID = "cui:ModalDialog:RID_SVX_DLG_INPUTRECORDNO"; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 130 , 45 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Text [ en-US ] = "Record Number"; - - FixedText 1 - { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 70 , 12 ) ; - Text [ en-US ] = "go to record"; - }; - NumericField 1 - { - HelpID = "cui:NumericField:RID_SVX_DLG_INPUTRECORDNO:1"; - Border = TRUE ; - Pos = MAP_APPFONT ( 79 , 6 ) ; - Size = MAP_APPFONT ( 45 , 12 ) ; - TabStop = TRUE ; - }; - OKButton 1 - { - Pos = MAP_APPFONT ( 6 , 25 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton 1 - { - Pos = MAP_APPFONT ( 74 , 25 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 044285bc030a..389690df409d 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -20,26 +20,22 @@ #define INCLUDED_CUI_SOURCE_INC_CUITBXFORM_HXX #include <sfx2/tbxctrl.hxx> -#include <vcl/field.hxx> -#include <vcl/dialog.hxx> - #include <vcl/button.hxx> +#include <vcl/dialog.hxx> +#include <vcl/field.hxx> //======================================================================== class FmInputRecordNoDialog : public ModalDialog { public: - FixedText m_aLabel; - NumericField m_aRecordNo; - OKButton m_aOk; - CancelButton m_aCancel; + NumericField* m_pRecordNo; public: FmInputRecordNoDialog(Window * pParent); - void SetValue(long dNew) { m_aRecordNo.SetValue(dNew); } - long GetValue() const { return static_cast<long>(m_aRecordNo.GetValue()); } + void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } + long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } }; #endif |