diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/ui/dbgui/csvtablebox.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/dbgui/filtdlg.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/datafdlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/optsolver.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2 |
5 files changed, 5 insertions, 10 deletions
diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 9f1de427291a..908a6ea61bad 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,11 +25,10 @@ ScCsvTableBox::ScCsvTableBox(weld::Builder& rBuilder) : mxRuler(new ScCsvRuler(maData, this)) , mxGrid(new ScCsvGrid(maData, rBuilder.weld_menu("popup"), this)) - , mxScroll(rBuilder.weld_scrolled_window("scrolledwindow")) + , mxScroll(rBuilder.weld_scrolled_window("scrolledwindow", true)) , mxRulerWeld(new weld::CustomWeld(rBuilder, "csvruler", *mxRuler)) , mxGridWeld(new weld::CustomWeld(rBuilder, "csvgrid", *mxGrid)) { - mxScroll->set_user_managed_scrolling(); Size aSize(mxScroll->get_approximate_digit_width() * 67, mxScroll->get_text_height() * 10); // this needs to be larger than the ScCsvGrid initial size to get it diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index ff4653f8d971..0d439f86c273 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -82,7 +82,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pPa , m_xEdVal4(m_xBuilder->weld_combo_box("val4")) , m_xBtnRemove4(m_xBuilder->weld_button("remove4")) , m_xContents(m_xBuilder->weld_widget("grid")) - , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xExpander(m_xBuilder->weld_expander("more")) , m_xBtnClear(m_xBuilder->weld_button("clear")) , m_xBtnOk(m_xBuilder->weld_button("ok")) @@ -259,7 +259,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) UpdateValueList(i+1); } - m_xScrollBar->set_user_managed_scrolling(); m_xScrollBar->connect_vadjustment_changed( LINK( this, ScFilterDlg, ScrollHdl ) ); m_xScrollBar->vadjustment_configure(0, 0, 8, 1, 3, 4); Size aSize(m_xContents->get_preferred_size()); diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index df21fb4c26b7..0e6fe0d76584 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -35,12 +35,10 @@ ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShel , m_xBtnPrev(m_xBuilder->weld_button("prev")) , m_xBtnNext(m_xBuilder->weld_button("next")) , m_xBtnClose(m_xBuilder->weld_button("close")) - , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xGrid(m_xBuilder->weld_container("grid")) , m_xFixedText(m_xBuilder->weld_label("label")) { - m_xSlider->set_user_managed_scrolling(); - sNewRecord = m_xFixedText->get_label(); //read header from current document, and add new controls diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 763ca762bee6..2da4898cfa48 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -198,7 +198,7 @@ ScOptSolverDlg::ScOptSolverDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo , m_xEdRight4(new ScCursorRefEdit(m_xBuilder->weld_entry("val4edit"))) , m_xRBRight4(new formula::RefButton(m_xBuilder->weld_button("val4button"))) , m_xBtnDel4(m_xBuilder->weld_button("del4")) - , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar")) + , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true)) , m_xBtnOpt(m_xBuilder->weld_button("options")) , m_xBtnCancel(m_xBuilder->weld_button("close")) , m_xBtnSolve(m_xBuilder->weld_button("ok")) @@ -323,7 +323,6 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) } m_xEdTargetValue->SetModifyHdl( LINK( this, ScOptSolverDlg, TargetModifyHdl ) ); - m_xScrollBar->set_user_managed_scrolling(); Size aSize(m_xContents->get_preferred_size()); m_xContents->set_size_request(aSize.Width(), aSize.Height()); m_xScrollBar->connect_vadjustment_changed( LINK( this, ScOptSolverDlg, ScrollHdl ) ); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index aa19882544c6..0d873c901043 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -33,7 +33,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const OUString& rTitle, : GenericDialogController(pParent, "modules/scalc/ui/tabcolordialog.ui", "TabColorDialog") , m_aTabBgColor(rDefaultColor) , m_xSelectPalette(m_xBuilder->weld_combo_box("paletteselector")) - , m_xTabBgColorSet(new ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin"))) + , m_xTabBgColorSet(new ScTabBgColorValueSet(m_xBuilder->weld_scrolled_window("colorsetwin", true))) , m_xTabBgColorSetWin(new weld::CustomWeld(*m_xBuilder, "colorset", *m_xTabBgColorSet)) , m_xBtnOk(m_xBuilder->weld_button("ok")) { |