diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-19 16:32:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-22 12:57:32 +0100 |
commit | f853ec317f6af1b8c65cc5bd758371689c75118d (patch) | |
tree | b86d729bf9a9465ee619ead3b5635efa62a1804e /scripting | |
parent | f31d36966bceb90e261cbecd42634bde4448d527 (diff) |
Extend loplugin:external to warn about classes
...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend
loplugin:external to warn about enums".
Cases where free functions were moved into an unnamed namespace along with a
class, to not break ADL, are in:
filter/source/svg/svgexport.cxx
sc/source/filter/excel/xelink.cxx
sc/source/filter/excel/xilink.cxx
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
All other free functions mentioning moved classes appear to be harmless and not
give rise to (silent, even) ADL breakage. (One remaining TODO in
compilerplugins/clang/external.cxx is that derived classes are not covered by
computeAffectedTypes, even though they could also be affected by ADL-breakage---
but don't seem to be in any acutal case across the code base.)
For friend declarations using elaborate type specifiers, like
class C1 {};
class C2 { friend class C1; };
* If C2 (but not C1) is moved into an unnamed namespace, the friend declaration
must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see
C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither
qualified nor a template-id and the declaration is a function or an
elaborated-type-specifier, the lookup to determine whether the entity has been
previously declared shall not consider any scopes outside the innermost
enclosing namespace.")
* If C1 (but not C2) is moved into an unnamed namespace, the friend declaration
must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882>
"elaborated-type-specifier friend not looked up in unnamed namespace".
Apart from that, to keep changes simple and mostly mechanical (which should help
avoid regressions), out-of-line definitions of class members have been left in
the enclosing (named) namespace. But explicit specializations of class
templates had to be moved into the unnamed namespace to appease
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of
template from unnamed namespace using unqualified-id in enclosing namespace".
Also, accompanying declarations (of e.g. typedefs or static variables) that
could arguably be moved into the unnamed namespace too have been left alone.
And in some cases, mention of affected types in blacklists in other loplugins
needed to be adapted.
And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which
is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is
not moved into an unnamed namespace (because it is declared in
sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about
such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler
doesn’t give this warning for types defined in the main .C file, as those are
unlikely to have multiple definitions."
(<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The
warned-about classes also don't have multiple definitions in the given test, so
disable the warning when including the .cxx.
Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4
Reviewed-on: https://gerrit.libreoffice.org/83239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/source/dlgprov/dlgevtatt.cxx | 3 | ||||
-rw-r--r-- | scripting/source/provider/BrowseNodeFactoryImpl.cxx | 13 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 4 | ||||
-rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 30 |
4 files changed, 47 insertions, 3 deletions
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 33e979753d3e..bf7fe601d299 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -58,6 +58,7 @@ using namespace ::com::sun::star::reflection; namespace dlgprov { + namespace { class DialogSFScriptListenerImpl : public DialogScriptListenerImpl { @@ -106,6 +107,8 @@ namespace dlgprov DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ); }; + } + DialogVBAScriptListenerImpl::DialogVBAScriptListenerImpl( const Reference< XComponentContext >& rxContext, const Reference< awt::XControl >& rxControl, const Reference< frame::XModel >& xModel, const OUString& sDialogLibName ) : DialogScriptListenerImpl( rxContext ), msDialogLibName( sDialogLibName ) { Reference< XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() ); diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx index 5603cbdae062..b544fd328a56 100644 --- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx +++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx @@ -54,6 +54,7 @@ using namespace ::sf_misc; namespace browsenodefactory { +namespace { class BrowseNodeAggregator : public ::cppu::WeakImplHelper< browse::XBrowseNode > { @@ -257,9 +258,6 @@ private: } }; -namespace -{ - std::vector< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Reference< XComponentContext >& xCtx ) { const Sequence< OUString > openDocs = @@ -325,6 +323,8 @@ std::vector< Reference< browse::XBrowseNode > > getAllBrowseNodes( const Referen typedef ::std::vector< Reference< browse::XBrowseNode > > vXBrowseNodes; +namespace { + struct alphaSortForBNodes { bool operator()( const Reference< browse::XBrowseNode >& a, const Reference< browse::XBrowseNode >& b ) @@ -333,7 +333,12 @@ struct alphaSortForBNodes } }; +} + typedef ::cppu::WeakImplHelper< browse::XBrowseNode > t_BrowseNodeBase; + +namespace { + class DefaultBrowseNode : public t_BrowseNodeBase { @@ -575,6 +580,8 @@ public: } }; +} + BrowseNodeFactoryImpl::BrowseNodeFactoryImpl( Reference< XComponentContext > const & xComponentContext ) : m_xComponentContext( xComponentContext ) diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 5440e7a1c220..266737de056a 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -1289,6 +1289,8 @@ void StringResourcePersistenceImpl::implWriteLocaleBinary // BinaryOutput, helper class for exportBinary +namespace { + class BinaryInput { Sequence< sal_Int8 > const m_aData; @@ -1313,6 +1315,8 @@ public: OUString readString(); }; +} + BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XComponentContext > const & xContext ) : m_aData( aData ) , m_xContext( xContext ) diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index f5e148b47029..0bec24e2a047 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -163,6 +163,8 @@ static Sequence< Any > ooKeyPressedToVBAKeyUpDown( const Sequence< Any >& params typedef Sequence< Any > (*Translator)(const Sequence< Any >&); +namespace { + //expand the "TranslateInfo" struct to support more kinds of events struct TranslateInfo { @@ -172,11 +174,13 @@ struct TranslateInfo void const *pPara; //Parameters for the above approve method }; +} typedef std::unordered_map< OUString, std::list< TranslateInfo > > EventInfoHash; +namespace { struct TranslatePropMap { @@ -184,17 +188,23 @@ struct TranslatePropMap TranslateInfo const aTransInfo; }; +} + static bool ApproveAll(const ScriptEvent& evt, void const * pPara); //allow all types of controls to execute the event static bool ApproveType(const ScriptEvent& evt, void const * pPara); //certain types of controls should execute the event, those types are given by pPara static bool DenyType(const ScriptEvent& evt, void const * pPara); //certain types of controls should not execute the event, those types are given by pPara static bool DenyMouseDrag(const ScriptEvent& evt, void const * pPara); //used for VBA MouseMove event when "Shift" key is pressed +namespace { + struct TypeList { uno::Type const * pTypeList; int const nListLength; }; +} + Type const typeXFixedText = cppu::UnoType<awt::XFixedText>::get(); Type const typeXTextComponent = cppu::UnoType<awt::XTextComponent>::get(); Type const typeXComboBox = cppu::UnoType<awt::XComboBox>::get(); @@ -286,6 +296,8 @@ static EventInfoHash& getEventTransInfo() // Helper class +namespace { + class ScriptEventHelper { public: @@ -300,6 +312,8 @@ private: bool const m_bDispose; }; +} + static bool eventMethodToDescriptor( const OUString& rEventMethod, ScriptEventDescriptor& evtDesc, const OUString& sCodeName ) { @@ -426,6 +440,8 @@ ScriptEventHelper::createEvents( const OUString& sCodeName ) typedef ::cppu::WeakImplHelper< container::XNameContainer > NameContainer_BASE; +namespace { + class ReadOnlyEventsNameContainer : public NameContainer_BASE { public: @@ -466,6 +482,8 @@ typedef std::unordered_map< OUString, Any > EventSupplierHash; EventSupplierHash m_hEvents; }; +} + ReadOnlyEventsNameContainer::ReadOnlyEventsNameContainer( const Sequence< OUString >& eventMethods, const OUString& sCodeName ) { for ( const OUString& rSrc : eventMethods ) @@ -503,6 +521,8 @@ ReadOnlyEventsNameContainer::hasByName( const OUString& aName ) return true; } +namespace { + class ReadOnlyEventsSupplier : public ::cppu::WeakImplHelper< XScriptEventsSupplier > { public: @@ -515,11 +535,15 @@ private: Reference< container::XNameContainer > m_xNameContainer; }; +} + typedef ::cppu::WeakImplHelper< XScriptListener, util::XCloseListener, lang::XInitialization, css::lang::XServiceInfo > EventListener_BASE; #define EVENTLSTNR_PROPERTY_ID_MODEL 1 #define EVENTLSTNR_PROPERTY_MODEL "Model" +namespace { + class EventListener : public EventListener_BASE ,public ::comphelper::OMutexAndBroadcastHelper ,public ::comphelper::OPropertyContainer @@ -605,6 +629,8 @@ private: SfxObjectShell* mpShell; }; +} + EventListener::EventListener() : OPropertyContainer(GetBroadcastHelper()), m_bDocClosed(false), mpShell( nullptr ) { @@ -909,6 +935,8 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) } } +namespace { + class VBAToOOEventDescGen : public ::cppu::WeakImplHelper< XVBAToOOEventDescGen, css::lang::XServiceInfo > { public: @@ -935,6 +963,8 @@ public: }; +} + VBAToOOEventDescGen::VBAToOOEventDescGen() {} Sequence< ScriptEventDescriptor > SAL_CALL |