mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedmethods

Browse Source 
Change-Id: I08e9bb65b2530148b80c67f01d51e594fc698acb
Reviewed-on: https://gerrit.libreoffice.org/25543
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-05-27 14:20:35 +02:00
committed by Noel Grandin
parent 3e9e667af2
commit 77d5491e15
30 changed files with 22 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/source/drivers/mork/MDriver.hxx
View File

@@ -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;}

2
cui/source/inc/iconcdlg.hxx
View File

@@ -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;

1
include/formula/IFunctionDescription.hxx
View File

@@ -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;

2
include/sfx2/frmdescr.hxx
View File

@@ -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 )

2
include/sfx2/templateabstractview.hxx
View File

@@ -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);

2
include/sfx2/templatedlg.hxx
View File

@@ -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.

3
reportdesign/source/ui/dlg/Formula.cxx
View File

@@ -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()
{
}

1
reportdesign/source/ui/inc/Formula.hxx
View File

@@ -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;

13
sc/source/filter/inc/biffinputstream.hxx
View File

@@ -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

4
sc/source/filter/inc/defnamesbuffer.hxx
View File

@@ -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;

7
sc/source/filter/inc/formulabuffer.hxx
View File

@@ -41,9 +41,6 @@ public:
OUString maTokenStr;
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 );
@@ -59,9 +56,6 @@ public:
OUString maCellValue;
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

3
sc/source/filter/inc/stylesbuffer.hxx
View File

@@ -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 );

14
sc/source/filter/oox/biffinputstream.cxx
View File

@@ -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

2
sc/source/filter/oox/defnamesbuffer.cxx
View File

@@ -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)

10
sc/source/filter/oox/formulabuffer.cxx
View File

@@ -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),

23
sc/source/filter/oox/stylesbuffer.cxx
View File

@@ -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();

6
sc/source/ui/formdlg/formula.cxx
View File

@@ -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();

1
sc/source/ui/inc/formula.hxx
View File

@@ -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;

19
sfx2/source/appl/sfxpicklist.cxx
View File

@@ -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();
}

23
sfx2/source/control/templateabstractview.cxx
View File

@@ -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());

5
sfx2/source/doc/frmdescr.cxx
View File

@@ -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 );

20
sfx2/source/doc/templatedlg.cxx
View File

@@ -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)

12
sfx2/source/inc/sfxpicklist.hxx
View File

@@ -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

13
sw/source/uibase/sidebar/PageFooterPanel.cxx
View File

@@ -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)
{
}

9
sw/source/uibase/sidebar/PageFooterPanel.hxx
View File

@@ -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;

13
sw/source/uibase/sidebar/PageFormatPanel.cxx
View File

@@ -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");

10
sw/source/uibase/sidebar/PageFormatPanel.hxx
View File

@@ -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;

13
sw/source/uibase/sidebar/PageStylesPanel.cxx
View File

@@ -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)
{
}

9
sw/source/uibase/sidebar/PageStylesPanel.hxx
View File

@@ -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;

6
sw/source/uibase/sidebar/SwPanelFactory.cxx
View File

@@ -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,