diff options
30 files changed, 22 insertions, 230 deletions
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index d9265799b5e9..c5cc3fcbcfe2 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -34,10 +34,6 @@ class MorkDriver: { public: explicit MorkDriver(const css::uno::Reference< css::uno::XComponentContext >& context); - static OUString getImplementationName_Static() - throw(css::uno::RuntimeException); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static() - throw (css::uno::RuntimeException); const css::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& getFactory(){return m_xFactory;} const OUString& getProfilePath() {return m_sProfilePath;} diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 131e4d001353..dafd1ab2ad78 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -77,8 +77,6 @@ private: protected: IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); - sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } - public: virtual ~IconChoicePage(); virtual void dispose() override; diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 7fb02c5120a7..42aaa9924067 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -131,7 +131,6 @@ namespace formula virtual void clear() = 0; virtual void deleteFormData() = 0; - virtual void setReferenceInput(const FormEditData* _pData) = 0; virtual IFunctionManager* getFunctionManager() = 0; virtual ::std::unique_ptr<FormulaTokenArray> convertToTokenArray(const css::uno::Sequence< css::sheet::FormulaToken >& _aTokenList) = 0; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 8c884010b900..8d6f462adb9a 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -89,9 +89,7 @@ public: void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const OUString& rURL ); void SetReadOnly( bool bSet ) { bReadOnly = bSet;} - bool IsReadOnly( ) const { return bReadOnly;} void SetEditable( bool bSet ); - bool IsEditable() const; // Size void SetResizable( bool bRes ) diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 38445864a56a..9d368c6399ad 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -73,8 +73,6 @@ public: virtual ~TemplateAbstractView(); virtual void dispose() override; - void insertItem (const TemplateItemProperties &rTemplate); - // Fill view with new item list void insertItems (const std::vector<TemplateItemProperties> &rTemplates); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 85d932dd4e2e..ce95841dd6d9 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -132,8 +132,6 @@ private: bool insertRepository (const OUString &rName, const OUString &rURL); - bool deleteRepository (const sal_uInt16 nRepositoryId); - void syncRepositories () const; /// Return filter according to the currently selected application filter. diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 2b75a58ddd72..77c9cb0f05e3 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -128,9 +128,6 @@ void FormulaDialog::dispatch(bool /*_bOK*/, bool /*_bMatrixChecked*/) void FormulaDialog::setDispatcherLock( bool /*bLock*/ ) { } -void FormulaDialog::setReferenceInput(const FormEditData* /*_pData*/) -{ -} void FormulaDialog::deleteFormData() { } diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 3df43615d1f1..b0df2699c525 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -79,7 +79,6 @@ public: virtual void showReference(const OUString& _sFormula) override; virtual void dispatch(bool _bOK, bool _bMatrixChecked) override; virtual void setDispatcherLock( bool bLock ) override; - virtual void setReferenceInput(const formula::FormEditData* _pData) override; virtual void deleteFormData() override; virtual void clear() override; virtual void switchBack() override; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index a46baca71954..996c567efcd9 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -322,19 +322,6 @@ private: bool mbCont; /// True = automatic CONTINUE lookup enabled. }; -class BiffInputStreamPos -{ -public: - explicit BiffInputStreamPos( BiffInputStream& rStrm ); - - void restorePosition(); - -private: - BiffInputStream& mrStrm; - sal_Int64 mnRecHandle; - sal_Int64 mnRecPos; -}; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index da1024672e03..b47735947bb3 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { -class BiffInputStreamPos; - // codes for built-in names const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00'; const sal_Unicode BIFF_DEFNAME_AUTOOPEN = '\x01'; // Sheet macro executed when workbook is opened. @@ -127,14 +125,12 @@ public: private: typedef ::std::unique_ptr< StreamDataSequence > StreamDataSeqPtr; - typedef ::std::unique_ptr< BiffInputStreamPos > BiffStreamPosPtr; ScRangeData* mpScRangeData; /// ScRangeData of the defined name. sal_Int32 mnTokenIndex; /// Name index used in API token array. sal_Int16 mnCalcSheet; /// Calc sheet index for sheet-local names. sal_Unicode mcBuiltinId; /// Identifier for built-in defined names. StreamDataSeqPtr mxFormula; /// Formula data for BIFF12 import. - BiffStreamPosPtr mxBiffStrm; /// Cached BIFF stream for formula import. }; typedef std::shared_ptr< DefinedName > DefinedNameRef; diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 1cb323b7c217..692fff262782 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -42,9 +42,6 @@ public: sal_Int32 mnSharedId; SharedFormulaEntry( - const css::table::CellAddress& rAddress, - const OUString& rTokenStr, sal_Int32 nSharedId ); - SharedFormulaEntry( const ScAddress& rAddress, const OUString& rTokenStr, sal_Int32 nSharedId ); }; @@ -60,9 +57,6 @@ public: sal_Int32 mnValueType; SharedFormulaDesc( - const css::table::CellAddress& rAddr, sal_Int32 nSharedId, - const OUString& rCellValue, sal_Int32 nValueType ); - SharedFormulaDesc( const ScAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); }; @@ -72,7 +66,6 @@ public: OUString maTokenStr; ScAddress maCellAddress; TokenAddressItem( const OUString& rTokenStr, const ScAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress ) {} - TokenAddressItem( const OUString& rTokenStr, const css::table::CellAddress& rCellAddress ) : maTokenStr( rTokenStr ), maCellAddress( rCellAddress.Column, rCellAddress.Row, rCellAddress.Sheet ) {} }; struct TokenRangeAddressItem diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 8090953328df..26ff2b12c784 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -653,9 +653,6 @@ public: void applyPatternToAttrList( AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt ); - /** Writes all formatting attributes to the passed property map. */ - void writeToPropertyMap( PropertyMap& rPropMap ) const; - void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange ); const ::ScPatternAttr& createPattern( bool bSkipPoolDefs = false ); diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index 0607e067e669..685784b012c3 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -478,20 +478,6 @@ void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAd ornAddSize = 4 * nFontCount + ::std::max< sal_Int32 >( 0, nPhoneticSize ); } -BiffInputStreamPos::BiffInputStreamPos( BiffInputStream& rStrm ) : - mrStrm( rStrm ), - mnRecHandle( rStrm.getRecHandle() ), - mnRecPos( rStrm.tell() ) -{ -} - -void BiffInputStreamPos::restorePosition() -{ - bool bValidRec = mrStrm.startRecordByHandle( mnRecHandle ); - if( bValidRec ) - mrStrm.seek( mnRecPos ); -} - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index feb6c2f166cd..acc58ba46755 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -300,7 +300,7 @@ void DefinedName::createNameObject( sal_Int32 nIndex ) return; // skip BIFF names without stream position (e.g. BIFF3-BIFF4 internal 3D references) - if( (getFilterType() == FILTER_BIFF) && !mxBiffStrm.get() ) + if( getFilterType() == FILTER_BIFF ) return; // convert original name to final Calc name (TODO: filter invalid characters from model name) diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index b265093696ea..4c1eb0529a71 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -344,21 +344,11 @@ FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry( const OUString& rTokenStr, sal_Int32 nSharedId ) : maAddress(rAddr), maTokenStr(rTokenStr), mnSharedId(nSharedId) {} -FormulaBuffer::SharedFormulaEntry::SharedFormulaEntry( - const css::table::CellAddress& rAddr, - const OUString& rTokenStr, sal_Int32 nSharedId ) : - maAddress( ScAddress( rAddr.Column, rAddr.Row, rAddr.Sheet ) ), maTokenStr(rTokenStr), mnSharedId(nSharedId) {} - FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc( const ScAddress& rAddr, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) : maAddress(rAddr), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {} -FormulaBuffer::SharedFormulaDesc::SharedFormulaDesc( - const css::table::CellAddress& rAddr, sal_Int32 nSharedId, - const OUString& rCellValue, sal_Int32 nValueType ) : - maAddress( ScAddress( rAddr.Column, rAddr.Row, rAddr.Sheet ) ), mnSharedId(nSharedId), maCellValue(rCellValue), mnValueType(nValueType) {} - FormulaBuffer::SheetItem::SheetItem() : mpCellFormulas(nullptr), mpArrayFormulas(nullptr), diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index f6eaddfdbf76..5e0e09b035f7 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2188,29 +2188,6 @@ void Xf::applyPatternToAttrList( AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal } } -void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const -{ - StylesBuffer& rStyles = getStyles(); - - // create and set cell style. - - // TODO : We should gradually move things to writeToDoc(), to set cell - // styles to the document directly. - - if( maModel.mbFontUsed ) - rStyles.writeFontToPropertyMap( rPropMap, maModel.mnFontId ); - if( maModel.mbNumFmtUsed ) - rStyles.writeNumFmtToPropertyMap( rPropMap, maModel.mnNumFmtId ); - if( maModel.mbAlignUsed ) - maAlignment.writeToPropertyMap( rPropMap ); - if( maModel.mbProtUsed ) - maProtection.writeToPropertyMap( rPropMap ); - if( maModel.mbBorderUsed ) - rStyles.writeBorderToPropertyMap( rPropMap, maModel.mnBorderId ); - if( maModel.mbAreaUsed ) - rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId ); -} - void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange ) { const StylesBuffer& rStyles = getStyles(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 177a0bbce184..bf50ba5e2e7a 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -539,12 +539,6 @@ void ScFormulaDlg::setDispatcherLock( bool bLock ) { ScFormulaReferenceHelper::SetDispatcherLock( bLock ); } -void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData) -{ - ScModule* pScMod = SC_MOD(); - ScFormEditData& rData = const_cast<ScFormEditData&>(dynamic_cast<const ScFormEditData&>(*_pData)); - pScMod->SetRefInputHdl(rData.GetInputHandler()); -} void ScFormulaDlg::deleteFormData() { ScModule* pScMod = SC_MOD(); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index fc72393b8020..0efb75d5f6af 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -65,7 +65,6 @@ public: virtual void showReference(const OUString& _sFormula) override; virtual void dispatch(bool _bOK, bool _bMatrixChecked) override; virtual void setDispatcherLock( bool bLock ) override; - virtual void setReferenceInput(const formula::FormEditData* _pData) override; virtual void deleteFormData() override; virtual void clear() override; virtual void switchBack() override; diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 676ada7afad0..ac0f027aff96 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -83,24 +83,6 @@ namespace : public rtl::Static<osl::Mutex, thePickListMutex> {}; } -void SfxPickList::RemovePickListEntries() -{ - ::osl::MutexGuard aGuard( thePickListMutex::get() ); - for (PickListEntry* p : m_aPicklistVector) - delete p; - m_aPicklistVector.clear(); -} - -SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex ) -{ - OSL_ASSERT( m_aPicklistVector.size() > nIndex ); - - if ( nIndex < m_aPicklistVector.size() ) - return m_aPicklistVector[ nIndex ]; - else - return nullptr; -} - void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) { if (pDocSh->IsAvoidRecentDocs() || comphelper::LibreOfficeKit::isActive()) @@ -201,7 +183,6 @@ SfxPickList::SfxPickList( sal_uInt32 nAllowedMenuSize ) : SfxPickList::~SfxPickList() { - RemovePickListEntries(); } diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 8f08f58b899a..27dd8ff03687 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -104,29 +104,6 @@ void TemplateAbstractView::dispose() ThumbnailView::dispose(); } -void TemplateAbstractView::insertItem(const TemplateItemProperties &rTemplate) -{ - const TemplateItemProperties *pCur = &rTemplate; - - TemplateViewItem *pChild = new TemplateViewItem(*this, pCur->nId); - pChild->mnDocId = pCur->nDocId; - pChild->mnRegionId = pCur->nRegionId; - pChild->maTitle = pCur->aName; - pChild->setPath(pCur->aPath); - pChild->maPreview1 = pCur->aThumbnail; - - if ( pCur->aThumbnail.IsEmpty() ) - { - // Use the default thumbnail if we have nothing else - pChild->maPreview1 = TemplateAbstractView::getDefaultThumbnail(pCur->aPath); - } - - AppendItem(pChild); - - CalculateItemPositions(); - Invalidate(); -} - void TemplateAbstractView::insertItems(const std::vector<TemplateItemProperties> &rTemplates) { std::vector<ThumbnailViewItem*> aItems(rTemplates.size()); diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 964e8777de81..50e851c0dcc9 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -84,11 +84,6 @@ void SfxFrameDescriptor::SetEditable( bool bSet ) pImpl->bEditable = bSet; } -bool SfxFrameDescriptor::IsEditable() const -{ - return pImpl->bEditable; -} - void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) { DELETEZ( pImpl->pWallpaper ); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index b2b7b75d7177..d8dbb56b3799 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -1490,26 +1490,6 @@ bool SfxTemplateManagerDlg::insertRepository(const OUString &rName, const OUStri return true; } -bool SfxTemplateManagerDlg::deleteRepository(const sal_uInt16 nRepositoryId) -{ - bool bRet = false; - - for (size_t i = 0, n = maRepositories.size(); i < n; ++i) - { - if (maRepositories[i]->mnId == nRepositoryId) - { - delete maRepositories[i]; - - maRepositories.erase(maRepositories.begin() + i); - mbIsSynced = false; - bRet = true; - break; - } - } - - return bRet; -} - void SfxTemplateManagerDlg::syncRepositories() const { if (!mbIsSynced) diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 8cfd1904700f..9f1fe7816d5c 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -31,24 +31,12 @@ class SfxPickList : public SfxListener { - struct PickListEntry - { - PickListEntry( const OUString& _aName, const OUString& _aFilter ) : - aName( _aName ), aFilter( _aFilter ) {} - - OUString aName; - OUString aFilter; - }; - - std::vector< PickListEntry* > m_aPicklistVector; sal_uInt32 m_nAllowedMenuSize; css::uno::Reference< css::util::XStringWidth > m_xStringLength; SfxPickList( sal_uInt32 nMenuSize ); virtual ~SfxPickList(); - PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); - void RemovePickListEntries(); /** * Adds the given document to the pick list (recent documents) if it satisfies certain requirements, e.g. being writable. Check implementation for requirement diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index e68ff884b3bd..f204c827f037 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -39,26 +39,21 @@ namespace sw { namespace sidebar{ VclPtr<vcl::Window> PageFooterPanel::Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame) { if( pParent == nullptr ) throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageFooterPanel::Create", nullptr, 0); if( !rxFrame.is() ) throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageFooterPanel::Create", nullptr, 0); - if( pBindings == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageFooterPanel::Create", nullptr, 0); - return VclPtr<PageFooterPanel>::Create(pParent, rxFrame, pBindings); + return VclPtr<PageFooterPanel>::Create(pParent, rxFrame); } PageFooterPanel::PageFooterPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame ) : - PanelLayout(pParent, "PageFooterPanel", "modules/swriter/ui/pagefooterpanel.ui", rxFrame), - mpBindings( pBindings ) + PanelLayout(pParent, "PageFooterPanel", "modules/swriter/ui/pagefooterpanel.ui", rxFrame) { } diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index 83c5300dafbb..0759f2cc2241 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -53,8 +53,7 @@ class PageFooterPanel: public: static VclPtr<vcl::Window> Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -62,18 +61,14 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) override; - SfxBindings* GetBindings() const { return mpBindings; } PageFooterPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual ~PageFooterPanel(); virtual void dispose() override; private: - SfxBindings* mpBindings; - VclPtr<CheckBox> mpFooterToggle; VclPtr<MetricField> mpFooterHeightField; VclPtr<MetricField> mpFooterLMargin; diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index 25ca95955448..5af11598e9fb 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -39,26 +39,21 @@ namespace sw { namespace sidebar{ VclPtr<vcl::Window> PageFormatPanel::Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame) { if( pParent == nullptr ) throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageFormatPanel::Create", nullptr, 0); if( !rxFrame.is() ) throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageFormatPanel::Create", nullptr, 0); - if( pBindings == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageFormatPanel::Create", nullptr, 0); - return VclPtr<PageFormatPanel>::Create(pParent, rxFrame, pBindings); + return VclPtr<PageFormatPanel>::Create(pParent, rxFrame); } PageFormatPanel::PageFormatPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame ) : - PanelLayout(pParent, "PageFormatPanel", "modules/swriter/ui/pageformatpanel.ui", rxFrame), - mpBindings( pBindings ) + PanelLayout(pParent, "PageFormatPanel", "modules/swriter/ui/pageformatpanel.ui", rxFrame) { get(mpPaperSizeLB, "papersize"); get(mpPaperWidth, "paperwidth"); diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index b8be54d2841f..0b4b4005f422 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -53,8 +53,7 @@ class PageFormatPanel: public: static VclPtr<vcl::Window> Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -62,19 +61,14 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) override; - SfxBindings* GetBindings() const { return mpBindings; } - PageFormatPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual ~PageFormatPanel(); virtual void dispose() override; private: - SfxBindings* mpBindings; - VclPtr<ListBox> mpPaperSizeLB; VclPtr<MetricField> mpPaperWidth; VclPtr<MetricField> mpPaperHeight; diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index b0af6fc0aff2..0b3e939bc495 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -39,26 +39,21 @@ namespace sw { namespace sidebar{ VclPtr<vcl::Window> PageStylesPanel::Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame) { if( pParent == nullptr ) throw ::com::sun::star::lang::IllegalArgumentException("no parent window given to PageStylesPanel::Create", nullptr, 0); if( !rxFrame.is() ) throw ::com::sun::star::lang::IllegalArgumentException("no XFrame given to PageStylesPanel::Create", nullptr, 0); - if( pBindings == nullptr ) - throw ::com::sun::star::lang::IllegalArgumentException("no SfxBindings given to PageStylesPanel::Create", nullptr, 0); - return VclPtr<PageStylesPanel>::Create(pParent, rxFrame, pBindings); + return VclPtr<PageStylesPanel>::Create(pParent, rxFrame); } PageStylesPanel::PageStylesPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame ) : - PanelLayout(pParent, "PageStylesPanel", "modules/swriter/ui/pagestylespanel.ui", rxFrame), - mpBindings( pBindings ) + PanelLayout(pParent, "PageStylesPanel", "modules/swriter/ui/pagestylespanel.ui", rxFrame) { } diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index de3eb6df43a4..b6d4b849cb86 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -53,8 +53,7 @@ class PageStylesPanel: public: static VclPtr<vcl::Window> Create( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual void NotifyItemUpdate( const sal_uInt16 nSId, @@ -62,18 +61,14 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) override; - SfxBindings* GetBindings() const { return mpBindings; } PageStylesPanel( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, - SfxBindings* pBindings); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame); virtual ~PageStylesPanel(); virtual void dispose() override; private: - SfxBindings* mpBindings; - VclPtr<CheckBox> mpFooterToggle; VclPtr<MetricField> mpFooterHeightField; VclPtr<MetricField> mpFooterLMargin; diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index e7f1151d269c..7e7c467d7183 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -145,7 +145,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if(rsResourceURL.endsWith("/PageStylesPanel")) { - VclPtr<vcl::Window> pPanel = sw::sidebar::PageStylesPanel::Create( pParentWindow, xFrame, pBindings ); + VclPtr<vcl::Window> pPanel = sw::sidebar::PageStylesPanel::Create( pParentWindow, xFrame ); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, @@ -154,7 +154,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if(rsResourceURL.endsWith("/PageFormatPanel")) { - VclPtr<vcl::Window> pPanel = sw::sidebar::PageFormatPanel::Create( pParentWindow, xFrame, pBindings ); + VclPtr<vcl::Window> pPanel = sw::sidebar::PageFormatPanel::Create( pParentWindow, xFrame ); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, @@ -172,7 +172,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if(rsResourceURL.endsWith("/PageFooterPanel")) { - VclPtr<vcl::Window> pPanel = sw::sidebar::PageFooterPanel::Create( pParentWindow, xFrame, pBindings ); + VclPtr<vcl::Window> pPanel = sw::sidebar::PageFooterPanel::Create( pParentWindow, xFrame ); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, |