[Libreoffice-commits] core.git: basic/source compilerplugins/clang forms/source include/sfx2 sd/source vcl/inc
Noel Grandin
noel.grandin at collabora.co.uk
Thu May 10 09:34:53 UTC 2018
basic/source/comp/codegen.cxx | 4 -
compilerplugins/clang/unnecessaryvirtual-dead.results | 34 +++++++++++++
compilerplugins/clang/unnecessaryvirtual.cxx | 44 +++++++++++++++---
compilerplugins/clang/unnecessaryvirtual.py | 29 +++++++++++
compilerplugins/clang/unnecessaryvirtual.results | 40 ++++++++--------
forms/source/component/ComboBox.cxx | 12 ----
forms/source/component/ComboBox.hxx | 2
forms/source/component/ListBox.cxx | 14 -----
forms/source/component/ListBox.hxx | 2
forms/source/component/entrylisthelper.cxx | 17 ------
forms/source/component/entrylisthelper.hxx | 8 ---
include/sfx2/tabdlg.hxx | 2
sd/source/filter/eppt/epptbase.hxx | 1
sd/source/filter/eppt/epptooxml.hxx | 1
sd/source/filter/eppt/pptx-epptbase.cxx | 8 ---
sd/source/filter/eppt/pptx-epptooxml.cxx | 6 --
vcl/inc/salinst.hxx | 2
vcl/inc/unx/glyphcache.hxx | 2
18 files changed, 122 insertions(+), 106 deletions(-)
New commits:
commit 0e384e1080381e894b590fd0a6d453568715e8fa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu May 10 09:08:07 2018 +0200
loplugin:unnecessaryvirtual improvements
look for virtual methods where all of the overrides of the method are
empty
Change-Id: I87d99a0b647700a8d53498e0ab5f0437d3508553
Reviewed-on: https://gerrit.libreoffice.org/54060
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 9e38c02a7cb9..4e13f6a83336 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -391,7 +391,6 @@ public:
virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) = 0;
virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) = 0;
virtual bool processParams() = 0;
- virtual void end() = 0;
};
template <class T> PCodeVisitor< T >::~PCodeVisitor()
@@ -448,7 +447,6 @@ public:
visitor.processOpCode2( eOp, nOp1, nOp2 );
}
}
- visitor.end();
}
};
@@ -465,7 +463,6 @@ public:
virtual void processOpCode0( SbiOpcode /*eOp*/ ) override { ++m_nNumOp0; }
virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ) override { ++m_nNumSingleParams; }
virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) override { ++m_nNumDoubleParams; }
- virtual void end() override {}
S offset()
{
typedef decltype(T(1) + S(1)) larger_t; // type capable to hold both value ranges of T and S
@@ -526,7 +523,6 @@ public:
}
virtual bool processParams() override { return true; }
- virtual void end() override {}
// yeuch, careful here, you can only call
// GetBuffer on the returned SbiBuffer once, also
// you (as the caller) get to own the memory
diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results
new file mode 100644
index 000000000000..dc3fa6cd6d5a
--- /dev/null
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -0,0 +1,34 @@
+basic/source/comp/codegen.cxx:462
+ void OffSetAccumulator::start(const unsigned char *,)
+forms/source/component/entrylisthelper.hxx:138
+ void frm::OEntryListHelper::connectedExternalListSource()
+forms/source/component/entrylisthelper.hxx:142
+ void frm::OEntryListHelper::disconnectedExternalListSource()
+include/basegfx/utils/unopolypolygon.hxx:97
+ void basegfx::unotools::UnoPolyPolygon::modifying()const
+include/canvas/base/bufferedgraphicdevicebase.hxx:108
+ void canvas::BufferedGraphicDeviceBase::destroyBuffers()
+include/canvas/base/graphicdevicebase.hxx:302
+ void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertyChangeListener> &,)
+include/canvas/base/graphicdevicebase.hxx:315
+ void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference<class com::sun::star::beans::XVetoableChangeListener> &,)
+slideshow/source/engine/animationfactory.cxx:442
+ void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,)
+vcl/inc/salframe.hxx:135
+ void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
+vcl/inc/salmenu.hxx:80
+ void SalMenu::RemoveMenuBarButton(unsigned short,)
+vcl/inc/salobj.hxx:46
+ void SalObject::Enable(_Bool,)
+vcl/inc/unx/saldata.hxx:68
+ void X11SalData::initNWF()
+vcl/inc/unx/saldata.hxx:69
+ void X11SalData::deInitNWF()
+writerfilter/source/ooxml/OOXMLFactory.hxx:71
+ void writerfilter::ooxml::OOXMLFactory_ns::startAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
+writerfilter/source/ooxml/OOXMLFactory.hxx:72
+ void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
+writerfilter/source/ooxml/OOXMLFactory.hxx:73
+ void writerfilter::ooxml::OOXMLFactory_ns::endAction(class writerfilter::ooxml::OOXMLFastContextHandler *,)
+writerfilter/source/ooxml/OOXMLFactory.hxx:74
+ void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class writerfilter::ooxml::OOXMLFastContextHandler *,int,const class std::shared_ptr<class writerfilter::ooxml::OOXMLValue> &,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.cxx b/compilerplugins/clang/unnecessaryvirtual.cxx
index e2af4bec6dc3..afc324cee156 100644
--- a/compilerplugins/clang/unnecessaryvirtual.cxx
+++ b/compilerplugins/clang/unnecessaryvirtual.cxx
@@ -11,6 +11,7 @@
#include <string>
#include <iostream>
#include <set>
+#include <unordered_set>
#include "plugin.hxx"
#include "compat.hxx"
#include <fstream>
@@ -19,6 +20,9 @@
Dump a list of virtual methods and a list of methods overriding virtual methods.
Then we will post-process the 2 lists and find the set of virtual methods which don't need to be virtual.
+Also, we look for virtual methods where the bodies of all the overrides are empty i.e. this is leftover code
+that no longer has a purpose.
+
The process goes something like this:
$ make check
$ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='unnecessaryvirtual' check
@@ -46,7 +50,8 @@ bool operator < (const MyFuncInfo &lhs, const MyFuncInfo &rhs)
// try to limit the voluminous output a little
static std::set<MyFuncInfo> definitionSet;
-static std::set<std::string> overridingSet;
+static std::unordered_set<std::string> overridingSet;
+static std::unordered_set<std::string> nonEmptySet;
class UnnecessaryVirtual:
public RecursiveASTVisitor<UnnecessaryVirtual>, public loplugin::Plugin
@@ -66,6 +71,8 @@ public:
output += "definition:\t" + s.name + "\t" + s.sourceLocation + "\n";
for (const std::string & s : overridingSet)
output += "overriding:\t" + s + "\n";
+ for (const std::string & s : nonEmptySet)
+ output += "nonempty:\t" + s + "\n";
std::ofstream myfile;
myfile.open( WORKDIR "/loplugin.unnecessaryvirtual.log", std::ios::app | std::ios::out);
myfile << output;
@@ -76,6 +83,7 @@ public:
bool VisitCXXMethodDecl( const CXXMethodDecl* decl );
private:
+ void MarkRootOverridesNonEmpty( const CXXMethodDecl* methodDecl );
std::string toString(SourceLocation loc);
};
@@ -103,18 +111,27 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
if (ignoreLocation(methodDecl)) {
return true;
}
- if (!methodDecl->isThisDeclarationADefinition() ||
- !methodDecl->isVirtual() ||
- methodDecl->isDeleted())
- {
+ if (!methodDecl->isVirtual() || methodDecl->isDeleted()) {
return true;
}
- methodDecl = methodDecl->getCanonicalDecl();
// ignore stuff that forms part of the stable URE interface
- if (isInUnoIncludeFile(methodDecl)) {
+ if (isInUnoIncludeFile(methodDecl->getCanonicalDecl())) {
return true;
}
+ auto body = methodDecl->getBody();
+ if (body) {
+ auto compoundStmt = dyn_cast<CompoundStmt>(body);
+ if (!compoundStmt)
+ MarkRootOverridesNonEmpty(methodDecl->getCanonicalDecl());
+ else if (compoundStmt->size() > 0)
+ MarkRootOverridesNonEmpty(methodDecl->getCanonicalDecl());
+ }
+
+ if (!methodDecl->isThisDeclarationADefinition())
+ return true;
+
+ methodDecl = methodDecl->getCanonicalDecl();
std::string aNiceName = niceName(methodDecl);
// for destructors, we need to check if any of the superclass' destructors are virtual
@@ -155,6 +172,19 @@ bool UnnecessaryVirtual::VisitCXXMethodDecl( const CXXMethodDecl* methodDecl )
return true;
}
+void UnnecessaryVirtual::MarkRootOverridesNonEmpty( const CXXMethodDecl* methodDecl )
+{
+ if (methodDecl->size_overridden_methods() == 0) {
+ nonEmptySet.insert(niceName(methodDecl));
+ return;
+ }
+ for (auto iter = methodDecl->begin_overridden_methods();
+ iter != methodDecl->end_overridden_methods(); ++iter)
+ {
+ MarkRootOverridesNonEmpty(*iter);
+ }
+}
+
std::string UnnecessaryVirtual::toString(SourceLocation loc)
{
SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( loc );
diff --git a/compilerplugins/clang/unnecessaryvirtual.py b/compilerplugins/clang/unnecessaryvirtual.py
index 7ae6e6435907..187aafcbb2d8 100755
--- a/compilerplugins/clang/unnecessaryvirtual.py
+++ b/compilerplugins/clang/unnecessaryvirtual.py
@@ -7,6 +7,7 @@ import sys
definitionSet = set()
definitionToSourceLocationMap = dict()
overridingSet = set()
+nonEmptySet = set()
with io.open("workdir/loplugin.unnecessaryvirtual.log", "rb", buffering=1024*1024) as txt:
@@ -20,7 +21,12 @@ with io.open("workdir/loplugin.unnecessaryvirtual.log", "rb", buffering=1024*102
elif tokens[0] == "overriding:":
fullMethodName = tokens[1]
overridingSet.add(fullMethodName)
-
+ elif tokens[0] == "nonempty:":
+ fullMethodName = tokens[1]
+ nonEmptySet.add(fullMethodName)
+ else:
+ print( "unknown line: " + line)
+
unnecessaryVirtualSet = set()
for clazz in (definitionSet - overridingSet):
@@ -56,6 +62,21 @@ for clazz in (definitionSet - overridingSet):
unnecessaryVirtualSet.add( (clazz,loc) )
+deadSet = set()
+
+for clazz in (definitionSet - nonEmptySet):
+
+ # ignore destructors
+ if "::~" in clazz: continue
+
+ loc = definitionToSourceLocationMap[clazz]
+
+ # ignore external code
+ if loc.startswith("external/"): continue
+
+ deadSet.add( (clazz,loc) )
+
+
# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
return [int(text) if text.isdigit() else text.lower()
@@ -63,6 +84,7 @@ def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
# sort results by name and line number
tmp1list = sorted(unnecessaryVirtualSet, key=lambda v: natural_sort_key(v[1]))
+tmp2list = sorted(deadSet, key=lambda v: natural_sort_key(v[1]))
with open("compilerplugins/clang/unnecessaryvirtual.results", "wt") as f:
for t in tmp1list:
@@ -71,3 +93,8 @@ with open("compilerplugins/clang/unnecessaryvirtual.results", "wt") as f:
# add an empty line at the end to make it easier for the removevirtuals plugin to mmap() the output file
f.write("\n")
+with open("compilerplugins/clang/unnecessaryvirtual-dead.results", "wt") as f:
+ for t in tmp2list:
+ f.write( t[1] + "\n" )
+ f.write( " " + t[0] + "\n" )
+
diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results
index 8e8c84672159..13d089a6dc94 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -1,27 +1,23 @@
-basic/source/comp/codegen.cxx:464
+basic/source/comp/codegen.cxx:462
void OffSetAccumulator::start(const unsigned char *,)
-basic/source/comp/codegen.cxx:465
+basic/source/comp/codegen.cxx:463
void OffSetAccumulator::processOpCode0(enum SbiOpcode,)
-basic/source/comp/codegen.cxx:466
+basic/source/comp/codegen.cxx:464
void OffSetAccumulator::processOpCode1(enum SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:467
+basic/source/comp/codegen.cxx:465
void OffSetAccumulator::processOpCode2(enum SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:468
- void OffSetAccumulator::end()
-basic/source/comp/codegen.cxx:477
+basic/source/comp/codegen.cxx:474
_Bool OffSetAccumulator::processParams()
-basic/source/comp/codegen.cxx:488
+basic/source/comp/codegen.cxx:485
void BufferTransformer::start(const unsigned char *,)
-basic/source/comp/codegen.cxx:489
+basic/source/comp/codegen.cxx:486
void BufferTransformer::processOpCode0(enum SbiOpcode,)
-basic/source/comp/codegen.cxx:493
+basic/source/comp/codegen.cxx:490
void BufferTransformer::processOpCode1(enum SbiOpcode,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:518
+basic/source/comp/codegen.cxx:515
void BufferTransformer::processOpCode2(enum SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
-basic/source/comp/codegen.cxx:528
+basic/source/comp/codegen.cxx:525
_Bool BufferTransformer::processParams()
-basic/source/comp/codegen.cxx:529
- void BufferTransformer::end()
chart2/source/inc/WeakListenerAdapter.hxx:58
void chart::WeakListenerAdapter::disposing(const struct com::sun::star::lang::EventObject &,)
extensions/source/dbpilots/unoautopilot.hxx:98
@@ -106,6 +102,8 @@ include/sfx2/itemwrapper.hxx:156
const type-parameter-0-0 & sfx::IdentItemWrapper::GetItemValue(const type-parameter-0-0 &,)const
include/sfx2/itemwrapper.hxx:158
void sfx::IdentItemWrapper::SetItemValue(type-parameter-0-0 &,const type-parameter-0-0 &,)const
+include/sfx2/tabdlg.hxx:254
+ void SfxTabDialogController::RefreshInputSet()
include/svl/svdde.hxx:244
class DdeData * DdeTopic::Get(enum SotClipboardFormatId,)
include/svl/svdde.hxx:245
@@ -120,8 +118,6 @@ include/svl/svdde.hxx:307
void DdeService::~DdeService()
include/svtools/treelistbox.hxx:722
void SvTreeListBox::SelectAll(_Bool,_Bool,)
-include/svx/svdpage.hxx:94
- class SdrObjList * SdrObjList::CloneSdrObjList(class SdrModel *,)const
include/toolkit/controls/geometrycontrolmodel.hxx:191
void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,class com::sun::star::uno::Sequence<struct com::sun::star::beans::Property> &,)const
include/vbahelper/vbacollectionimpl.hxx:290
@@ -146,9 +142,9 @@ include/vbahelper/vbareturntypes.hxx:40
void ooo::vba::DefaultReturnHelper::setValue(type-parameter-0-0,)
include/vbahelper/vbareturntypes.hxx:41
type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue()
-include/vcl/weld.hxx:267
+include/vcl/weld.hxx:288
void weld::TreeView::append_text(const class rtl::OUString &,)
-include/vcl/weld.hxx:270
+include/vcl/weld.hxx:291
void weld::TreeView::append(const class rtl::OUString &,const class rtl::OUString &,const class rtl::OUString &,)
sc/source/core/opencl/formulagroupcl.cxx:870
void sc::opencl::DynamicKernelMixedArgument::GenNumDeclRef(class std::basic_stringstream<char> &,)const
@@ -242,7 +238,9 @@ vcl/inc/salframe.hxx:135
void SalFrame::SetRepresentedURL(const class rtl::OUString &,)
vcl/inc/salframe.hxx:179
void SalFrame::Flush(const class tools::Rectangle &,)
-vcl/inc/sallayout.hxx:181
+vcl/inc/salinst.hxx:167
+ class weld::Builder * SalInstance::CreateInterimBuilder(class vcl::Window *,const class rtl::OUString &,const class rtl::OUString &,)
+vcl/inc/sallayout.hxx:179
_Bool SalLayout::GetBoundRect(class SalGraphics &,class tools::Rectangle &,)const
vcl/inc/salmenu.hxx:79
_Bool SalMenu::AddMenuBarButton(const struct SalMenuButtonItem &,)
@@ -252,8 +250,10 @@ vcl/inc/salmenu.hxx:92
class tools::Rectangle SalMenu::GetMenuBarButtonRectPixel(unsigned short,class SalFrame *,)
vcl/inc/salobj.hxx:46
void SalObject::Enable(_Bool,)
-vcl/inc/salprn.hxx:111
+vcl/inc/salprn.hxx:112
enum SalPrinterError SalPrinter::GetErrorCode()
+vcl/inc/unx/glyphcache.hxx:121
+ void FreetypeFont::~FreetypeFont()
vcl/inc/unx/gtk/gtkdata.hxx:164
int GtkSalDisplay::CaptureMouse(class SalFrame *,)
vcl/inc/unx/saldata.hxx:65
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 92652c7cd647..71b8a25efc58 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -830,18 +830,6 @@ void OComboBoxModel::stringItemListChanged( ControlModelLock& /*_rInstanceLock*/
}
-void OComboBoxModel::connectedExternalListSource( )
-{
- // TODO?
-}
-
-
-void OComboBoxModel::disconnectedExternalListSource( )
-{
- // TODO?
-}
-
-
void OComboBoxModel::refreshInternalEntryList()
{
DBG_ASSERT( !hasExternalListSource(), "OComboBoxModel::refreshInternalEntryList: invalid call!" );
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 6e84fba4b57d..06b77f762d5f 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -124,8 +124,6 @@ private:
// OEntryListHelper overridables
virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ) override;
- virtual void connectedExternalListSource( ) override;
- virtual void disconnectedExternalListSource( ) override;
virtual void refreshInternalEntryList() override;
void loadData( bool _bForce );
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 67c4c3615c90..2b3a6a4a82ba 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1765,20 +1765,6 @@ namespace frm
}
- void OListBoxModel::connectedExternalListSource( )
- {
- // TODO?
- }
-
-
- void OListBoxModel::disconnectedExternalListSource( )
- {
- // TODO: in case we're part of an already loaded form, we should probably simulate
- // an onConnectedDbColumn, so our list gets filled with the data as indicated
- // by our SQL-binding related properties
- }
-
-
void OListBoxModel::impl_refreshDbEntryList( bool _bForce )
{
DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::impl_refreshDbEntryList: invalid call!" );
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index d0c9173e2468..42a41d522444 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -196,8 +196,6 @@ private:
// OEntryListHelper overridables
virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ) override;
- virtual void connectedExternalListSource( ) override;
- virtual void disconnectedExternalListSource( ) override;
virtual void refreshInternalEntryList() override;
virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) override;
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index 0016d65bba31..fcb66644d6ca 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -240,20 +240,6 @@ namespace frm
m_xListSource->removeListEntryListener( this );
m_xListSource.clear();
-
- disconnectedExternalListSource();
- }
-
-
- void OEntryListHelper::connectedExternalListSource( )
- {
- // nothing to do here
- }
-
-
- void OEntryListHelper::disconnectedExternalListSource( )
- {
- // nothing to do here
}
@@ -272,9 +258,6 @@ namespace frm
m_xListSource->addListEntryListener( this );
obtainListSourceEntries( _rInstanceLock );
-
- // let derivees react on the new list source
- connectedExternalListSource();
}
}
diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx
index be2759410e86..929c4d5bd320 100644
--- a/forms/source/component/entrylisthelper.hxx
+++ b/forms/source/component/entrylisthelper.hxx
@@ -133,14 +133,6 @@ namespace frm
*/
virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ) = 0;
- /** called whenever a connection to a new external list source has been established
- */
- virtual void connectedExternalListSource( );
-
- /** called whenever a connection to a new external list source has been revoked
- */
- virtual void disconnectedExternalListSource( );
-
/** called when XRefreshable::refresh has been called, and we do *not* have an external
list source
*/
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index cf7ecc4022bb..d7aaebb49669 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -251,7 +251,7 @@ private:
protected:
virtual short Ok();
- virtual void RefreshInputSet();
+ void RefreshInputSet();
virtual void PageCreated(const OString &rName, SfxTabPage &rPage);
std::unique_ptr<SfxItemSet> m_xExampleSet;
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index b0b391697f5a..cf61a2d3ac6f 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -353,7 +353,6 @@ protected:
bool /* bHasBackground */, css::uno::Reference< css::beans::XPropertySet > const & /* aXBackgroundPropSet */ ) {}
virtual void ImplWriteNotes( sal_uInt32 nPageNum ) = 0;
virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, css::uno::Reference< css::beans::XPropertySet > const & /* aXBackgroundPropSet */ ) {}
- virtual void ImplWriteLayout( sal_Int32 /* nOffset */, sal_uInt32 /* nMasterNum */ ) {}
virtual void exportPPTPre( const std::vector< css::beans::PropertyValue >& ) {}
virtual void exportPPTPost() {}
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index d9289b2bedcf..7fff989cc23d 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -90,7 +90,6 @@ private:
bool bHasBackground, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override;
virtual void ImplWriteNotes( sal_uInt32 nPageNum ) override;
virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, css::uno::Reference< css::beans::XPropertySet > const & aXBackgroundPropSet ) override;
- virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ) override;
void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum );
bool WriteColorSchemes(FSHelperPtr pFS, const OUString& rThemePath);
void WriteDefaultColorSchemes(FSHelperPtr pFS);
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index b3e1c4787645..22c6d0fa143d 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -211,14 +211,6 @@ void PPTWriterBase::exportPPT( const std::vector< css::beans::PropertyValue >& r
sal_uInt32 i;
- for ( i = 0; i < mnPages; i++ )
- {
- if ( GetPageByIndex( i, NORMAL ) ) {
- sal_uInt32 nMasterNum = GetMasterIndex( NORMAL );
- ImplWriteLayout( GetLayoutOffset( mXPagePropSet ), nMasterNum );
- }
- }
-
for ( i = 0; i < mnMasterPages; i++ )
{
if ( !CreateSlideMaster( i ) )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 33071ee3817a..f33c62db57dd 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -2206,12 +2206,6 @@ sal_Int32 PowerPointExport::GetLayoutFileId(sal_Int32 nOffset, sal_uInt32 nMaste
return mLayoutInfo[ nOffset ].mnFileIdArray[ nMasterNum ];
}
-void PowerPointExport::ImplWriteLayout(sal_Int32 /*nOffset*/, sal_uInt32 /*nMasterNum*/)
-{
- // we write all the layouts together with master(s)
- // ImplWritePPTXLayout( GetPPTXLayoutId( nOffset ), nMasterNum );
-}
-
void PowerPointExport::ImplWritePPTXLayout(sal_Int32 nOffset, sal_uInt32 nMasterNum)
{
SAL_INFO("sd.eppt", "write layout: " << nOffset);
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 98583ac68c6e..b4e8ed85e4d8 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -164,7 +164,7 @@ public:
virtual OpenGLContext* CreateOpenGLContext() = 0;
virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile);
- virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile);
+ weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile);
virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
VclButtonsType eButtonType, const OUString& rPrimaryMessage);
virtual weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow);
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 7d507f100fe0..2340683c8c48 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -118,7 +118,7 @@ class VCL_DLLPUBLIC FreetypeFont final
{
public:
FreetypeFont( const FontSelectPattern&, FreetypeFontInfo* );
- virtual ~FreetypeFont();
+ ~FreetypeFont();
const OString& GetFontFileName() const;
int GetFontFaceIndex() const;
More information about the Libreoffice-commits
mailing list