sc/source/ui/dbgui/scuiasciiopt.cxx | 7 +++++++ sc/uiconfig/scalc/ui/textimportcsv.ui | 31 ++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-)
New commits: commit eea90af52e744d64c3d6ffd49c8859572450aed4 Author: Avramoniu Calin <[email protected]> AuthorDate: Wed Nov 27 11:16:04 2024 +0200 Commit: Gabriel Masei <[email protected]> CommitDate: Thu Dec 5 18:40:10 2024 +0100 tdf#163419 Save import dialog window size and skip resizing separator options Signed-off-by: Avramoniu Calin <[email protected]> Change-Id: Ib894b61edc15d4a89e7a83bb990a2819084879f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177397 Reviewed-by: Heiko Tietze <[email protected]> Tested-by: Jenkins diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index b35cf24ba7fb..c44bf2ad222d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -43,6 +43,7 @@ #include <unicode/ucsdet.h> #include <sfx2/objsh.hxx> #include <svx/txenctab.hxx> +#include <unotools/viewoptions.hxx> //! TODO make dynamic const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; @@ -373,6 +374,10 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD , mxAltTitle(m_xBuilder->weld_label(u"textalttitle"_ustr)) , mxTableBox(new ScCsvTableBox(*m_xBuilder)) { + SvtViewOptions aDlgOpt(EViewType::Dialog, "TextImportCsvDialog"); + if (aDlgOpt.Exists()) + m_xDialog->set_window_state(aDlgOpt.GetWindowState()); + OUString aName = m_xDialog->get_title(); switch (meCall) { @@ -591,6 +596,8 @@ IMPL_STATIC_LINK_NOARG(ScImportAsciiDlg, InstallLOKNotifierHdl, void*, vcl::ILib ScImportAsciiDlg::~ScImportAsciiDlg() { + SvtViewOptions aDlgOpt(EViewType::Dialog, "TextImportCsvDialog"); + aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::PosSize)); } bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& rcDetectSep ) diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui b/sc/uiconfig/scalc/ui/textimportcsv.ui index 0f841c5e4910..943cfcc6415c 100644 --- a/sc/uiconfig/scalc/ui/textimportcsv.ui +++ b/sc/uiconfig/scalc/ui/textimportcsv.ui @@ -238,7 +238,7 @@ <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="label-xalign">0</property> <property name="shadow-type">none</property> <child> @@ -247,15 +247,16 @@ <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkBox" id="box6"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="homogeneous">True</property> + <property name="hexpand">False</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="tofixedwidth"> <property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property> @@ -332,7 +333,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="margin-start">12</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> @@ -341,7 +342,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -362,7 +363,7 @@ <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -384,7 +385,7 @@ <property name="can-focus">True</property> <property name="receives-default">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -405,7 +406,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -425,7 +426,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -445,7 +446,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="use-underline">True</property> <property name="draw-indicator">True</property> <child internal-child="accessible"> @@ -464,7 +465,7 @@ <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="column-spacing">12</property> <child> <object class="GtkCheckButton" id="other"> @@ -492,7 +493,7 @@ <object class="GtkEntry" id="inputother"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="max-length">10</property> <property name="activates-default">True</property> <property name="width-chars">3</property> @@ -523,7 +524,7 @@ <object class="GtkGrid" id="grid4"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="texttextdelimiter"> @@ -543,7 +544,7 @@ <object class="GtkComboBoxText" id="textdelimiter"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> + <property name="hexpand">False</property> <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry">
