diff options
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/dlg/BulletAndPositionDlg.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/BulletAndPositionDlg.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/custsdlg.hxx | 4 | ||||
-rw-r--r-- | sfx2/inc/autoredactdialog.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/autoredactdialog.cxx | 1 | ||||
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/versdlg.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 6 |
15 files changed, 3 insertions, 44 deletions
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index b99a512d1168..e1fc4729176c 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -1246,14 +1246,13 @@ namespace { class BinaryInput { Sequence< sal_Int8 > m_aData; - Reference< XComponentContext > m_xContext; const sal_Int8* m_pData; sal_Int32 m_nCurPos; sal_Int32 m_nSize; public: - BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XComponentContext > const & xContext ); + BinaryInput( const Sequence< ::sal_Int8 >& aData ); Reference< io::XInputStream > getInputStreamForSection( sal_Int32 nSize ); @@ -1269,9 +1268,8 @@ public: } -BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XComponentContext > const & xContext ) +BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData ) : m_aData( aData ) - , m_xContext( xContext ) { m_pData = m_aData.getConstArray(); m_nCurPos = 0; @@ -1384,7 +1382,7 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >& while( nOldLocaleCount > 0 ); // Import data - BinaryInput aIn( Data, m_xContext ); + BinaryInput aIn( Data ); aIn.readInt16(); // version sal_Int32 nLocaleCount = aIn.readInt16(); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 83a57efb0ad4..625a3049695e 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -902,7 +902,6 @@ private: std::unique_ptr<weld::Label> mxFTSound; std::unique_ptr<weld::ComboBox> mxLBSound; std::unique_ptr<weld::Button> mxPBSoundPreview; - std::unique_ptr<weld::Label> mxFTAfterEffect; std::unique_ptr<weld::ComboBox> mxLBAfterEffect; std::unique_ptr<weld::Label> mxFTDimColor; std::unique_ptr<ColorListBox> mxCLBDimColor; @@ -927,7 +926,6 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage(weld::Container* pPar , mxFTSound(mxBuilder->weld_label("sound_label")) , mxLBSound(mxBuilder->weld_combo_box("sound_list")) , mxPBSoundPreview(mxBuilder->weld_button("sound_preview")) - , mxFTAfterEffect(mxBuilder->weld_label("aeffect_label")) , mxLBAfterEffect(mxBuilder->weld_combo_box("aeffect_list")) , mxFTDimColor(mxBuilder->weld_label("dim_color_label")) , mxCLBDimColor(new ColorListBox(mxBuilder->weld_menu_button("dim_color_list"), [pDialog]{ return pDialog; })) @@ -1433,9 +1431,7 @@ private: std::unique_ptr<weld::Builder> mxBuilder; std::unique_ptr<weld::Container> mxContainer; - std::unique_ptr<weld::Label> mxFTStart; std::unique_ptr<weld::ComboBox> mxLBStart; - std::unique_ptr<weld::Label> mxFTStartDelay; std::unique_ptr<weld::MetricSpinButton> mxMFStartDelay; std::unique_ptr<weld::Label> mxFTDuration; std::unique_ptr<weld::MetricSpinButton> mxCBXDuration; @@ -1451,9 +1447,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container* : mpSet(pSet) , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationtimingtab.ui")) , mxContainer(mxBuilder->weld_container("TimingTab")) - , mxFTStart(mxBuilder->weld_label("start_label")) , mxLBStart(mxBuilder->weld_combo_box("start_list")) - , mxFTStartDelay(mxBuilder->weld_label("delay_label")) , mxMFStartDelay(mxBuilder->weld_metric_spin_button("delay_value", FieldUnit::SECOND)) , mxFTDuration(mxBuilder->weld_label("duration_label")) , mxCBXDuration(mxBuilder->weld_metric_spin_button("anim_duration", FieldUnit::SECOND)) @@ -1785,7 +1779,6 @@ private: std::unique_ptr<weld::Builder> mxBuilder; std::unique_ptr<weld::Container> mxContainer; - std::unique_ptr<weld::Label> mxFTGroupText; std::unique_ptr<weld::ComboBox> mxLBGroupText; std::unique_ptr<weld::CheckButton> mxCBXGroupAuto; std::unique_ptr<weld::MetricSpinButton> mxMFGroupAuto; @@ -1798,7 +1791,6 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(weld::Container* , mbHasVisibleShapes(true) , mxBuilder(Application::CreateBuilder(pParent, "modules/simpress/ui/customanimationtexttab.ui")) , mxContainer(mxBuilder->weld_container("TextAnimationTab")) - , mxFTGroupText(mxBuilder->weld_label("group_text_label")) , mxLBGroupText(mxBuilder->weld_combo_box("group_text_list")) , mxCBXGroupAuto(mxBuilder->weld_check_button("auto_after")) , mxMFGroupAuto(mxBuilder->weld_metric_spin_button("auto_after_value",FieldUnit::SECOND)) diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 384b477e46b6..763d0b25435f 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -114,7 +114,6 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf , m_xDistBorderFT(m_xBuilder->weld_label("indent")) , m_xDistBorderMF(m_xBuilder->weld_metric_spin_button("indentmf", FieldUnit::CM)) , m_xRelativeCB(m_xBuilder->weld_check_button("relative")) - , m_xIndentFT(m_xBuilder->weld_label("numberingwidth")) , m_xIndentMF(m_xBuilder->weld_metric_spin_button("numberingwidthmf", FieldUnit::CM)) , m_xLeftTB(m_xBuilder->weld_toggle_button("left")) , m_xCenterTB(m_xBuilder->weld_toggle_button("center")) diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index bc421d7e48a5..1774b62d0211 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -41,9 +41,7 @@ SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc , m_xBtnEdit(m_xBuilder->weld_button("edit")) , m_xBtnRemove(m_xBuilder->weld_button("delete")) , m_xBtnCopy(m_xBuilder->weld_button("copy")) - , m_xBtnHelp(m_xBuilder->weld_button("help")) , m_xBtnStartShow(m_xBuilder->weld_button("startshow")) - , m_xBtnOK(m_xBuilder->weld_button("ok")) { m_xLbCustomShows->set_size_request(m_xLbCustomShows->get_approximate_digit_width() * 32, m_xLbCustomShows->get_height_rows(8)); @@ -252,8 +250,6 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg(weld::Window* pWindow, SdDrawDocume , m_xLbCustomPages(m_xBuilder->weld_tree_view("custompages")) , m_xDropTargetHelper(new weld::ReorderingDropTarget(*m_xLbCustomPages)) , m_xBtnOK(m_xBuilder->weld_button("ok")) - , m_xBtnCancel(m_xBuilder->weld_button("cancel")) - , m_xBtnHelp(m_xBuilder->weld_button("help")) { Link<weld::Button&,void> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl ); m_xBtnAdd->connect_clicked( aLink ); diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 6dde737537ce..90f940487cb7 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -98,7 +98,6 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController std::unique_ptr<weld::Label> m_xDistBorderFT; std::unique_ptr<weld::MetricSpinButton> m_xDistBorderMF; std::unique_ptr<weld::CheckButton> m_xRelativeCB; - std::unique_ptr<weld::Label> m_xIndentFT; std::unique_ptr<weld::MetricSpinButton> m_xIndentMF; std::unique_ptr<weld::Toggleable> m_xLeftTB; std::unique_ptr<weld::Toggleable> m_xCenterTB; diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 52ae878529a9..c6547cc918ff 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -37,9 +37,7 @@ private: std::unique_ptr<weld::Button> m_xBtnEdit; std::unique_ptr<weld::Button> m_xBtnRemove; std::unique_ptr<weld::Button> m_xBtnCopy; - std::unique_ptr<weld::Button> m_xBtnHelp; std::unique_ptr<weld::Button> m_xBtnStartShow; - std::unique_ptr<weld::Button> m_xBtnOK; void CheckState(); @@ -69,8 +67,6 @@ private: std::unique_ptr<weld::TreeView> m_xLbCustomPages; std::unique_ptr<weld::ReorderingDropTarget> m_xDropTargetHelper; std::unique_ptr<weld::Button> m_xBtnOK; - std::unique_ptr<weld::Button> m_xBtnCancel; - std::unique_ptr<weld::Button> m_xBtnHelp; void CheckState(); void CheckCustomShow(); diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx index 28c2c561f60d..540494c932ea 100644 --- a/sfx2/inc/autoredactdialog.hxx +++ b/sfx2/inc/autoredactdialog.hxx @@ -102,7 +102,6 @@ class SfxAutoRedactDialog final : public SfxDialogController bool m_bIsValidState; bool m_bTargetsCopied; - std::unique_ptr<weld::Label> m_xRedactionTargetsLabel; std::unique_ptr<TargetsTable> m_xTargetsBox; std::unique_ptr<weld::Button> m_xLoadBtn; std::unique_ptr<weld::Button> m_xSaveBtn; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 3b683b743bfd..624caf17f8fd 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -65,7 +65,6 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::D , m_xFilterFt(m_xBuilder->weld_label("categoryft")) , m_xFilterLb(m_xBuilder->weld_combo_box("category")) , m_xDescFt(m_xBuilder->weld_label("desc")) - , m_xNameFt(m_xBuilder->weld_label("nameft")) { m_xFollowLb->make_sorted(); // tdf#120188 like SwCharURLPage limit the width of the style combos diff --git a/sfx2/source/dialog/mgetempl.hxx b/sfx2/source/dialog/mgetempl.hxx index ef0d2fdcdd23..7bc67cec3c7e 100644 --- a/sfx2/source/dialog/mgetempl.hxx +++ b/sfx2/source/dialog/mgetempl.hxx @@ -61,7 +61,6 @@ class SfxManageStyleSheetPage final : public SfxTabPage std::unique_ptr<weld::Label> m_xFilterFt; std::unique_ptr<weld::ComboBox> m_xFilterLb; std::unique_ptr<weld::Label> m_xDescFt; - std::unique_ptr<weld::Label> m_xNameFt; friend class SfxStyleDialogController; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index fb9f8c1a0bc1..a0cc25da07c4 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -172,7 +172,6 @@ void SfxCommonTemplateDialog_Impl::connect_stylelist_set_water_can_state( SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl(SfxBindings* pB, weld::Container* pC, weld::Builder* pBuilder) : pBindings(pB) - , mpContainer(pC) , xModuleManager(frame::ModuleManager::create(::comphelper::getProcessComponentContext())) , m_pDeletionWatcher(nullptr) , m_aStyleList(pBuilder, pB, this, pC, "treeview", "flatview") diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 47f33b63430c..f4122906d91d 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -428,10 +428,6 @@ IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, weld::Button&, rButton, void) SfxCmisVersionsDialog::SfxCmisVersionsDialog(weld::Window* pParent, SfxViewFrame* pVwFrame) : SfxDialogController(pParent, "sfx/ui/versionscmis.ui", "VersionsCmisDialog") , m_pViewFrame(pVwFrame) - , m_xOpenButton(m_xBuilder->weld_button("open")) - , m_xViewButton(m_xBuilder->weld_button("show")) - , m_xDeleteButton(m_xBuilder->weld_button("delete")) - , m_xCompareButton(m_xBuilder->weld_button("compare")) , m_xVersionBox(m_xBuilder->weld_tree_view("versions")) { m_xVersionBox->set_size_request(m_xVersionBox->get_approximate_digit_width() * 90, diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx index 6509f8c47360..4831ac46d74f 100644 --- a/sfx2/source/doc/autoredactdialog.cxx +++ b/sfx2/source/doc/autoredactdialog.cxx @@ -525,7 +525,6 @@ SfxAutoRedactDialog::SfxAutoRedactDialog(weld::Window* pParent) : SfxDialogController(pParent, "sfx/ui/autoredactdialog.ui", "AutoRedactDialog") , m_bIsValidState(true) , m_bTargetsCopied(false) - , m_xRedactionTargetsLabel(m_xBuilder->weld_label("labelRedactionTargets")) , m_xTargetsBox(new TargetsTable(m_xBuilder->weld_tree_view("targets"))) , m_xLoadBtn(m_xBuilder->weld_button("btnLoadTargets")) , m_xSaveBtn(m_xBuilder->weld_button("btnSaveTargets")) diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 6c72de1ca8e4..89d8fcfe0bc3 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -64,8 +64,6 @@ protected: SfxBindings* pBindings; - weld::Container* mpContainer; - css::uno::Reference<css::frame::XModuleManager2> xModuleManager; DeletionWatcher* m_pDeletionWatcher; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 22513f365220..02bcccf9668c 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -77,10 +77,6 @@ class SfxCmisVersionsDialog final : public SfxDialogController SfxViewFrame* m_pViewFrame; std::unique_ptr<SfxVersionTableDtor> m_pTable; - std::unique_ptr<weld::Button> m_xOpenButton; - std::unique_ptr<weld::Button> m_xViewButton; - std::unique_ptr<weld::Button> m_xDeleteButton; - std::unique_ptr<weld::Button> m_xCompareButton; std::unique_ptr<weld::TreeView> m_xVersionBox; void LoadVersions(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 84a7cda21adc..813c92d99fc1 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -160,10 +160,6 @@ namespace { /// Asks the user if editing a read-only document is really wanted. class SfxEditDocumentDialog : public weld::MessageDialogController { -private: - std::unique_ptr<weld::Button> m_xEditDocument; - std::unique_ptr<weld::Button> m_xCancel; - public: SfxEditDocumentDialog(weld::Widget* pParent); }; @@ -171,8 +167,6 @@ public: SfxEditDocumentDialog::SfxEditDocumentDialog(weld::Widget* pParent) : MessageDialogController(pParent, "sfx/ui/editdocumentdialog.ui", "EditDocumentDialog") - , m_xEditDocument(m_xBuilder->weld_button("edit")) - , m_xCancel(m_xBuilder->weld_button("cancel")) { } |