diff options
-rw-r--r-- | chart2/source/controller/dialogs/dlg_DataSource.cxx | 2 | ||||
-rw-r--r-- | chart2/uiconfig/ui/datarangedialog.ui | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuihyperdlg.cxx | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/hyperlinkdialog.ui | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
-rw-r--r-- | formula/uiconfig/ui/formuladialog.ui | 2 | ||||
-rw-r--r-- | sc/qa/uitest/chart/tdf99069.py | 2 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 2 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customanimationproperties.ui | 2 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/headerfooterdialog.ui | 2 | ||||
-rw-r--r-- | sfx2/source/control/emojicontrol.cxx | 2 | ||||
-rw-r--r-- | sfx2/uiconfig/ui/emojicontrol.ui | 2 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 2 | ||||
-rw-r--r-- | svx/uiconfig/ui/redlinecontrol.ui | 2 | ||||
-rw-r--r-- | uitest/demo_ui/tabcontrol.py | 2 | ||||
-rw-r--r-- | uitest/demo_ui/treelist.py | 2 | ||||
-rw-r--r-- | vcl/uiconfig/ui/printerpropertiesdialog.ui | 2 | ||||
-rw-r--r-- | vcl/unx/generic/print/prtsetup.cxx | 2 |
19 files changed, 19 insertions, 19 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 66b108d4c8e0..39f1d5eae6c0 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -85,7 +85,7 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent, , m_bRangeChooserTabIsValid(true) , m_bDataSourceTabIsValid(true) , m_bTogglingEnabled(true) - , m_xTabControl(m_xBuilder->weld_notebook("notebook")) + , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol")) , m_xBtnOK(m_xBuilder->weld_button("ok")) { m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this, diff --git a/chart2/uiconfig/ui/datarangedialog.ui b/chart2/uiconfig/ui/datarangedialog.ui index ca28c6f1392d..0812509c6e33 100644 --- a/chart2/uiconfig/ui/datarangedialog.ui +++ b/chart2/uiconfig/ui/datarangedialog.ui @@ -77,7 +77,7 @@ </packing> </child> <child> - <object class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 8ea92bc926b2..b5fb3757c336 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -88,7 +88,7 @@ SvxHpLinkDlg::SvxHpLinkDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld: , pExampleSet ( nullptr ) , maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ) , mbIsHTMLDoc ( false ) - , m_xIconCtrl(m_xBuilder->weld_notebook("icon_control")) + , m_xIconCtrl(m_xBuilder->weld_notebook("tabcontrol")) , m_xOKBtn(m_xBuilder->weld_button("ok")) , m_xApplyBtn(m_xBuilder->weld_button("apply")) , m_xCancelBtn(m_xBuilder->weld_button("cancel")) diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index 59c1afa2af9b..c509eebaa113 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -105,7 +105,7 @@ </packing> </child> <child> - <object class="GtkNotebook" id="icon_control"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 101e07c9354d..70e33b0a3df8 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -233,7 +233,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog, , m_nSelectionEnd(-1) , m_pTheRefEdit(nullptr) , m_pTheRefButton(nullptr) - , m_xTabCtrl(rBuilder.weld_notebook("tabs")) + , m_xTabCtrl(rBuilder.weld_notebook("tabcontrol")) , m_xParaWinBox(rBuilder.weld_container("BOX")) , m_xFtHeadLine(rBuilder.weld_label("headline")) , m_xFtFuncName(rBuilder.weld_label("funcname")) diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui index b2f016f37508..7c88ecd3944b 100644 --- a/formula/uiconfig/ui/formuladialog.ui +++ b/formula/uiconfig/ui/formuladialog.ui @@ -137,7 +137,7 @@ <property name="vexpand">True</property> <property name="spacing">6</property> <child> - <object class="GtkNotebook" id="tabs"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sc/qa/uitest/chart/tdf99069.py b/sc/qa/uitest/chart/tdf99069.py index e3530c8c1920..0988efc09a8c 100644 --- a/sc/qa/uitest/chart/tdf99069.py +++ b/sc/qa/uitest/chart/tdf99069.py @@ -58,7 +58,7 @@ class tdf99069(UITestCase): #(7) Click on tab "Data Series". (Actually, tab "Data Range" crashes, # too. This step is just a remnant of what I was doing when I # stumbled over the bug.) - notebook = xDialog.getChild("notebook") + notebook = xDialog.getChild("tabcontrol") select_pos(notebook, "0") select_pos(notebook, "1") diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 299806bdf22c..1052b7b89e9c 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -2806,7 +2806,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, weld::ComboBox&, CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& rPage) : GenericDialogController(pParent, "modules/simpress/ui/customanimationproperties.ui", "CustomAnimationProperties") , mxSet(std::move(pSet)) - , mxTabControl(m_xBuilder->weld_notebook("tabs")) + , mxTabControl(m_xBuilder->weld_notebook("tabcontrol")) , mxDurationTabPage(new CustomAnimationDurationTabPage(mxTabControl->get_page("timing"), mxSet.get())) , mxEffectTabPage(new CustomAnimationEffectTabPage(mxTabControl->get_page("effect"), m_xDialog.get(), mxSet.get())) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 320e6fe54695..e93b40d47514 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -160,7 +160,7 @@ HeaderFooterDialog::HeaderFooterDialog(ViewShell* pViewShell, weld::Window* pPar , mpDoc( pDoc ) , mpCurrentPage( pCurrentPage ) , mpViewShell( pViewShell ) - , mxTabCtrl(m_xBuilder->weld_notebook("tabs")) + , mxTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) , mxPBApplyToAll(m_xBuilder->weld_button("apply_all")) , mxPBApply(m_xBuilder->weld_button("apply")) , mxPBCancel(m_xBuilder->weld_button("cancel")) diff --git a/sd/uiconfig/simpress/ui/customanimationproperties.ui b/sd/uiconfig/simpress/ui/customanimationproperties.ui index 7737e01eab12..15bbf395b01c 100644 --- a/sd/uiconfig/simpress/ui/customanimationproperties.ui +++ b/sd/uiconfig/simpress/ui/customanimationproperties.ui @@ -76,7 +76,7 @@ </packing> </child> <child> - <object class="GtkNotebook" id="tabs"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sd/uiconfig/simpress/ui/headerfooterdialog.ui b/sd/uiconfig/simpress/ui/headerfooterdialog.ui index a138c9344f6f..0d7f67d1f38a 100644 --- a/sd/uiconfig/simpress/ui/headerfooterdialog.ui +++ b/sd/uiconfig/simpress/ui/headerfooterdialog.ui @@ -92,7 +92,7 @@ </packing> </child> <child> - <object class="GtkNotebook" id="tabs"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 4ed5f48029e8..7deab4abb0d5 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; SfxEmojiControl::SfxEmojiControl(sal_uInt16 nId, vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame) : SfxPopupWindow(nId, pParent, "emojictrl", "sfx/ui/emojicontrol.ui", rFrame) { - get(mpTabControl, "tab_control"); + get(mpTabControl, "tabcontrol"); get(mpEmojiView, "emoji_view"); sal_uInt16 nCurPageId = mpTabControl->GetPageId(FILTER_PEOPLE); diff --git a/sfx2/uiconfig/ui/emojicontrol.ui b/sfx2/uiconfig/ui/emojicontrol.ui index e205eef363f6..ea9d72ccb2ee 100644 --- a/sfx2/uiconfig/ui/emojicontrol.ui +++ b/sfx2/uiconfig/ui/emojicontrol.ui @@ -19,7 +19,7 @@ <property name="resize_mode">queue</property> <property name="orientation">vertical</property> <child> - <object class="GtkNotebook" id="tab_control"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="scrollable">True</property> diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 705eefdb1b96..a045af36efcc 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -963,7 +963,7 @@ IMPL_LINK_NOARG(SvxTPFilter, RefHandle, weld::Button&, void) SvxAcceptChgCtr::SvxAcceptChgCtr(weld::Container* pParent, weld::Window* pDialog, weld::Builder* pTopLevel) : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/redlinecontrol.ui")) - , m_xTabCtrl(m_xBuilder->weld_notebook("RedlineControl")) + , m_xTabCtrl(m_xBuilder->weld_notebook("tabcontrol")) { m_xTabCtrl->connect_enter_page(LINK(this, SvxAcceptChgCtr, ActivatePageHdl)); m_xTabCtrl->connect_leave_page(LINK(this, SvxAcceptChgCtr, DeactivatePageHdl)); diff --git a/svx/uiconfig/ui/redlinecontrol.ui b/svx/uiconfig/ui/redlinecontrol.ui index 6407dd5f6260..6dd4098bf2fe 100644 --- a/svx/uiconfig/ui/redlinecontrol.ui +++ b/svx/uiconfig/ui/redlinecontrol.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.18"/> - <object class="GtkNotebook" id="RedlineControl"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/uitest/demo_ui/tabcontrol.py b/uitest/demo_ui/tabcontrol.py index 2dbe3ef842bf..47b3f33a3cf4 100644 --- a/uitest/demo_ui/tabcontrol.py +++ b/uitest/demo_ui/tabcontrol.py @@ -27,7 +27,7 @@ class TabControlTest(UITestCase): xFunctionDlg = self.xUITest.getTopFocusWindow() - xTabs = xFunctionDlg.getChild("tabs") + xTabs = xFunctionDlg.getChild("tabcontrol") select_pos(xTabs, "1") xCancelBtn = xFunctionDlg.getChild("cancel") diff --git a/uitest/demo_ui/treelist.py b/uitest/demo_ui/treelist.py index cbda8e2c1532..265fa8b975b3 100644 --- a/uitest/demo_ui/treelist.py +++ b/uitest/demo_ui/treelist.py @@ -27,7 +27,7 @@ class TreeListTest(UITestCase): xFunctionDlg = self.xUITest.getTopFocusWindow() - xTabs = xFunctionDlg.getChild("tabs") + xTabs = xFunctionDlg.getChild("tabcontrol") select_pos(xTabs, "1") xTreelist = xTabs.getChild("struct") diff --git a/vcl/uiconfig/ui/printerpropertiesdialog.ui b/vcl/uiconfig/ui/printerpropertiesdialog.ui index 62301b2dfa2c..32b3a98d34c3 100644 --- a/vcl/uiconfig/ui/printerpropertiesdialog.ui +++ b/vcl/uiconfig/ui/printerpropertiesdialog.ui @@ -58,7 +58,7 @@ </packing> </child> <child> - <object class="GtkNotebook" id="notebook"> + <object class="GtkNotebook" id="tabcontrol"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 0bbbc75ad759..a484de3da1b5 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -74,7 +74,7 @@ RTSDialog::RTSDialog(const PrinterInfo& rJobData, weld::Window* pParent) , m_aJobData(rJobData) , m_aInvalidString(VclResId(SV_PRINT_INVALID_TXT)) , m_bDataModified(false) - , m_xTabControl(m_xBuilder->weld_notebook("notebook")) + , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol")) , m_xOKButton(m_xBuilder->weld_button("ok")) , m_xCancelButton(m_xBuilder->weld_button("cancel")) , m_xPaperPage(new RTSPaperPage(m_xTabControl->get_page("paper"), this)) |