[Libreoffice-commits] core.git: 3 commits - chart2/source compilerplugins/clang cui/source desktop/inc desktop/source filter/source reportdesign/source sd/source slideshow/source starmath/inc starmath/qa starmath/source sw/qa unotools/source
Noel Grandin
noel at peralex.com
Tue May 5 05:06:09 PDT 2015
chart2/source/view/charttypes/PieChart.hxx | 2 -
compilerplugins/clang/staticmethods.cxx | 9 ++++
cui/source/customize/cfgutil.cxx | 15 -------
cui/source/inc/cfgutil.hxx | 8 ----
desktop/inc/app.hxx | 2 -
desktop/source/app/app.cxx | 2 -
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2 -
filter/source/xsltdialog/xmlfiltertabdialog.hxx | 2 -
reportdesign/source/filter/xml/xmlControlProperty.hxx | 2 -
reportdesign/source/filter/xml/xmlExport.hxx | 4 +-
reportdesign/source/ui/dlg/Condition.cxx | 2 -
reportdesign/source/ui/dlg/GroupsSorting.cxx | 8 ++--
reportdesign/source/ui/inc/FixedTextColor.hxx | 2 -
reportdesign/source/ui/inc/GeometryHandler.hxx | 4 +-
reportdesign/source/ui/inc/ReportController.hxx | 8 ++--
reportdesign/source/ui/inc/ReportSection.hxx | 2 -
reportdesign/source/ui/inc/ViewsWindow.hxx | 2 -
reportdesign/source/ui/inc/metadata.hxx | 10 ++---
reportdesign/source/ui/inc/propbrw.hxx | 2 -
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 22 +++++------
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 20 +++++-----
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2 -
reportdesign/source/ui/inspection/metadata.cxx | 8 ++--
reportdesign/source/ui/report/ReportController.cxx | 4 +-
sd/source/ui/dlg/headerfooterdlg.cxx | 2 -
sd/source/ui/inc/gluectrl.hxx | 4 +-
sd/source/ui/inc/headerfooterdlg.hxx | 2 -
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 4 +-
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx | 2 -
slideshow/source/engine/eventmultiplexer.cxx | 10 ++---
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 2 -
slideshow/source/engine/shapes/drawshapesubsetting.hxx | 4 +-
slideshow/source/engine/shapes/viewshape.cxx | 2 -
slideshow/source/engine/shapes/viewshape.hxx | 4 +-
slideshow/source/engine/transitions/slidechangebase.hxx | 4 +-
slideshow/source/inc/listenercontainer.hxx | 4 +-
starmath/inc/cursor.hxx | 2 -
starmath/inc/dialog.hxx | 2 -
starmath/inc/document.hxx | 6 +--
starmath/inc/edit.hxx | 2 -
starmath/inc/node.hxx | 6 +--
starmath/inc/smmod.hxx | 12 +++---
starmath/inc/symbol.hxx | 8 ++--
starmath/inc/utility.hxx | 4 +-
starmath/inc/view.hxx | 8 ++--
starmath/inc/visitors.hxx | 2 -
starmath/qa/cppunit/test_starmath.cxx | 12 +++---
starmath/source/document.cxx | 2 -
starmath/source/edit.cxx | 2 -
starmath/source/mathmlexport.hxx | 4 +-
starmath/source/mathmlimport.hxx | 4 +-
starmath/source/mathtype.hxx | 12 +++---
starmath/source/node.cxx | 4 +-
starmath/source/parse.cxx | 6 +--
starmath/source/smmod.cxx | 8 ++--
starmath/source/symbol.cxx | 6 +--
starmath/source/unomodel.cxx | 2 -
starmath/source/utility.cxx | 2 -
starmath/source/view.cxx | 2 -
sw/qa/extras/inc/bordertest.hxx | 2 -
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 -
sw/qa/extras/rtfimport/rtfimport.cxx | 2 -
sw/qa/extras/ww8import/ww8import.cxx | 2 -
unotools/source/config/eventcfg.cxx | 4 +-
65 files changed, 151 insertions(+), 169 deletions(-)
New commits:
commit 9bbfb78de44c93a19a7dc919f960e2ee17c17c4e
Author: Noel Grandin <noel at peralex.com>
Date: Tue May 5 14:04:30 2015 +0200
loplugin:staticmethods
Change-Id: I5d02ba0db00e11af3c17eaf77ce19c635a52077f
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 4d4d13d..5e6bde3 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -39,7 +39,7 @@ namespace rptxml
bool m_bIsList;
ORptFilter& GetOwnImport();
- ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
+ static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
OXMLControlProperty(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
void operator =(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
public:
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index c0d5272..0d37284 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -163,9 +163,9 @@ private:
void exportParagraph(const Reference< XReportControlModel >& _xReportElement);
bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula);
void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups);
- OUString convertFormula(const OUString& _sFormula);
+ static OUString convertFormula(const OUString& _sFormula);
- OUString implConvertNumber(sal_Int32 _nValue);
+ static OUString implConvertNumber(sal_Int32 _nValue);
private:
ORptExport();
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 3ba9044..049ae98 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -518,7 +518,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
for (sal_uInt16 j = 0; j< nItemCount; ++j)
{
sal_uInt16 nItemId = m_pActions->GetItemId(j);
- m_pActions->CheckItem( nItemId, m_rController.isFormatCommandEnabled(mapToolbarItemToSlotId(nItemId),
+ m_pActions->CheckItem( nItemId, OReportController::isFormatCommandEnabled(mapToolbarItemToSlotId(nItemId),
_xReportControlFormat ) );
}
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 177b15e..efd047a 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -116,10 +116,10 @@ public:
virtual void dispose() SAL_OVERRIDE;
// XEventListener
- void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+ static void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception );
// XContainerListener
void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
- void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ static void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -182,13 +182,13 @@ public:
void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception )
-{ mpParent->disposing(Source); }
+{ OFieldExpressionControl::disposing(Source); }
void OFieldExpressionControlContainerListener::elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
{ mpParent->elementInserted(rEvent); }
void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
-{ mpParent->elementReplaced(rEvent); }
+{ OFieldExpressionControl::elementReplaced(rEvent); }
void OFieldExpressionControlContainerListener::elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
{ mpParent->elementRemoved(rEvent); }
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index a10142d..4f3da57 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -41,7 +41,7 @@ namespace rptui
::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xComponent) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getXControl(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xFixedText) throw(::com::sun::star::uno::RuntimeException);
- void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
+ static void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
public:
FixedTextColor(const OReportController & _aObserver);
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index d71dd3d..f350f3b 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -92,14 +92,14 @@ namespace rptui
::com::sun::star::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
::com::sun::star::beans::Property getProperty(const OUString & PropertyName);
- void implCreateListLikeControl(
+ static void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
,sal_uInt16 _nResId
,bool _bReadOnlyControl
,bool _bTrueIfListBoxFalseIfComboBox
);
- void implCreateListLikeControl(
+ static void implCreateListLikeControl(
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
,::com::sun::star::inspection::LineDescriptor & out_Descriptor
,const ::std::vector< OUString>& _aEntries
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index a902da3..cd1d26f 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -216,8 +216,8 @@ namespace rptui
@param _nUndoStrId the string id of the string which is shown in undo menu
@param _nShrinkId ID of what you would like to shrink.
*/
- void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
- void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
+ static void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
+ static void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
public:
void shrinkSection(sal_uInt16 _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId);
@@ -347,8 +347,8 @@ namespace rptui
@param _nCommand the command id
@param _xControlFormat the report control format
*/
- bool isFormatCommandEnabled(sal_uInt16 _nCommand
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
+ static bool isFormatCommandEnabled(sal_uInt16 _nCommand
+ ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat);
virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE;
// XEventListener
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index f806a42..3b77341 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -151,7 +151,7 @@ namespace rptui
* \param _sType
* \param _pObj
*/
- void createDefault(const OUString& _sType,SdrObject* _pObj);
+ static void createDefault(const OUString& _sType,SdrObject* _pObj);
void stopScrollTimer();
/** deactivate the current active ole object if any
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 11d8da6..00e0ac2 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -135,7 +135,7 @@ namespace rptui
*/
TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
void collectRectangles(TRectangleMap& _rMap,bool _bBoundRects);
- void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
+ static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
OViewsWindow(OViewsWindow&) SAL_DELETED_FUNCTION;
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 238aeb3..0506dfc 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -48,13 +48,13 @@ namespace rptui
OPropertyInfoService(){}
virtual ~OPropertyInfoService(){}
// IPropertyInfoService
- sal_Int32 getPropertyId(const OUString& _rName) const;
- OUString getPropertyTranslation(sal_Int32 _nId) const;
- OString getPropertyHelpId(sal_Int32 _nId) const;
- sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const;
+ static sal_Int32 getPropertyId(const OUString& _rName);
+ static OUString getPropertyTranslation(sal_Int32 _nId);
+ static OString getPropertyHelpId(sal_Int32 _nId);
+ static sal_uInt32 getPropertyUIFlags(sal_Int32 _nId);
static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler);
- bool isComposable(
+ static bool isComposable(
const OUString& _rPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler
);
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 67a48b2..945be9a 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -75,7 +75,7 @@ protected:
void implSetNewObject(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >());
- OUString GetHeadlineName(
+ static OUString GetHeadlineName(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects);
void implDetachController();
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 0685870..ce18a3e 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -169,7 +169,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue;
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -214,7 +214,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -260,7 +260,7 @@ beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUStri
inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
{
inspection::LineDescriptor aOut;
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -282,12 +282,12 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
}
if ( nId != -1 )
{
- aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
+ aOut.Category = ((OPropertyInfoService::getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
OUString("Data")
:
OUString("General");
- aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
- aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
+ aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
+ aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
}
return aOut;
}
@@ -296,7 +296,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue( _rControlValue );
- const sal_Int32 nId = m_pInfoService->getPropertyId(_rPropertyValue);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(_rPropertyValue);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -328,7 +328,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _r
return aControlValue;
::osl::MutexGuard aGuard( m_aMutex );
- const sal_Int32 nId = m_pInfoService->getPropertyId(_rPropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(_rPropertyName);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -403,7 +403,7 @@ uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties()
sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
{
- return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+ return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
}
inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
@@ -414,7 +414,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
::osl::ClearableMutexGuard aGuard( m_aMutex );
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
@@ -467,7 +467,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act
}
else
{
- const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(ActuatingPropertyName);
switch(nId)
{
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index c8f45dc..0ea6b88 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -234,7 +234,7 @@ namespace rptui
::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
- const sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) );
+ const sal_Int32 nPropertyId( OPropertyInfoService::getPropertyId( _rPropertyName ) );
if ( nPropertyId != -1 )
return nPropertyId;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 7b788b5..fd218ba 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -364,7 +364,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyNam
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue;
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
@@ -458,7 +458,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
{
::osl::ResettableMutexGuard aGuard( m_aMutex );
uno::Any aNewValue = Value;
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
bool bHandled = false;
switch(nId)
{
@@ -716,7 +716,7 @@ void GeometryHandler::implCreateListLikeControl(
inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
{
inspection::LineDescriptor aOut;
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_FORCENEWPAGE:
@@ -847,12 +847,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( nId != -1 )
{
- aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
+ aOut.Category = ((OPropertyInfoService::getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
OUString("Data")
:
OUString("General");
- aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
- aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
+ aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
+ aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
}
if ( ( nId == PROPERTY_ID_POSITIONX )
@@ -955,7 +955,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue( _rControlValue );
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_FORCENEWPAGE:
@@ -1118,7 +1118,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
uno::Any aPropertyValue(_rPropertyValue);
::osl::MutexGuard aGuard( m_aMutex );
- const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
switch(nId)
{
case PROPERTY_ID_AREA:
@@ -1378,7 +1378,7 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties() thr
sal_Bool SAL_CALL GeometryHandler::isComposable(const OUString & _rPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
{
- return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+ return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
}
inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
@@ -1468,7 +1468,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
throw lang::NullPointerException();
::osl::MutexGuard aGuard( m_aMutex );
- const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName);
+ const sal_Int32 nId = OPropertyInfoService::getPropertyId(ActuatingPropertyName);
switch(nId)
{
case PROPERTY_ID_TYPE:
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 5f802c1..c7f278f 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -191,7 +191,7 @@ uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingPropertie
sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
{
- return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+ return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
}
inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index ea32550..1cf9fc7 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -156,28 +156,28 @@ namespace rptui
}
- sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const
+ sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName)
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName);
return pInfo ? pInfo->nId : -1;
}
- OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
+ OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId)
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
return (pInfo) ? pInfo->sTranslation : OUString();
}
- OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
+ OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId)
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
return (pInfo) ? pInfo->sHelpId : OString();
}
- sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const
+ sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId)
{
const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
return (pInfo) ? pInfo->nUIFlags : 0;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4398c00..39a3979 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3181,7 +3181,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
OUString sCustomShapeType = getDesignView()->GetInsertObjString();
if ( sCustomShapeType.isEmpty() )
sCustomShapeType = "diamond";
- pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl);
+ OReportSection::createDefault(sCustomShapeType,pNewControl);
pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width
}
else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId )
@@ -4161,7 +4161,7 @@ void OReportController::impl_zoom_nothrow()
InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(), true);
}
-bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const
+bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat)
{
bool bRet = false;
if ( _xReportControlFormat.is() && !uno::Reference< report::XFixedLine>(_xReportControlFormat,uno::UNO_QUERY).is() ) // this command is really often called so we nedd a short cut here
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index a21e27e..61dfb38 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -266,7 +266,7 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
return 0;
}
-IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool)
{
return true;
}
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 3926379..6416576 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -38,7 +38,7 @@ class HeaderFooterDialog : public TabDialog
{
private:
DECL_LINK( ActivatePageHdl, TabControl * );
- DECL_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
+ DECL_STATIC_LINK_TYPED( HeaderFooterDialog, DeactivatePageHdl, TabControl *, bool );
DECL_LINK( ClickApplyToAllHdl, void * );
DECL_LINK( ClickApplyHdl, void * );
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index dfd41ad..fdee574 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -26,7 +26,7 @@ public:
{
}
- void testTheBorders(uno::Reference<lang::XComponent> mxComponent, bool isBinaryDoc)
+ static void testTheBorders(uno::Reference<lang::XComponent> mxComponent, bool isBinaryDoc)
{
uno::Reference<text::XTextDocument> textDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> xParaEnumAccess(textDocument->getText(), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index c9c0368..0a5aa3f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -700,7 +700,7 @@ DECLARE_OOXMLIMPORT_TEST(testBnc773061, "bnc773061.docx")
DECLARE_OOXMLIMPORT_TEST(testAllGapsWord, "all_gaps_word.docx")
{
BorderTest borderTest;
- borderTest.testTheBorders(mxComponent, false);
+ BorderTest::testTheBorders(mxComponent, false);
}
DECLARE_OOXMLIMPORT_TEST(testN775906, "n775906.docx")
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index ae2873e..13c9d34 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -751,7 +751,7 @@ DECLARE_RTFIMPORT_TEST(testFdo47495, "fdo47495.rtf")
DECLARE_RTFIMPORT_TEST(testAllGapsWord, "all_gaps_word.rtf")
{
BorderTest borderTest;
- borderTest.testTheBorders(mxComponent, false);
+ BorderTest::testTheBorders(mxComponent, false);
}
DECLARE_RTFIMPORT_TEST(testFdo52052, "fdo52052.rtf")
diff --git a/sw/qa/extras/ww8import/ww8import.cxx b/sw/qa/extras/ww8import/ww8import.cxx
index 0c0da88..6f4f75b 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -185,7 +185,7 @@ DECLARE_WW8IMPORT_TEST(testN757905, "n757905.doc")
DECLARE_WW8IMPORT_TEST(testAllGapsWord, "all_gaps_word.doc")
{
BorderTest borderTest;
- borderTest.testTheBorders(mxComponent, true);
+ BorderTest::testTheBorders(mxComponent, true);
}
DECLARE_WW8IMPORT_TEST(testI120158, "i120158.doc")
commit 0a442d38157190c77eb04d53a90520913b93226c
Author: Noel Grandin <noel at peralex.com>
Date: Tue May 5 13:11:02 2015 +0200
loplugin:staticmethods
Change-Id: I4d19f868a618cb135aa7a949222972dc35b47d2a
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx
index 528dc0f..a0d6099 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -181,11 +181,14 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
return true;
}
// template magic
- if (fqn == "ColumnBatch::getValue") {
+ if (fqn == "ColumnBatch::getValue" || startsWith(fqn, "TitleImpl::")
+ || fqn == "ooo::vba::DefaultReturnHelper::getDefaultPropertyName") {
return true;
}
// depends on config options
- if (fqn == "psp::PrintFontManager::autoInstallFontLangSupport") {
+ if (fqn == "psp::PrintFontManager::autoInstallFontLangSupport"
+ || fqn == "GtkSalFrame::AllocateFrame"
+ || fqn == "GtkSalFrame::TriggerPaintEvent") {
return true;
}
@@ -203,7 +206,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
return true;
}
-loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true);
+loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index e6ca100..0d990ca 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -256,11 +256,6 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT );
GetModel()->SetSortMode( SortAscending );
-
- // Timer for the BallonHelp
- aTimer.SetTimeout( 200 );
- aTimer.SetTimeoutHdl(
- LINK( this, SfxConfigFunctionListBox, TimerHdl ) );
}
extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap)
@@ -289,16 +284,6 @@ void SfxConfigFunctionListBox::MouseMove( const MouseEvent& )
{
}
-IMPL_LINK_TYPED( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer, void)
-/* Description
- Timer-handler for showing a help-text. If the mouse pointer is
- still on the currently selected entry after the timer has run out,
- the entry's help-text is shown as a balloon-help.
-*/
-{
- (void)pTimer; // unused
-}
-
void SfxConfigFunctionListBox::ClearAll()
/* Description
Deletes all entries in the FunctionListBox, all UserData and all
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index c6c3ad9..c6ba6ea 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -93,21 +93,15 @@ struct SfxGroupInfo_Impl
nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {}
};
-struct CuiMacroInfo
-{
-};
-
typedef boost::ptr_vector<SfxGroupInfo_Impl> SfxGroupInfoArr_Impl;
class SfxConfigFunctionListBox : public SvTreeListBox
{
friend class SfxConfigGroupListBox;
- Timer aTimer;
- SvTreeListEntry* pCurEntry;
+ SvTreeListEntry* pCurEntry;
SfxGroupInfoArr_Impl aArr;
SfxStylesInfo_Impl* pStylesInfo;
- DECL_LINK_TYPED( TimerHdl, Timer*, void );
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
public:
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 21ab2f0..9882987 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -154,7 +154,7 @@ class Desktop : public Application
static void EnableOleAutomation();
DECL_LINK( ImplInitFilterHdl, ConvertData* );
- DECL_LINK_TYPED( AsyncInitFirstRun, Timer*, void );
+ DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void );
/** checks if the office is run the first time
<p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
respective flag in the configuration is reset.</p>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5be7223..971483d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1864,7 +1864,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
}
-IMPL_LINK_NOARG_TYPED(Desktop, AsyncInitFirstRun, Timer *, void)
+IMPL_STATIC_LINK_NOINSTANCE_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
{
DoFirstRunInitializations();
}
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 5a63bbf..46abda7 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -305,7 +305,7 @@ IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
-IMPL_LINK_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool )
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool )
{
return true;
}
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 1ccd853..cd83543 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_STATIC_LINK_TYPED( DeactivatePageHdl, TabControl *, bool );
+ DECL_STATIC_LINK_TYPED( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, bool );
DECL_LINK(OkHdl, void *);
ResMgr& mrResMgr;
diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx
index 6f71793..2c8d9c1 100644
--- a/sd/source/ui/inc/gluectrl.hxx
+++ b/sd/source/ui/inc/gluectrl.hxx
@@ -33,7 +33,7 @@ class GlueEscDirLB : public ListBox
private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
public:
- GlueEscDirLB( vcl::Window* pParent,
+ GlueEscDirLB( vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
virtual ~GlueEscDirLB();
@@ -48,7 +48,7 @@ public:
class SdTbxCtlGlueEscDir: public SfxToolBoxControl
{
private:
- sal_uInt16 GetEscDirPos( SdrEscapeDirection nEscDir );
+ static sal_uInt16 GetEscDirPos( SdrEscapeDirection nEscDir );
public:
virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 876dfcf..94eb680 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -137,10 +137,10 @@ Any CacheConfiguration::GetValue (const OUString& rName)
return aResult;
}
-IMPL_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
+IMPL_STATIC_LINK_NOINSTANCE_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
{
CacheConfigSharedPtr &rInstancePtr = theInstance::get();
- // Release out reference to the instance.
+ // Release our reference to the instance.
rInstancePtr.reset();
}
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 2ae2711..2f55a20 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -57,7 +57,7 @@ private:
CacheConfiguration();
- DECL_LINK_TYPED(TimerCallback, Timer *, void);
+ DECL_STATIC_LINK_TYPED(CacheConfiguration, TimerCallback, Timer *, void);
};
} } } // end of namespace ::sd::slidesorter::cache
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 29c37c0..0d3c391 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -262,7 +262,7 @@ struct EventMultiplexerImpl
double nPriority,
RegisterFunction pRegisterListener );
- bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer,
+ static bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer,
AnimationNodeSharedPtr const& rNode );
bool notifyMouseHandlers(
@@ -1110,14 +1110,14 @@ bool EventMultiplexer::notifySlideEndEvent()
bool EventMultiplexer::notifyAnimationStart(
const AnimationNodeSharedPtr& rNode )
{
- return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers,
+ return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers,
rNode );
}
bool EventMultiplexer::notifyAnimationEnd(
const AnimationNodeSharedPtr& rNode )
{
- return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers,
+ return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers,
rNode );
}
@@ -1130,7 +1130,7 @@ bool EventMultiplexer::notifySlideAnimationsEnd()
bool EventMultiplexer::notifyAudioStopped(
const AnimationNodeSharedPtr& rNode )
{
- return mpImpl->notifyAllAnimationHandlers(
+ return EventMultiplexerImpl::notifyAllAnimationHandlers(
mpImpl->maAudioStoppedHandlers,
rNode );
}
@@ -1138,7 +1138,7 @@ bool EventMultiplexer::notifyAudioStopped(
bool EventMultiplexer::notifyCommandStopAudio(
const AnimationNodeSharedPtr& rNode )
{
- return mpImpl->notifyAllAnimationHandlers(
+ return EventMultiplexerImpl::notifyAllAnimationHandlers(
mpImpl->maCommandStopAudioHandlers,
rNode );
}
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index ee02727..cc0828a 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -672,7 +672,7 @@ namespace slideshow
sal_Int32 DrawShapeSubsetting::implGetNumberOfTreeNodes( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin,
const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd,
- DocTreeNode::NodeType eNodeType ) const
+ DocTreeNode::NodeType eNodeType )
{
const IndexClassificator eRequestedClass(
mapDocTreeNode( eNodeType ) );
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
index cb1cc55..12b1f97 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx
@@ -204,9 +204,9 @@ namespace slideshow
void initCurrentSubsets();
void reset();
- sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin,
+ static sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin,
const IndexClassificatorVector::const_iterator& rEnd,
- DocTreeNode::NodeType eNodeType ) const;
+ DocTreeNode::NodeType eNodeType );
DocTreeNode implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin,
const IndexClassificatorVector::const_iterator& rEnd,
sal_Int32 nNodeIndex,
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index bb87b65..2653c97 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -63,7 +63,7 @@ namespace slideshow
bool ViewShape::prefetch( RendererCacheEntry& io_rCacheEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
const GDIMetaFileSharedPtr& rMtf,
- const ShapeAttributeLayerSharedPtr& rAttr ) const
+ const ShapeAttributeLayerSharedPtr& rAttr )
{
ENSURE_OR_RETURN_FALSE( rMtf,
"ViewShape::prefetch(): no valid metafile!" );
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index 199fcfd..fcddf74 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -236,10 +236,10 @@ namespace slideshow
/** Prefetch Renderer for given canvas
*/
- bool prefetch( RendererCacheEntry& io_rCacheEntry,
+ static bool prefetch( RendererCacheEntry& io_rCacheEntry,
const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
const GDIMetaFileSharedPtr& rMtf,
- const ShapeAttributeLayerSharedPtr& rAttr ) const;
+ const ShapeAttributeLayerSharedPtr& rAttr );
/** Draw with prefetched Renderer to stored canvas
diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx
index 7872593..7887ae2 100644
--- a/slideshow/source/engine/transitions/slidechangebase.hxx
+++ b/slideshow/source/engine/transitions/slidechangebase.hxx
@@ -123,7 +123,7 @@ protected:
::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const;
- void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap,
+ static void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap,
boost::shared_ptr<cppcanvas::Canvas> const& pCanvas );
/** Called on derived classes to perform actions before first run.
@@ -182,7 +182,7 @@ private:
double nPrio ) const;
void addSprites( ViewEntry& rEntry );
- void clearViewEntry( ViewEntry& rEntry );
+ static void clearViewEntry( ViewEntry& rEntry );
ViewsVecT::iterator lookupView( UnoViewSharedPtr const & pView );
ViewsVecT::const_iterator lookupView( UnoViewSharedPtr const & pView ) const;
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index b226f87..e87a6a5 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -33,8 +33,8 @@ struct EmptyBase
struct EmptyClearableGuard
{
explicit EmptyClearableGuard(EmptyBase) {}
- void clear() {}
- void reset() {}
+ static void clear() {}
+ static void reset() {}
};
typedef EmptyGuard Guard;
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index 441a733..188c098 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -460,7 +460,7 @@ private:
SmNode* Product();
SmNode* Factor();
SmNode* Postfix();
- SmNode* Error();
+ static SmNode* Error();
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index e208cf6..c67190b 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -226,7 +226,7 @@ class SmDistanceDialog : public ModalDialog
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
- void SetHelpId(MetricField &rField, const OString& sHelpId);
+ static void SetHelpId(MetricField &rField, const OString& sHelpId);
void SetCategory(sal_uInt16 Category);
public:
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index faa52b8..3a052c1 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -165,8 +165,8 @@ public:
SmDocShell( SfxModelFlags i_nSfxCreationFlags );
virtual ~SmDocShell();
- void LoadSymbols();
- void SaveSymbols();
+ static void LoadSymbols();
+ static void SaveSymbols();
void ArrangeFormula();
@@ -207,7 +207,7 @@ public:
virtual ::svl::IUndoManager *GetUndoManager () SAL_OVERRIDE;
- SfxItemPool& GetPool() const;
+ static SfxItemPool& GetPool();
void Execute( SfxRequest& rReq );
void GetState(SfxItemSet &);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index b386474..35557fb 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -122,7 +122,7 @@ public:
void MarkError(const Point &rPos);
void SelNextMark();
void SelPrevMark();
- bool HasMark(const OUString &rText) const;
+ static bool HasMark(const OUString &rText);
void Flush();
void DeleteEditView( SmViewShell &rView );
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 27b539a..540de95 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -819,9 +819,9 @@ public:
class SmRootNode : public SmStructureNode
{
protected:
- void GetHeightVerOffset(const SmRect &rRect,
- long &rHeight, long &rVerOffset) const;
- Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra) const;
+ static void GetHeightVerOffset(const SmRect &rRect,
+ long &rHeight, long &rVerOffset);
+ static Point GetExtraPos(const SmRect &rRootSymbol, const SmRect &rExtra);
public:
SmRootNode(const SmToken &rNodeToken)
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 4b1c61c..59020d8 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -76,13 +76,13 @@ public:
const ResStringArray& GetUiSymbolNamesArray() const { return aUiSymbolNamesAry; }
const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
- const OUString GetUiSymbolName( const OUString &rExportName ) const;
- const OUString GetExportSymbolName( const OUString &rUiName ) const;
+ static const OUString GetUiSymbolName( const OUString &rExportName );
+ static const OUString GetExportSymbolName( const OUString &rUiName );
const ResStringArray& GetUiSymbolSetNamesArray() const { return aUiSymbolSetNamesAry; }
const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
- const OUString GetUiSymbolSetName( const OUString &rExportName ) const;
- const OUString GetExportSymbolSetName( const OUString &rUiName ) const;
+ static const OUString GetUiSymbolSetName( const OUString &rExportName );
+ static const OUString GetExportSymbolSetName( const OUString &rUiName );
};
class SmModule : public SfxModule, utl::ConfigurationListener
@@ -93,7 +93,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener
std::unique_ptr<SvtSysLocale> mpSysLocale;
VclPtr<VirtualDevice> mpVirtualDev;
- void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
+ static void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
public:
TYPEINFO_OVERRIDE();
@@ -116,7 +116,7 @@ public:
SmLocalizedSymbolData & GetLocSymbolData();
- void GetState(SfxItemSet&);
+ static void GetState(SfxItemSet&);
const SvtSysLocale& GetSysLocale();
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 5151540..c05ea47 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -41,24 +41,24 @@
inline const OUString GetExportSymbolName( const OUString &rUiSymbolName )
{
- return SM_MOD()->GetLocSymbolData().GetExportSymbolName( rUiSymbolName );
+ return SmLocalizedSymbolData::GetExportSymbolName( rUiSymbolName );
}
inline const OUString GetUiSymbolName( const OUString &rExportSymbolName )
{
- return SM_MOD()->GetLocSymbolData().GetUiSymbolName( rExportSymbolName );
+ return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName );
}
inline const OUString GetExportSymbolSetName( const OUString &rUiSymbolSetName )
{
- return SM_MOD()->GetLocSymbolData().GetExportSymbolSetName( rUiSymbolSetName );
+ return SmLocalizedSymbolData::GetExportSymbolSetName( rUiSymbolSetName );
}
inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName )
{
- return SM_MOD()->GetLocSymbolData().GetUiSymbolSetName( rExportSymbolSetName );
+ return SmLocalizedSymbolData::GetUiSymbolSetName( rExportSymbolSetName );
}
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index ccd83f7..0870e6e 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -128,8 +128,8 @@ protected:
sal_uInt16 nMaxItems;
std::deque<vcl::Font> aFontVec;
- bool CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const;
- OUString GetStringItem(const vcl::Font &rItem);
+ static bool CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont);
+ static OUString GetStringItem(const vcl::Font &rItem);
public:
SmFontPickList(sal_uInt16 nMax = 5) : nMaxItems(nMax) {}
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index ddb5915..1256044 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -249,15 +249,15 @@ class SmViewShell: public SfxViewShell
bool bInsertIntoEditWindow;
protected:
- Size GetTextLineSize(OutputDevice& rDevice,
+ static Size GetTextLineSize(OutputDevice& rDevice,
const OUString& rLine);
- Size GetTextSize(OutputDevice& rDevice,
+ static Size GetTextSize(OutputDevice& rDevice,
const OUString& rText,
long MaxWidth);
- void DrawTextLine(OutputDevice& rDevice,
+ static void DrawTextLine(OutputDevice& rDevice,
const Point& rPosition,
const OUString& rLine);
- void DrawText(OutputDevice& rDevice,
+ static void DrawText(OutputDevice& rDevice,
const Point& rPosition,
const OUString& rText,
sal_uInt16 MaxWidth);
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index bf5bb2e..25b4d17 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -378,7 +378,7 @@ private:
/** Clone children of pSource and give them to pTarget */
void CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget );
/** Clone attributes on a pNode */
- void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
+ static void CloneNodeAttr( SmNode* pSource, SmNode* pTarget );
};
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index 5de607c..0620865 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -187,7 +187,7 @@ void Test::editUndoRedo()
CPPUNIT_ASSERT_MESSAGE("Strings must match", sStringTwo == sFinalText);
}
- SfxRequest aUndo(SID_UNDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
+ SfxRequest aUndo(SID_UNDO, SfxCallMode::SYNCHRON, SmDocShell::GetPool());
{
m_xDocShRef->Execute(aUndo);
@@ -203,7 +203,7 @@ void Test::editUndoRedo()
CPPUNIT_ASSERT_MESSAGE("Must now be empty", !sFinalText.getLength());
}
- SfxRequest aRedo(SID_REDO, SfxCallMode::SYNCHRON, m_xDocShRef->GetPool());
+ SfxRequest aRedo(SID_REDO, SfxCallMode::SYNCHRON, SmDocShell::GetPool());
{
m_xDocShRef->Execute(aRedo);
m_xDocShRef->UpdateText();
@@ -263,7 +263,7 @@ void Test::viewZoom()
}
{
- SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+ SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
aSet.Put(SvxZoomItem(SvxZoomType::OPTIMAL, 0));
SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
m_pViewShell->Execute(aZoom);
@@ -309,7 +309,7 @@ void Test::viewZoom()
nFinalZoom = rGraphicWindow.GetZoom();
CPPUNIT_ASSERT_MESSAGE("Should not be optimal zoom", nFinalZoom != nOptimalZoom);
- SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+ SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 50));
SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
m_pViewShell->Execute(aZoom);
@@ -318,7 +318,7 @@ void Test::viewZoom()
}
{
- SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+ SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 5));
SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
m_pViewShell->Execute(aZoom);
@@ -327,7 +327,7 @@ void Test::viewZoom()
}
{
- SfxItemSet aSet(m_xDocShRef->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+ SfxItemSet aSet(SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
aSet.Put(SvxZoomItem(SvxZoomType::PERCENT, 1000));
SfxRequest aZoom(SID_ATTR_ZOOM, SfxCallMode::SYNCHRON, aSet);
m_pViewShell->Execute(aZoom);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 150e748..0ff0caa 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1272,7 +1272,7 @@ void SmDocShell::Draw(OutputDevice *pDevice,
DrawFormula(*pDevice, atmppoint);
}
-SfxItemPool& SmDocShell::GetPool() const
+SfxItemPool& SmDocShell::GetPool()
{
return SfxGetpApp()->GetPool();
}
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 2f0ad53..1167cf6 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -909,7 +909,7 @@ void SmEditWindow::SelPrevMark()
}
}
-bool SmEditWindow::HasMark(const OUString& rText) const
+bool SmEditWindow::HasMark(const OUString& rText)
// returns true iff 'rText' contains a mark
{
return rText.indexOf("<?>") != -1;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index c7f38b3..9d63eaa 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -50,7 +50,7 @@ public:
bool Export(SfxMedium &rMedium);
void SetFlat(bool bIn) {bFlat = bIn;}
- bool WriteThroughComponent(
+ static bool WriteThroughComponent(
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
xOutputStream,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
@@ -61,7 +61,7 @@ public:
::com::sun::star::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName );
- bool WriteThroughComponent(
+ static bool WriteThroughComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
const sal_Char* pStreamName,
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index 9254273..0629ce5 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -48,7 +48,7 @@ public:
sal_uLong Import(SfxMedium &rMedium);
- sal_uLong ReadThroughComponent(
+ static sal_uLong ReadThroughComponent(
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
@@ -57,7 +57,7 @@ public:
const sal_Char* pFilterName,
bool bEncrypted );
- sal_uLong ReadThroughComponent(
+ static sal_uLong ReadThroughComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
const sal_Char* pStreamName,
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index e4bb10d..a569832 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -141,12 +141,12 @@ private:
sal_uInt8 nTag,sal_uInt8 nSelector,sal_uInt8 nVariation,
bool bSilent);
void HandleNudge();
- int xfLMOVE(sal_uInt8 nTest) const {return nTest&0x80;}
- int xfAUTO(sal_uInt8 nTest) const {return nTest&0x10;}
- int xfEMBELL(sal_uInt8 nTest) const {return nTest&0x20;}
- int xfNULL(sal_uInt8 nTest) const {return nTest&0x10;}
- int xfLSPACE(sal_uInt8 nTest) const {return nTest&0x40;}
- int xfRULER(sal_uInt8 nTest) const {return nTest&0x20;}
+ static int xfLMOVE(sal_uInt8 nTest) {return nTest&0x80;}
+ static int xfAUTO(sal_uInt8 nTest) {return nTest&0x10;}
+ static int xfEMBELL(sal_uInt8 nTest) {return nTest&0x20;}
+ static int xfNULL(sal_uInt8 nTest) {return nTest&0x10;}
+ static int xfLSPACE(sal_uInt8 nTest) {return nTest&0x40;}
+ static int xfRULER(sal_uInt8 nTest) {return nTest&0x20;}
void HandleNodes(SmNode *pNode,int nLevel=0);
int StartTemplate(sal_uInt16 nSelector,sal_uInt16 nVariation=0);
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 70bc753..311df24 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -935,7 +935,7 @@ void SmUnHorNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
- long &rHeight, long &rVerOffset) const
+ long &rHeight, long &rVerOffset)
// calculate height and vertical offset of root sign suitable for 'rRect'
{
rVerOffset = (rRect.GetBottom() - rRect.GetAlignB()) / 2;
@@ -947,7 +947,7 @@ void SmRootNode::GetHeightVerOffset(const SmRect &rRect,
Point SmRootNode::GetExtraPos(const SmRect &rRootSymbol,
- const SmRect &rExtra) const
+ const SmRect &rExtra)
{
const Size &rSymSize = rRootSymbol.GetSize();
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5881c37..f8bdc5f 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2324,14 +2324,12 @@ void SmParser::Special()
{
if (IsImportSymbolNames())
{
- const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
- aNewName = rLSD.GetUiSymbolName(rName.copy(1));
+ aNewName = SmLocalizedSymbolData::GetUiSymbolName(rName.copy(1));
bReplace = true;
}
else if (IsExportSymbolNames())
{
- const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
- aNewName = rLSD.GetExportSymbolName(rName.copy(1));
+ aNewName = SmLocalizedSymbolData::GetExportSymbolName(rName.copy(1));
bReplace = true;
}
}
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index ab09940..a3c9dd4 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -72,7 +72,7 @@ SmLocalizedSymbolData::~SmLocalizedSymbolData()
}
-const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName ) const
+const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
{
OUString aRes;
@@ -93,7 +93,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
}
-const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName ) const
+const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
{
OUString aRes;
@@ -114,7 +114,7 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
}
-const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName ) const
+const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
{
OUString aRes;
@@ -135,7 +135,7 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
}
-const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName ) const
+const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
{
OUString aRes;
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index d07bf42..899380b 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -258,8 +258,7 @@ void SmSymbolManager::Load()
}
// now add a %i... symbol to the 'iGreek' set for every symbol found in the 'Greek' set.
- SmLocalizedSymbolData aLocalizedData;
- const OUString aGreekSymbolSetName(aLocalizedData.GetUiSymbolSetName(OUString("Greek")));
+ const OUString aGreekSymbolSetName(SmLocalizedSymbolData::GetUiSymbolSetName(OUString("Greek")));
const SymbolPtrVec_t aGreekSymbols( GetSymbolSet( aGreekSymbolSetName ) );
OUString aSymbolSetName('i');
aSymbolSetName += aGreekSymbolSetName;
@@ -287,9 +286,8 @@ void SmSymbolManager::Save()
SmMathConfig &rCfg = *SM_MOD()->GetConfig();
// prepare to skip symbols from iGreek on saving
- SmLocalizedSymbolData aLocalizedData;
OUString aSymbolSetName('i');
- aSymbolSetName += aLocalizedData.GetUiSymbolSetName(OUString("Greek"));
+ aSymbolSetName += SmLocalizedSymbolData::GetUiSymbolSetName(OUString("Greek"));
SymbolPtrVec_t aTmp( GetSymbols() );
std::vector< SmSym > aSymbols;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 74edb40..dbebc9b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -636,7 +636,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS,
0
};
- SfxItemSet *pItemSet = new SfxItemSet( pDocSh->GetPool(), nRange );
+ SfxItemSet *pItemSet = new SfxItemSet( SmDocShell::GetPool(), nRange );
SmModule *pp = SM_MOD();
pp->GetConfig()->ConfigToItemSet(*pItemSet);
VclPtr<SfxPrinter> pPrinter = SfxPrinter::Create ( aStream, pItemSet );
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 47fad4e..0e54d8e 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -75,7 +75,7 @@ vcl::Font SmFontPickList::Get(sal_uInt16 nPos) const
return nPos < aFontVec.size() ? aFontVec[nPos] : vcl::Font();
}
-bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont) const
+bool SmFontPickList::CompareItem(const vcl::Font & rFirstFont, const vcl::Font & rSecondFont)
{
return rFirstFont.GetName() == rSecondFont.GetName() &&
rFirstFont.GetFamily() == rSecondFont.GetFamily() &&
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index a9ae7e1..cb391eb 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1738,7 +1738,7 @@ void SmViewShell::Execute(SfxRequest& rReq)
const SfxItemSet *pSet = rReq.GetArgs();
if ( !pSet )
{
- SfxItemSet aSet( GetDoc()->GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
+ SfxItemSet aSet( SmDocShell::GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM);
aSet.Put( SvxZoomItem( SvxZoomType::PERCENT, aGraphic->GetZoom()));
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
commit 7d426e6fd681c6f0fb45a69f3ac7076817495135
Author: Noel Grandin <noel at peralex.com>
Date: Tue May 5 10:33:52 2015 +0200
loplugin:staticmethods
Change-Id: I97160fc51dc16ff92b06d44570298eeec637e132
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 901e2f1..f5d7d53 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 562694b..528dc0f 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 3b858a8..1ccd853 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 313542c..49cf4f9 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)
{
More information about the Libreoffice-commits
mailing list