summaryrefslogtreecommitdiff
path: root/sw/source/ui/dochdl
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/dochdl')
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx2
-rw-r--r--sw/source/ui/dochdl/selglos.cxx28
-rw-r--r--sw/source/ui/dochdl/selglos.hrc25
-rw-r--r--sw/source/ui/dochdl/selglos.src69
4 files changed, 9 insertions, 115 deletions
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 8e852fb802a9..4c4edefdbbc7 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -454,7 +454,7 @@ sal_Bool SwGlossaryHdl::Expand( const OUString& rShortName,
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
- AbstractSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg( 0, aShortName, DLG_SEL_GLOS );
+ AbstractSwSelGlossaryDlg* pDlg = pFact->CreateSwSelGlossaryDlg(0, aShortName);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
for(sal_uInt16 i = 0; i < aFoundArr.size(); ++i)
{
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 930fb8215b57..484787deba8b 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -21,32 +21,20 @@
#include "selglos.hxx"
-#include "selglos.hrc"
#include "dochdl.hrc"
-#include <vcl/msgbox.hxx>
-
-// STATIC DATA -----------------------------------------------------------
-
-
-// CTOR / DTOR -----------------------------------------------------------
+#include <vcl/layout.hxx>
SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const OUString &rShortName)
- : ModalDialog(pParent, SW_RES(DLG_SEL_GLOS)),
- aGlosBox(this, SW_RES( LB_GLOS)),
- aGlosFL(this, SW_RES( FL_GLOS)),
- aOKBtn(this, SW_RES( BT_OK)),
- aCancelBtn(this, SW_RES( BT_CANCEL)),
- aHelpBtn(this, SW_RES(BT_HELP))
+ : ModalDialog(pParent, "InsertAutoTextDialog",
+ "modules/swriter/ui/insertautotextdialog.ui")
{
- aGlosFL.SetText(aGlosFL.GetText() + rShortName);
- FreeResource();
-
- aGlosBox.SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl));
+ VclFrame *pFrame(get<VclFrame>("frame"));
+ pFrame->set_label(pFrame->get_label() + rShortName);
+ get(m_pGlosBox, "treeview");
+ m_pGlosBox->set_height_request(m_pGlosBox->GetTextHeight() * 10);
+ m_pGlosBox->SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl));
}
-// overload dtor
-SwSelGlossaryDlg::~SwSelGlossaryDlg() {}
-
IMPL_LINK(SwSelGlossaryDlg, DoubleClickHdl, ListBox*, /*pBox*/)
{
EndDialog(RET_OK);
diff --git a/sw/source/ui/dochdl/selglos.hrc b/sw/source/ui/dochdl/selglos.hrc
deleted file mode 100644
index 9513d3aa9f96..000000000000
--- a/sw/source/ui/dochdl/selglos.hrc
+++ /dev/null
@@ -1,25 +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 .
- */
-#define BT_OK 100
-#define BT_CANCEL 101
-#define BT_HELP 102
-#define LB_GLOS 1
-#define FL_GLOS 2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src
deleted file mode 100644
index 2a27214b9090..000000000000
--- a/sw/source/ui/dochdl/selglos.src
+++ /dev/null
@@ -1,69 +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 "selglos.hrc"
-#include "dochdl.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-ModalDialog DLG_SEL_GLOS
-{
- HelpID = CMD_FN_EXPAND_GLOSSARY ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 220 , 100 ) ;
- Text [ en-US ] = "Insert AutoText" ;
- Moveable = TRUE ;
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 164 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 164 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BT_HELP
- {
- Pos = MAP_APPFONT ( 164 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- FixedLine FL_GLOS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 152 , 8 ) ;
- Text [ en-US ] = "AutoTexts for shortcut " ;
- };
- ListBox LB_GLOS
- {
- HelpID = "sw:ListBox:DLG_SEL_GLOS:LB_GLOS";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 140 , 74 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */