diff options
| -rw-r--r-- | chart2/source/view/charttypes/PieChart.hxx | 2 | ||||
| -rw-r--r-- | compilerplugins/clang/staticmethods.cxx | 6 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/eventcfg.cxx | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 901e2f1fcc07..f5d7d5325391 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -109,7 +109,7 @@ struct PieLabelInfo; , const ::com::sun::star::awt::Size& rPageSize ); bool performLabelBestFitInnerPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); - bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); + static bool performLabelBestFitOuterPlacement(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); void performLabelBestFit(ShapeParam& rShapeParam, PieLabelInfo& rPieLabelInfo); private: //member diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 562694bbf720..528dc0f003f1 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -184,6 +184,10 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) if (fqn == "ColumnBatch::getValue") { return true; } + // depends on config options + if (fqn == "psp::PrintFontManager::autoInstallFontLangSupport") { + return true; + } bVisitedThis = false; TraverseStmt(pCXXMethodDecl->getBody()); @@ -199,7 +203,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) return true; } -loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false); +loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true); } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index 3b858a800094..1ccd853bb5c2 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -46,7 +46,7 @@ private: com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; DECL_LINK( ActivatePageHdl, TabControl * ); - DECL_LINK_TYPED( DeactivatePageHdl, TabControl *, bool ); + DECL_STATIC_LINK_TYPED( DeactivatePageHdl, TabControl *, bool ); DECL_LINK(OkHdl, void *); ResMgr& mrResMgr; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 313542ca1ef6..49cf4f960d10 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -102,7 +102,7 @@ public: ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); OUString GetEventName( GlobalEventId nID ); }; @@ -367,7 +367,7 @@ sal_Bool SAL_CALL GlobalEventConfig::hasByName( const OUString& aName ) throw (R Type SAL_CALL GlobalEventConfig::getElementType( ) throw (RuntimeException, std::exception) { MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pImpl->getElementType( ); + return GlobalEventConfig_Impl::getElementType( ); } sal_Bool SAL_CALL GlobalEventConfig::hasElements( ) throw (RuntimeException, std::exception) { |