summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-12-12 16:57:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-13 08:12:45 +0100
commitd59987b164bc32efe8f99ad49c139b4fc7ca3c2f (patch)
tree765652d6e940a5bdf43322ed54aa2f4c14116418
parentb4641df5de7842d6a8fc2c4f839214bf01160c8c (diff)
loplugin:expandablemethods
Change-Id: I333d91ea5ce78c82e9bb107f934614efc7bfb8f7 Reviewed-on: https://gerrit.libreoffice.org/85078 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--basic/inc/sbstdobj.hxx1
-rw-r--r--basic/source/runtime/stdobj1.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx7
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx14
-rw-r--r--chart2/source/controller/inc/dlg_DataEditor.hxx1
-rw-r--r--chart2/source/controller/inc/dlg_DataSource.hxx3
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx7
-rw-r--r--cui/source/inc/cuihyperdlg.hxx3
-rw-r--r--cui/source/options/optjava.cxx8
-rw-r--r--cui/source/options/optjava.hxx1
-rw-r--r--cui/source/tabpages/backgrnd.cxx3
-rw-r--r--dbaccess/source/ui/inc/RTableConnectionData.hxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx7
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx3
-rw-r--r--forms/source/component/clickableimage.cxx8
-rw-r--r--forms/source/component/clickableimage.hxx1
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx6
-rw-r--r--lingucomponent/source/numbertext/numbertext.cxx8
-rw-r--r--linguistic/source/convdicxml.cxx5
-rw-r--r--oox/source/drawingml/diagram/datamodel.cxx2
-rw-r--r--oox/source/drawingml/diagram/datamodel.hxx2
-rw-r--r--sw/source/filter/html/htmlftn.cxx5
-rw-r--r--sw/source/filter/html/htmltab.cxx4
-rw-r--r--sw/source/filter/html/swhtml.cxx2
-rw-r--r--sw/source/filter/html/swhtml.hxx1
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx1
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/ui/index/multmrk.cxx7
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx9
-rw-r--r--sw/source/uibase/inc/multmrk.hxx9
-rw-r--r--sw/source/uibase/inc/unotools.hxx1
-rw-r--r--sw/source/uibase/utlui/unotools.cxx2
-rw-r--r--ucb/source/cacher/cachedcontentresultset.cxx8
-rw-r--r--ucb/source/cacher/cachedcontentresultset.hxx1
-rw-r--r--vcl/inc/wizdlg.hxx17
-rw-r--r--vcl/source/app/salvtables.cxx7
-rw-r--r--vcl/source/control/imivctl.hxx1
-rw-r--r--vcl/source/control/imivctl1.cxx7
-rw-r--r--vcl/source/control/roadmapwizard.cxx6
-rw-r--r--vcl/source/control/wizardmachine.cxx16
-rw-r--r--vcl/source/filter/png/pngread.cxx10
-rw-r--r--vcl/source/fontsubset/cff.cxx12
-rw-r--r--vcl/unx/generic/gdi/cairo_xlib_cairo.cxx2
-rw-r--r--vcl/unx/generic/gdi/cairo_xlib_cairo.hxx1
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx9
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.hxx1
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx2
-rw-r--r--writerperfect/source/writer/exp/xmlimp.hxx1
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx5
-rw-r--r--xmloff/source/xforms/XFormsModelContext.cxx2
-rw-r--r--xmloff/source/xforms/XFormsModelContext.hxx2
52 files changed, 46 insertions, 203 deletions
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 5edb092a1b77..456c6809a07a 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -85,7 +85,6 @@ public:
bool IsUnderline() const { return bUnderline; }
void SetSize( sal_uInt16 nS ) { nSize = nS; }
sal_uInt16 GetSize() const { return nSize; }
- const OUString& GetFontName() const { return aName; }
};
class SbStdClipboard final : public SbxObject
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index c65f7fc9f190..1943bdb6fcf9 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -205,7 +205,7 @@ void SbStdFont::PropName( SbxVariable* pVar, bool bWrite )
}
else
{
- pVar->PutString( GetFontName() );
+ pVar->PutString( aName );
}
}
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index a9fdf71a96e0..5e7c939a2262 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -139,16 +139,11 @@ void DataEditor::SetReadOnly( bool bReadOnly )
IMPL_LINK_NOARG(DataEditor, CloseHdl, weld::Button&, void)
{
- bool bApplied = ApplyChangesToModel();
+ bool bApplied = m_xBrwData->EndEditing(); // apply changes to model
if (bApplied)
m_xDialog->response(RET_CLOSE);
}
-bool DataEditor::ApplyChangesToModel()
-{
- return m_xBrwData->EndEditing();
-}
-
} // namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 7d5c4670b81c..46faf3b8774b 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -142,16 +142,6 @@ IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool)
return m_bTogglingEnabled;
}
-void DataSourceDialog::DisableTabToggling()
-{
- m_bTogglingEnabled = false;
-}
-
-void DataSourceDialog::EnableTabToggling()
-{
- m_bTogglingEnabled = true;
-}
-
void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage)
{
if (pTabPage == m_xRangeChooserTabPage.get())
@@ -169,7 +159,7 @@ void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage)
m_xTabControl->set_current_page(1);
else if( m_bDataSourceTabIsValid )
m_xTabControl->set_current_page(0);
- DisableTabToggling();
+ m_bTogglingEnabled = false;
}
}
@@ -183,7 +173,7 @@ void DataSourceDialog::setValidPage(BuilderPage* pTabPage)
if (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid)
{
m_xBtnOK->set_sensitive(true);
- EnableTabToggling();
+ m_bTogglingEnabled = true;
}
}
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index f4682ab43212..2d36f38df7bf 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -47,7 +47,6 @@ public:
DECL_LINK(CloseHdl, weld::Button&, void);
void SetReadOnly( bool bReadOnly );
- bool ApplyChangesToModel();
private:
bool m_bReadOnly;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 58965cb967f0..ca8777568826 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -57,9 +57,6 @@ public:
virtual void setValidPage( BuilderPage * pTabPage ) override;
private:
- void DisableTabToggling();
- void EnableTabToggling();
-
DECL_LINK(ActivatePageHdl, const OString&, void);
DECL_LINK(DeactivatePageHdl, const OString&, bool);
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index b5fb3757c336..1a3a7b520501 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -274,7 +274,7 @@ void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem )
|************************************************************************/
void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly )
{
- GetOKButton().set_sensitive(!bRdOnly);
+ m_xOKBtn->set_sensitive(!bRdOnly);
}
/*************************************************************************
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 39864c3a3d3b..7f36bd8ddc85 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -258,11 +258,6 @@ void SvxHpLinkDlg::SetInputSet( const SfxItemSet* pInSet )
}
}
-void SvxHpLinkDlg::Start()
-{
- Start_Impl();
-}
-
bool SvxHpLinkDlg::QueryClose()
{
bool bRet = true;
@@ -277,7 +272,7 @@ bool SvxHpLinkDlg::QueryClose()
return bRet;
}
-void SvxHpLinkDlg::Start_Impl()
+void SvxHpLinkDlg::Start()
{
SwitchPage(msCurrentPageId);
ActivatePageImpl();
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index b7f88ef013f5..702cf6396304 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -90,7 +90,6 @@ private:
DECL_LINK( ChosePageHdl_Impl, const OString&, void );
IconChoicePageData* GetPageData ( const OString& rId );
- void Start_Impl();
void SwitchPage( const OString& rId );
@@ -123,8 +122,6 @@ public:
const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
- weld::Button& GetOKButton() { return *m_xOKBtn; }
-
void Start();
bool QueryClose();
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 947d7e25e12c..b27d3a33a51f 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -311,12 +311,6 @@ void SvxJavaOptionsPage::ClearJavaInfo()
#endif
}
-void SvxJavaOptionsPage::ClearJavaList()
-{
- m_xJavaList->clear();
-}
-
-
void SvxJavaOptionsPage::LoadJREs()
{
#if HAVE_FEATURE_JAVA
@@ -561,7 +555,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
{
ClearJavaInfo();
- ClearJavaList();
+ m_xJavaList->clear();
SvtMiscOptions aMiscOpt;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index e5537f1e1ff7..ffefecce2d47 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -98,7 +98,6 @@ private:
DECL_LINK(ExpertConfigHdl_Impl, weld::Button&, void);
void ClearJavaInfo();
- void ClearJavaList();
void LoadJREs();
void AddJRE( JavaInfo const * _pInfo );
void HandleCheckEntry(int nCheckedRow);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 18bcfc734689..811fc0cfacb7 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -119,7 +119,6 @@ public:
void NotifyChange(const Color& rColor);
void NotifyChange(const BitmapEx* pBitmap);
- void SetFillColor(const Color& rColor) { aColor = rColor; }
protected:
virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override;
@@ -164,7 +163,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
if ( !bIsBmp )
{
const static Color aTranspCol(COL_TRANSPARENT);
- SetFillColor(rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor());
+ aColor = rColor == aTranspCol ? Application::GetSettings().GetStyleSettings().GetFieldColor() : rColor.GetRGBColor();
Invalidate(aDrawRect);
}
}
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 61299f336cdf..6995275ee8ff 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -46,8 +46,6 @@ namespace dbaui
bool IsSourcePrimKey() const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM); }
bool IsDestPrimKey() const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO); }
- static OConnectionLineDataRef CreateLineDataObj();
-
ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData );
public:
ORelationTableConnectionData();
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 53c47487d128..80c2faef464f 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -181,11 +181,6 @@ void ORelationTableConnectionData::IsConnectionPossible()
ChangeOrientation();
}
-OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj()
-{
- return new OConnectionLineData();
-}
-
void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
{
// retract to the (non-virtual) operator= like in the base class
@@ -385,7 +380,7 @@ bool ORelationTableConnectionData::Update()
xColumns->getByName(*pIter) >>= xColumn;
if ( xColumn.is() )
{
- OConnectionLineDataRef pNewData = CreateLineDataObj();
+ OConnectionLineDataRef pNewData = new OConnectionLineData();
xColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
xColumn->getPropertyValue(PROPERTY_RELATEDCOLUMN) >>= sRelatedColumn;
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 75de37a701c6..6fca733a9e40 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -331,7 +331,6 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& rTransform);
/// data read access
- const Graphic& getGraphic() const { return maGraphic; }
const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
/// compare operator
@@ -406,7 +405,7 @@ namespace drawinglayer
// use operator== of Graphic - if that is equal, the basic definition is equal
return (nullptr != pCompare
&& getTransform() == pCompare->getTransform()
- && getGraphic() == pCompare->getGraphic());
+ && maGraphic == pCompare->maGraphic);
}
void AnimatedGraphicPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index f3803d275bb7..4fc7087cd25d 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -791,16 +791,10 @@ namespace frm
}
- void OClickableImageBaseModel::DownloadDone()
- {
- DataAvailable();
- }
-
-
IMPL_LINK_NOARG( OClickableImageBaseModel, DownloadDoneLink, void*, void )
{
::osl::MutexGuard aGuard( m_aMutex );
- DownloadDone();
+ DataAvailable();
}
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 01ec960600c4..30342d060601 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -82,7 +82,6 @@ namespace frm
void StartProduction();
void SetURL(const OUString& rURL);
void DataAvailable();
- void DownloadDone();
css::uno::Sequence< css::uno::Type> _getTypes() override;
bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; }
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index a5695bb8dd69..254abc882e8e 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -94,7 +94,6 @@ public:
virtual OUString SAL_CALL getImplementationName( ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- static Sequence< OUString > getSupportedServiceNames_Static( );
// XLanguageGuessing implementation
virtual css::lang::Locale SAL_CALL guessPrimaryLanguage( const OUString& aText, ::sal_Int32 nStartPos, ::sal_Int32 nLen ) override;
@@ -320,11 +319,6 @@ sal_Bool SAL_CALL LangGuess_Impl::supportsService( const OUString& ServiceName )
Sequence<OUString> SAL_CALL LangGuess_Impl::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
-}
-
-Sequence<OUString> LangGuess_Impl::getSupportedServiceNames_Static( )
-{
return { SERVICENAME };
}
diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx
index 7ea2db473b04..8c388e6adb92 100644
--- a/lingucomponent/source/numbertext/numbertext.cxx
+++ b/lingucomponent/source/numbertext/numbertext.cxx
@@ -87,7 +87,6 @@ public:
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
- static Sequence<OUString> getSupportedServiceNames_Static();
// XNumberText implementation
virtual OUString SAL_CALL getNumberText(const OUString& aText,
@@ -168,12 +167,7 @@ sal_Bool SAL_CALL NumberText_Impl::supportsService(const OUString& ServiceName)
return cppu::supportsService(this, ServiceName);
}
-Sequence<OUString> SAL_CALL NumberText_Impl::getSupportedServiceNames()
-{
- return getSupportedServiceNames_Static();
-}
-
-Sequence<OUString> NumberText_Impl::getSupportedServiceNames_Static() { return { SERVICENAME }; }
+Sequence<OUString> SAL_CALL NumberText_Impl::getSupportedServiceNames() { return { SERVICENAME }; }
/**
* Function to create a new component instance; is needed by factory helper implementation.
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index c66ed32a9264..07ce5258e3ad 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -149,9 +149,6 @@ public:
// SvXMLImportContext
virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
virtual void SAL_CALL characters( const OUString &rChars ) override;
-
- const OUString & GetRightText() const { return aRightText; }
- const OUString & GetLeftText() const { return rEntryContext.GetLeftText(); }
};
}
@@ -260,7 +257,7 @@ void ConvDicXMLRightTextContext_Impl::endFastElement( sal_Int32 /*nElement*/ )
{
ConvDic *pDic = GetConvDicImport().GetDic();
if (pDic)
- pDic->AddEntry( GetLeftText(), GetRightText() );
+ pDic->AddEntry( rEntryContext.GetLeftText(), aRightText );
}
diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx
index fcad85bd3d6a..afffab1685af 100644
--- a/oox/source/drawingml/diagram/datamodel.cxx
+++ b/oox/source/drawingml/diagram/datamodel.cxx
@@ -446,7 +446,7 @@ void DiagramData::build()
<< ";" << std::endl;
#endif
- const bool bInserted1 = getConnectionNameMap().insert(
+ const bool bInserted1 = maConnectionNameMap.insert(
std::make_pair(connection.msModelId,&connection)).second;
SAL_WARN_IF(!bInserted1, "oox.drawingml", "DiagramData::build(): non-unique connection model id");
diff --git a/oox/source/drawingml/diagram/datamodel.hxx b/oox/source/drawingml/diagram/datamodel.hxx
index 7f7f0f4910c5..afaabd961adb 100644
--- a/oox/source/drawingml/diagram/datamodel.hxx
+++ b/oox/source/drawingml/diagram/datamodel.hxx
@@ -168,8 +168,6 @@ public:
{ return maConnections; }
dgm::Points & getPoints()
{ return maPoints; }
- ConnectionNameMap & getConnectionNameMap()
- { return maConnectionNameMap; }
StringMap & getPresOfNameMap()
{ return maPresOfNameMap; }
PointNameMap & getPointNameMap()
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 4e58dc4a3e27..79c61648ab98 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -212,11 +212,6 @@ void SwHTMLParser::InsertFootEndNoteText()
m_pFootEndNoteImpl->sContent += aToken;
}
-void SwHTMLParser::DeleteFootEndNoteImpl()
-{
- m_pFootEndNoteImpl.reset();
-}
-
SwNodeIndex *SwHTMLParser::GetFootEndNoteSection( const OUString& rName )
{
SwNodeIndex *pStartNodeIdx = nullptr;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 56c3457b7fb2..75aaadd620a8 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -608,8 +608,6 @@ public:
void MakeParentContents();
- bool GetIsParentHeader() const { return m_bIsParentHead; }
-
bool HasToFly() const { return m_bHasToFly; }
void SetTable( const SwStartNode *pStNd, std::unique_ptr<HTMLTableContext> pCntxt,
@@ -2508,7 +2506,7 @@ void HTMLTable::MakeParentContents()
if( !GetContext() && !HasParentSection() )
{
SetParentContents(
- m_pParser->InsertTableContents( GetIsParentHeader() ) );
+ m_pParser->InsertTableContents( m_bIsParentHead ) );
SetHasParentSection( true );
}
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7cc45bbe1a04..b2e0f520b961 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -486,7 +486,7 @@ SwHTMLParser::~SwHTMLParser()
m_pCSS1Parser.reset();
m_pNumRuleInfo.reset();
DeleteFormImpl();
- DeleteFootEndNoteImpl();
+ m_pFootEndNoteImpl.reset();
OSL_ENSURE(!m_xTable.get(), "It exists still an open table");
m_pImageMaps.reset();
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 5aab2fe5d43e..dc31880f3ec0 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -840,7 +840,6 @@ private:
void FinishFootEndNote();
void InsertFootEndNoteText();
SwNodeIndex *GetFootEndNoteSection( const OUString& rName );
- void DeleteFootEndNoteImpl();
sal_Int32 StripTrailingLF();
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 44bf1870f2c1..248f3c238148 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1048,7 +1048,6 @@ public:
bool MiserableFormFieldExportHack(const SwFrameFormat& rFrameFormat);
- SvxMSExportOLEObjects& GetOLEExp() { return *m_pOLEExp; }
SwMSConvertControls& GetOCXExp() { return *m_pOCXExp; }
void ExportDopTypography(WW8DopTypography &rTypo);
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index bb0ff68e4d96..0751ce007087 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -250,7 +250,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
{
sal_Int64 nAspect = rOLENode.GetAspect();
svt::EmbeddedObjectRef aObjRef( xObj, nAspect );
- GetOLEExp().ExportOLEObject( aObjRef, *xOleStg );
+ m_pOLEExp->ExportOLEObject( aObjRef, *xOleStg );
if ( nAspect == embed::Aspects::MSOLE_ICON )
{
OUString aObjInfo( "\3ObjInfo" );
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index 7cc876e1f004..64e2b5c9f451 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -52,9 +52,12 @@ IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void )
}
}
-void SwMultiTOXMarkDlg::Apply()
+short SwMultiTOXMarkDlg::run()
{
- m_rMgr.SetCurTOXMark(m_nPos);
+ short nRet = GenericDialogController::run();
+ if (nRet == RET_OK)
+ m_rMgr.SetCurTOXMark(m_nPos);
+ return nRet;
}
SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg()
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index e20fbc4f2a4e..afbd7b16c438 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -154,8 +154,6 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent
std::unique_ptr<::accessibility::AccessibleTextHelper> mpAccessibleTextHelper;
::osl::Mutex maMutex;
-
- void defunc();
};
}
@@ -168,11 +166,6 @@ SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( Sideba
mpAccessibleTextHelper->SetEventSource( rSidebarTextControl.GetWindowPeer() );
}
-void SidebarTextControlAccessibleContext::defunc()
-{
- mpAccessibleTextHelper.reset();
-}
-
sal_Int32 SAL_CALL SidebarTextControlAccessibleContext::getAccessibleChildCount()
{
osl::MutexGuard aGuard( maMutex );
@@ -231,7 +224,7 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve
{
case VclEventId::ObjectDying:
{
- defunc();
+ mpAccessibleTextHelper.reset();
}
break;
case VclEventId::WindowGetFocus:
diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx
index 0549d09b9ecf..6edca05cebc2 100644
--- a/sw/source/uibase/inc/multmrk.hxx
+++ b/sw/source/uibase/inc/multmrk.hxx
@@ -34,17 +34,10 @@ class SwMultiTOXMarkDlg : public weld::GenericDialogController
std::unique_ptr<weld::Label> m_xTextFT;
std::unique_ptr<weld::TreeView> m_xTOXLB;
- void Apply();
public:
SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr &rTOXMgr);
virtual ~SwMultiTOXMarkDlg() override;
- virtual short run() override
- {
- short nRet = GenericDialogController::run();
- if (nRet == RET_OK)
- Apply();
- return nRet;
- }
+ virtual short run() override;
};
#endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 830e39085a52..76a371740916 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -69,7 +69,6 @@ public:
virtual ~SwOneExampleFrame() override;
css::uno::Reference< css::frame::XModel > & GetModel() {return m_xModel;}
- css::uno::Reference< css::frame::XController > & GetController() {return m_xController;}
css::uno::Reference< css::text::XTextCursor > & GetTextCursor() {return m_xCursor;}
void ClearDocument();
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 24c7069b95c3..f6ad9b7ce0c9 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -134,7 +134,7 @@ bool SwOneExampleFrame::Command(const CommandEvent& rCEvt)
case CommandEventId::ContextMenu:
{
//#125881# quickly clicking crashes because the control is not fully initialized
- if (GetController().is())
+ if (m_xController.is())
return CreatePopup(rCEvt.GetMousePosPixel());
}
break;
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 2d3e0cfc592e..833af4daf9f3 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -135,7 +135,7 @@ void CachedContentResultSet::CCRS_Cache
::clear()
{
m_pResult.reset();
- clearMappedReminder();
+ m_pMappedReminder.reset();
}
void CachedContentResultSet::CCRS_Cache
@@ -242,12 +242,6 @@ bool CachedContentResultSet::CCRS_Cache
return false;
}
-void CachedContentResultSet::CCRS_Cache
- ::clearMappedReminder()
-{
- m_pMappedReminder.reset();
-}
-
Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache
::getMappedReminder()
{
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index e2e6ec2c4d26..d21b74d5fb61 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -72,7 +72,6 @@ class CachedContentResultSet
void remindMapped( sal_Int32 nRow );
bool isRowMapped( sal_Int32 nRow );
- void clearMappedReminder();
css::uno::Sequence< sal_Bool >* getMappedReminder();
public:
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index 5b25eab29671..eeb17934d617 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -92,12 +92,6 @@ namespace vcl
only to be used during construction, before any layouting happened
*/
void SetLeftAlignedButtonCount( sal_Int16 _nCount );
- /** declares the view area to have an empty margin
-
- Normally, the view area has a certain margin to the top/left/bottom/right of the
- dialog. By calling this method, you can reduce this margin to 0.
- */
- void SetEmptyViewMargin();
void CalcAndSetSize();
@@ -138,12 +132,6 @@ namespace vcl
void AddButton( Button* pButton, long nOffset = 0 );
void RemoveButton( Button* pButton );
- void SetPrevButton( PushButton* pButton ) { mpPrevBtn = pButton; }
- void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; }
-
- void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; }
- void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
-
void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; }
const Size& GetPageSizePixel() const { return maPageSize; }
@@ -192,11 +180,6 @@ namespace vcl
*/
WizardTypes::WizardState determineNextState(WizardTypes::WizardState nCurrentState) const;
- /** called when the finish button is pressed
- <p>By default, only the base class' Finish method (which is not virtual) is called</p>
- */
- bool onFinish();
-
/// travel to the next state
bool travelNext();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8237dbae57e3..920e8e7765e9 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6264,11 +6264,6 @@ public:
{
}
- VclBuilder& get_builder() const
- {
- return *m_xBuilder;
- }
-
virtual std::unique_ptr<weld::MessageDialog> weld_message_dialog(const OString &id, bool bTakeOwnership) override
{
MessageDialog* pMessageDialog = m_xBuilder->get<MessageDialog>(id);
@@ -6585,7 +6580,7 @@ public:
OString get_current_page_help_id() const
{
- TabControl *pCtrl = get_builder().get<TabControl>("tabcontrol");
+ TabControl *pCtrl = m_xBuilder->get<TabControl>("tabcontrol");
TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : nullptr;
vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(GetWindowType::FirstChild) : nullptr;
pTabChild = pTabChild ? pTabChild->GetWindow(GetWindowType::FirstChild) : nullptr;
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx
index ce53dcc6a2f1..be3a6ea287c2 100644
--- a/vcl/source/control/imivctl.hxx
+++ b/vcl/source/control/imivctl.hxx
@@ -206,7 +206,6 @@ class SvxIconChoiceCtrl_Impl
);
void ClearSelectedRectList();
- void ClearColumnList();
tools::Rectangle CalcMaxTextRect( const SvxIconChoiceCtrlEntry* pEntry ) const;
void ClipAtVirtOutRect( tools::Rectangle& rRect ) const;
diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx
index 353a92902aba..e268d15cf633 100644
--- a/vcl/source/control/imivctl1.cxx
+++ b/vcl/source/control/imivctl1.cxx
@@ -112,7 +112,7 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl()
pGridMap.reset();
pDDBufDev.disposeAndClear();
ClearSelectedRectList();
- ClearColumnList();
+ m_pColumns.reset();
aVerSBar.disposeAndClear();
aHorSBar.disposeAndClear();
aScrBarBox.disposeAndClear();
@@ -2867,11 +2867,6 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt )
return true;
}
-void SvxIconChoiceCtrl_Impl::ClearColumnList()
-{
- m_pColumns.reset();
-}
-
void SvxIconChoiceCtrl_Impl::SetColumn( sal_uInt16 nIndex, const SvxIconChoiceCtrlColumnInfo& rInfo)
{
if (!m_pColumns)
diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx
index 160724c78ab3..a6c718039b22 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -147,7 +147,7 @@ namespace vcl
void RoadmapWizard::impl_construct()
{
SetLeftAlignedButtonCount( 1 );
- SetEmptyViewMargin();
+ mbEmptyViewMargin = true;
m_xRoadmapImpl->pRoadmap.disposeAndReset( VclPtr<ORoadmap>::Create( this, WB_TABSTOP ) );
m_xRoadmapImpl->pRoadmap->SetText( VclResId( STR_WIZDLG_ROADMAP_TITLE ) );
@@ -158,8 +158,8 @@ namespace vcl
aRoadmapSize.setHeight( GetSizePixel().Height() );
m_xRoadmapImpl->pRoadmap->SetSizePixel( aRoadmapSize );
- SetViewWindow( m_xRoadmapImpl->pRoadmap );
- SetViewAlign( WindowAlign::Left );
+ mpViewWindow = m_xRoadmapImpl->pRoadmap;
+ meViewAlign = WindowAlign::Left;
m_xRoadmapImpl->pRoadmap->Show();
}
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 2fced940867e..a92c4c4b68cb 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -97,11 +97,6 @@ namespace vcl
mnLeftAlignCount = _nCount;
}
- void RoadmapWizard::SetEmptyViewMargin()
- {
- mbEmptyViewMargin = true;
- }
-
void RoadmapWizard::ImplCalcSize( Size& rSize )
{
// calculate ButtonBar height and width
@@ -391,7 +386,7 @@ namespace vcl
AddButton( m_pPrevPage, ( WIZARDDIALOG_BUTTON_SMALLSTDOFFSET_X) ); // half x-offset to the next button
else
AddButton( m_pPrevPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- SetPrevButton( m_pPrevPage );
+ mpPrevBtn = m_pPrevPage;
m_pPrevPage->SetClickHdl( LINK( this, RoadmapWizard, OnPrevPage ) );
}
@@ -406,7 +401,7 @@ namespace vcl
m_pNextPage->set_id("next");
AddButton( m_pNextPage, WIZARDDIALOG_BUTTON_STDOFFSET_X );
- SetNextButton( m_pNextPage );
+ mpNextBtn = m_pNextPage;
m_pNextPage->SetClickHdl( LINK( this, RoadmapWizard, OnNextPage ) );
}
@@ -730,11 +725,6 @@ namespace vcl
m_pCancel->Enable(_bEnable);
}
- bool RoadmapWizard::onFinish()
- {
- return Finish( RET_OK );
- }
-
IMPL_LINK_NOARG(RoadmapWizard, OnFinish, Button*, void)
{
if ( isTravelingSuspended() )
@@ -744,7 +734,7 @@ namespace vcl
{
return;
}
- onFinish();
+ Finish( RET_OK );
}
bool RoadmapWizard::prepareLeaveCurrentState( WizardTypes::CommitPageReason _eReason )
diff --git a/vcl/source/filter/png/pngread.cxx b/vcl/source/filter/png/pngread.cxx
index aa452bf51a01..1e89657cb807 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -147,7 +147,6 @@ private:
mpScanlineAlpha;
bool ReadNextChunk();
- void ReadRemainingChunks();
void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, const BitmapColor & );
void ImplSetPixel( sal_uInt32 y, sal_uInt32 x, sal_uInt8 nPalIndex );
@@ -318,15 +317,10 @@ bool PNGReaderImpl::ReadNextChunk()
return mnChunkType != PNGCHUNK_IEND;
}
-// read the remaining chunks from mrPNGStream
-void PNGReaderImpl::ReadRemainingChunks()
-{
- while( ReadNextChunk() ) ;
-}
-
const std::vector< vcl::PNGReader::ChunkData >& PNGReaderImpl::GetAllChunks()
{
- ReadRemainingChunks();
+ // read the remaining chunks from mrPNGStream
+ while( ReadNextChunk() ) ;
return maChunkSeq;
}
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 2db45ab57701..2698b22b54bc 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -328,10 +328,6 @@ public: // TODO: is public really needed?
void addHints( bool bVerticalHints);
// accessing other charstring specifics
- bool hasCharWidth() const { return (maCharWidth > 0);}
- ValType getCharWidth() const { return maCharWidth;}
- void setNominalWidth( ValType aWidth) { mpCffLocal->maNominalWidth = aWidth;}
- void setDefaultWidth( ValType aWidth) { mpCffLocal->maDefaultWidth = aWidth;}
void updateWidth( bool bUseFirstVal);
private:
@@ -382,7 +378,7 @@ inline int CffSubsetterContext::popInt()
inline void CffSubsetterContext::updateWidth( bool bUseFirstVal)
{
// the first value is not a hint but the charwidth
- if( hasCharWidth())
+ if( maCharWidth>0 )
return;
if( bUseFirstVal) {
@@ -463,8 +459,8 @@ void CffSubsetterContext::readDictOp()
case 16: break; // "nEncoding"
case 17: mnCharStrBase = nInt; break; // "nCharStrings"
case 19: mpCffLocal->mnLocalSubrOffs = nInt; break;// "nSubrs"
- case 20: setDefaultWidth( nVal ); break; // "defaultWidthX"
- case 21: setNominalWidth( nVal ); break; // "nominalWidthX"
+ case 20: mpCffLocal->maDefaultWidth = nVal; break; // "defaultWidthX"
+ case 21: mpCffLocal->maNominalWidth = nVal; break; // "nominalWidthX"
case 909: mpCffLocal->mfBlueScale = nVal; break; // "BlueScale"
case 910: mpCffLocal->mfBlueShift = nVal; break; // "BlueShift"
case 911: mpCffLocal->mfBlueFuzz = nVal; break; // "BlueFuzz"
@@ -1986,7 +1982,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
rEmitter.emitAllCrypted();
// provide individual glyphwidths if requested
if( pGlyphWidths ) {
- ValType aCharWidth = getCharWidth();
+ ValType aCharWidth = maCharWidth;
if( maFontMatrix.size() >= 4)
aCharWidth *= 1000.0F * maFontMatrix[0];
pGlyphWidths[i] = static_cast<sal_Int32>(aCharWidth);
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 760a8d595903..3a825052189a 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -250,7 +250,7 @@ namespace cairo
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
aSystemGraphicsData.hDrawable = mpPixmap ? mpPixmap->mhDrawable : maSysData.hDrawable;
- aSystemGraphicsData.pXRenderFormat = getRenderFormat();
+ aSystemGraphicsData.pXRenderFormat = maSysData.pRenderFormat;
int width = cairo_xlib_surface_get_width(mpSurface.get());
int height = cairo_xlib_surface_get_height(mpSurface.get());
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index 60300ba634ce..0f280e6b764e 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -90,7 +90,6 @@ namespace cairo {
int getDepth() const;
DeviceFormat getFormat() const;
const X11PixmapSharedPtr& getPixmap() const { return mpPixmap; }
- void* getRenderFormat() const { return maSysData.pRenderFormat; }
};
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index ef26bd6f288d..e288a1e803a3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -404,11 +404,6 @@ sal_uInt32 DomainMapperTableManager::getCurrentGridAfter( )
return m_aGridAfter.back( );
}
-bool DomainMapperTableManager::hasCurrentSpans() const
-{
- return !m_aGridSpans.empty();
-}
-
DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentSpans( )
{
return m_aGridSpans.back( );
@@ -526,9 +521,9 @@ void DomainMapperTableManager::endOfCellAction()
TagLogger::getInstance().element("endOFCellAction");
#endif
- if (!hasCurrentSpans())
+ if (m_aGridSpans.empty())
throw std::out_of_range("empty spans");
- getCurrentSpans()->push_back(m_nGridSpan);
+ m_aGridSpans.back()->push_back(m_nGridSpan);
m_nGridSpan = 1;
++m_nCell.back( );
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index a0b386657feb..6f248d1d0192 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -90,7 +90,6 @@ public:
virtual void endOfRowAction() override;
IntVectorPtr const & getCurrentGrid( );
- bool hasCurrentSpans() const;
IntVectorPtr const & getCurrentSpans( );
IntVectorPtr const & getCurrentCellWidths( );
sal_uInt32 getCurrentGridBefore( );
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 2f95f2dde4bc..09692ccc9308 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -610,7 +610,7 @@ void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList
GetGenerator().closePageSpan();
GetGenerator().openPageSpan(rPageLayout);
- SetIsInPageSpan(true);
+ mbIsInPageSpan = true;
}
}
diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx
index 2797168f4609..59219ecd25ea 100644
--- a/writerperfect/source/writer/exp/xmlimp.hxx
+++ b/writerperfect/source/writer/exp/xmlimp.hxx
@@ -135,7 +135,6 @@ public:
const css::uno::Reference<css::uno::XComponentContext>& GetComponentContext() const;
bool GetIsInPageSpan() const { return mbIsInPageSpan; }
- void SetIsInPageSpan(bool bSet) { mbIsInPageSpan = bSet; }
void HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList);
// XDocumentHandler
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index a25f51edaec7..25ec8022bf70 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -180,9 +180,6 @@ public:
void AddAutoStyleAttribute(
const std::vector< XMLPropertyState >& aStates );
- SvXMLAutoStylePoolP& GetAutoStylePoolP()
- { return mrAutoStylePool; }
-
/// if bExportContent is false the auto-styles are collected
void parseDocument( css::uno::Reference< css::chart::XChartDocument > const & rChartDoc,
bool bExportContent,
@@ -3460,7 +3457,7 @@ awt::Size SchXMLExportHelper_Impl::getPageSize( const Reference< chart2::XChartD
void SchXMLExportHelper_Impl::CollectAutoStyle( const std::vector< XMLPropertyState >& aStates )
{
if( !aStates.empty() )
- maAutoStyleNameQueue.push( GetAutoStylePoolP().Add( XML_STYLE_FAMILY_SCH_CHART_ID, aStates ));
+ maAutoStyleNameQueue.push( mrAutoStylePool.Add( XML_STYLE_FAMILY_SCH_CHART_ID, aStates ));
}
void SchXMLExportHelper_Impl::AddAutoStyleAttribute( const std::vector< XMLPropertyState >& aStates )
diff --git a/xmloff/source/xforms/XFormsModelContext.cxx b/xmloff/source/xforms/XFormsModelContext.cxx
index beee7e080bd0..e846e54b5866 100644
--- a/xmloff/source/xforms/XFormsModelContext.cxx
+++ b/xmloff/source/xforms/XFormsModelContext.cxx
@@ -129,7 +129,7 @@ void XFormsModelContext::EndElement()
xUpdate->update();
GetImport().initXForms();
- xforms_addXFormsModel( GetImport().GetModel(), getModel() );
+ xforms_addXFormsModel( GetImport().GetModel(), mxModel );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/xforms/XFormsModelContext.hxx b/xmloff/source/xforms/XFormsModelContext.hxx
index 2129ed53b0d4..d80b33088a7d 100644
--- a/xmloff/source/xforms/XFormsModelContext.hxx
+++ b/xmloff/source/xforms/XFormsModelContext.hxx
@@ -42,8 +42,6 @@ public:
sal_uInt16 nPrfx,
const OUString& rLName );
- const css::uno::Reference<css::xforms::XModel2>& getModel() const { return mxModel;}
-
// implement SvXMLImportContext & TokenContext methods:
virtual void EndElement() override;