basic/source/sbx/sbxscan.cxx | 2 -
compilerplugins/clang/staticmethods.cxx | 5 ++--
desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 4 +--
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2 -
include/basic/sbmod.hxx | 2 -
include/basic/sbxform.hxx | 18 +++++++--------
include/sfx2/app.hxx | 12 +++++-----
include/sfx2/childwin.hxx | 2 -
include/sfx2/dispatch.hxx | 4 +--
include/sfx2/dockwin.hxx | 2 -
include/sfx2/objsh.hxx | 6 ++---
include/sfx2/sfxhelp.hxx | 6 ++---
include/sfx2/viewfrm.hxx | 2 -
include/svl/zformat.hxx | 4 +--
include/svtools/apearcfg.hxx | 2 -
include/svtools/calendar.hxx | 2 -
include/svtools/ehdl.hxx | 2 -
include/svtools/fmtfield.hxx | 2 -
include/svtools/ruler.hxx | 2 -
include/svtools/treelist.hxx | 2 -
include/svx/float3d.hxx | 2 -
include/svx/fntctrl.hxx | 4 +--
include/svx/galtheme.hxx | 2 -
include/svx/numfmtsh.hxx | 4 +--
include/svx/svdhdl.hxx | 2 -
include/svx/svdocapt.hxx | 10 ++++----
include/svx/svdocirc.hxx | 2 -
include/svx/xmlgrhlp.hxx | 4 +--
include/unotools/lingucfg.hxx | 4 ---
include/vcl/bitmap.hxx | 2 -
include/vcl/button.hxx | 4 +--
include/vcl/combobox.hxx | 2 -
include/vcl/edit.hxx | 6 ++---
include/vcl/fixed.hxx | 8 +++---
include/vcl/gdimtf.hxx | 8 +++---
include/vcl/group.hxx | 2 -
include/vcl/lstbox.hxx | 2 -
include/vcl/menu.hxx | 2 -
include/vcl/mnemonic.hxx | 4 +--
include/vcl/outdev.hxx | 2 -
include/vcl/splitwin.hxx | 2 -
include/vcl/toolbox.hxx | 2 -
include/vcl/wall.hxx | 2 -
include/vcl/window.hxx | 4 +--
include/xmloff/ImageStyle.hxx | 8 +++---
include/xmloff/shapeexport.hxx | 2 -
include/xmloff/xmlnume.hxx | 2 -
include/xmlreader/xmlreader.hxx | 2 -
sc/source/ui/inc/docsh.hxx | 2 -
sc/source/ui/inc/tabview.hxx | 2 -
sc/source/ui/vba/vbawindow.cxx | 2 -
sc/source/ui/view/tabview.cxx | 2 -
sc/source/ui/view/viewdata.cxx | 2 -
sd/inc/CustomAnimationPreset.hxx | 2 -
sd/inc/drawdoc.hxx | 8 +++---
sd/source/core/CustomAnimationPreset.cxx | 2 -
sd/source/core/drawdoc2.cxx | 4 +--
sd/source/core/text/textapi.cxx | 4 +--
sd/source/filter/html/htmlex.cxx | 8 +++---
sd/source/ui/annotations/annotationmanager.cxx | 2 -
sd/source/ui/annotations/annotationwindow.cxx | 2 -
sd/source/ui/app/sdxfer.cxx | 4 +--
sd/source/ui/dlg/animobjs.cxx | 2 -
sd/source/ui/func/fudraw.cxx | 16 ++++++-------
sd/source/ui/func/fuoaprms.cxx | 10 ++++----
sd/source/ui/func/fusel.cxx | 12 +++++-----
sd/source/ui/func/unoaprms.cxx | 2 -
sd/source/ui/unoidl/unoobj.cxx | 4 +--
sd/source/ui/view/drviewsc.cxx | 2 -
sd/source/ui/view/drviewsg.cxx | 2 -
sd/source/ui/view/sdview2.cxx | 2 -
sfx2/source/appl/app.cxx | 10 ++++----
sfx2/source/appl/sfxhelp.cxx | 2 -
sfx2/source/dialog/basedlgs.cxx | 4 +--
sfx2/source/dialog/dockwin.cxx | 4 +--
sfx2/source/dialog/mgetempl.cxx | 2 -
sfx2/source/dialog/splitwin.cxx | 2 -
sfx2/source/doc/objmisc.cxx | 2 -
sfx2/source/doc/objstor.cxx | 2 -
sfx2/source/view/viewfrm.cxx | 12 +++++-----
svl/source/numbers/zformat.cxx | 2 -
svtools/source/control/calendar.cxx | 2 -
svtools/source/misc/ehdl.cxx | 2 -
svx/source/form/formtoolbars.cxx | 2 -
svx/source/gallery2/galtheme.cxx | 2 -
svx/source/inc/formtoolbars.hxx | 4 +--
svx/source/items/numfmtsh.cxx | 4 +--
svx/source/svdraw/svdocapt.cxx | 10 ++++----
svx/source/svdraw/svdocirc.cxx | 2 -
svx/source/table/cell.hxx | 2 -
svx/source/xml/xmlgrhlp.cxx | 2 -
svx/source/xml/xmlxtexp.cxx | 2 -
svx/source/xml/xmlxtimp.cxx | 2 -
sw/inc/fesh.hxx | 10 ++++----
sw/source/core/frmedt/fefly1.cxx | 2 -
sw/source/core/frmedt/fetab.cxx | 4 +--
sw/source/core/frmedt/fews.cxx | 2 -
sw/source/uibase/inc/dbconfig.hxx | 2 -
sw/source/uibase/inc/fontcfg.hxx | 2 -
sw/source/uibase/inc/numfmtlb.hxx | 2 -
sw/source/uibase/inc/prcntfld.hxx | 2 -
sw/source/uibase/inc/redlndlg.hxx | 4 +--
sw/source/uibase/misc/redlndlg.cxx | 2 -
sw/source/uibase/utlui/numfmtlb.cxx | 2 -
vcl/inc/svmconverter.hxx | 2 -
vcl/source/control/edit.cxx | 4 +--
vcl/source/gdi/wall.cxx | 2 -
vcl/source/window/menu.cxx | 2 -
vcl/source/window/toolbox.cxx | 2 +
xmloff/source/core/xmlexp.cxx | 2 -
xmloff/source/style/FillStyleContext.cxx | 2 -
111 files changed, 205 insertions(+), 204 deletions(-)
New commits:
commit 3ee3b36ae0c064fb5c81268d8d63444309d1b970
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:05:49 2016 +0200
loplugin:staticmethods: Don't be fooled by decls starting with macros
...like SAL_DLLPRIVATE coming from UNO include files.
Change-Id: I9eb64c96b7e9e2a3742a166cedcf635d98fe65a0
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index c92eef4..5b88d0c 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -87,7 +87,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl
* pCXXMethodDecl)
if (isa<CXXConstructorDecl>(pCXXMethodDecl) ||
isa<CXXDestructorDecl>(pCXXMethodDecl) ||
isa<CXXConversionDecl>(pCXXMethodDecl)) {
return true;
}
- if
(isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(pCXXMethodDecl->getCanonicalDecl()->getLocStart())))
{
+ if
(isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(pCXXMethodDecl->getCanonicalDecl()->getNameInfo().getLoc())))
{
return true;
}
if ( pCXXMethodDecl != pCXXMethodDecl->getCanonicalDecl() ) {
commit 3e993a51f14f2a2421ca80128fc9a316042f725b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:04:35 2016 +0200
loplugin:staticmethods: basic
Change-Id: Ic8c8c8ad4470e14d662f478f6b859cd908c9f78c
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 1dd949e..411d1f0 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -860,7 +860,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt
) const
}
else
{
- rRes = rAppData.pBasicFormater->BasicFormatNull( *pFmt );
+ rRes = SbxBasicFormater::BasicFormatNull( *pFmt );
}
}
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index b4d539f..e43bf6d 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -54,7 +54,7 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject
std::vector< OUString > mModuleVariableNames;
- BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable*
pVar, StarBASIC* pDeletedBasic );
+ BASIC_DLLPRIVATE static void implClearIfVarDependsOnDeletedBasic(
SbxVariable* pVar, StarBASIC* pDeletedBasic );
SbModule(const SbModule&) = delete;
SbModule& operator=(const SbModule&) = delete;
diff --git a/include/basic/sbxform.hxx b/include/basic/sbxform.hxx
index 4832ed3..7425319 100644
--- a/include/basic/sbxform.hxx
+++ b/include/basic/sbxform.hxx
@@ -103,17 +103,17 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
String containing the formatted output
*/
OUString BasicFormat( double dNumber, const OUString& sFormatStrg );
- OUString BasicFormatNull( const OUString& sFormatStrg );
+ static OUString BasicFormatNull( const OUString& sFormatStrg );
static bool isBasicFormat( const OUString& sFormatStrg );
private:
- BASIC_DLLPRIVATE inline void ShiftString( OUStringBuffer& sStrg,
sal_uInt16 nStartPos );
- BASIC_DLLPRIVATE void AppendDigit( OUStringBuffer& sStrg, short nDigit );
+ BASIC_DLLPRIVATE static inline void ShiftString( OUStringBuffer& sStrg,
sal_uInt16 nStartPos );
+ BASIC_DLLPRIVATE static void AppendDigit( OUStringBuffer& sStrg, short
nDigit );
BASIC_DLLPRIVATE void LeftShiftDecimalPoint( OUStringBuffer& sStrg );
BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos,
bool& bOverflow );
BASIC_DLLPRIVATE void StrRoundDigit( OUStringBuffer& sStrg, short nPos );
- BASIC_DLLPRIVATE void ParseBack( OUStringBuffer& sStrg, const OUString&
sFormatStrg,
+ BASIC_DLLPRIVATE static void ParseBack( OUStringBuffer& sStrg, const
OUString& sFormatStrg,
short nFormatPos );
#ifdef with_sprintf_
// Methods for string conversion with sprintf():
@@ -129,11 +129,11 @@ class BASIC_DLLPUBLIC SbxBasicFormater {
bool& bFoundFirstDigit );
BASIC_DLLPRIVATE short RoundDigit( double dNumber );
#endif
- BASIC_DLLPRIVATE OUString GetPosFormatString( const OUString& sFormatStrg,
bool & bFound );
- BASIC_DLLPRIVATE OUString GetNegFormatString( const OUString& sFormatStrg,
bool & bFound );
- BASIC_DLLPRIVATE OUString Get0FormatString( const OUString& sFormatStrg,
bool & bFound );
- BASIC_DLLPRIVATE OUString GetNullFormatString( const OUString&
sFormatStrg, bool & bFound );
- BASIC_DLLPRIVATE void AnalyseFormatString( const OUString& sFormatStrg,
+ BASIC_DLLPRIVATE static OUString GetPosFormatString( const OUString&
sFormatStrg, bool & bFound );
+ BASIC_DLLPRIVATE static OUString GetNegFormatString( const OUString&
sFormatStrg, bool & bFound );
+ BASIC_DLLPRIVATE static OUString Get0FormatString( const OUString&
sFormatStrg, bool & bFound );
+ BASIC_DLLPRIVATE static OUString GetNullFormatString( const OUString&
sFormatStrg, bool & bFound );
+ BASIC_DLLPRIVATE static void AnalyseFormatString( const OUString&
sFormatStrg,
short& nNoOfDigitsLeft,
short& nNoOfDigitsRight,
short&
nNoOfOptionalDigitsLeft,
short& nNoOfExponentDigits,
commit 8a3afbee5720d06ad426ba366829b904d7455fd4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:04:21 2016 +0200
loplugin:staticmethods: desktop
Change-Id: Ic0c8ff1cd2809527ec4a3c4012af342bcab1308b
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index a54bbdb..f3d7281 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -260,9 +260,9 @@ private:
/** Helper method to compare the versions with the current version
*/
- SAL_DLLPRIVATE bool
+ SAL_DLLPRIVATE static bool
checkBlacklistVersion(const OUString& currentversion,
- css::uno::Sequence< OUString > const & versions)
const;
+ css::uno::Sequence< OUString > const & versions);
css::uno::Reference< css::uno::XComponentContext > m_context;
css::uno::Reference< css::xml::dom::XNode > m_element;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 8fc9ed3..732b026 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -447,7 +447,7 @@ void DescriptionInfoset::checkBlacklist() const
bool DescriptionInfoset::checkBlacklistVersion(
const OUString& currentversion,
- css::uno::Sequence< OUString > const & versions) const
+ css::uno::Sequence< OUString > const & versions)
{
sal_Int32 nLen = versions.getLength();
for (sal_Int32 i=0; i<nLen; i++) {
commit e1b1778b00227e11bd180db254ce6f2a20739394
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:04:01 2016 +0200
loplugin:staticmethods: sc
Change-Id: I7fb92d55a48e1a79568a25002bf17155b8f387b4
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 31adcf6..d5b2c92 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -134,7 +134,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell,
public SfxListener
SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const
css::uno::Reference< css::embed::XStorage >& );
SAL_DLLPRIVATE SCTAB GetSaveTab();
- SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
+ SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium );
SAL_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName,
rtl_TextEncoding eCharSet,
ScColWidthParam
aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 58cebc8..ceb1531 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -252,7 +252,7 @@ public:
/** Returns the current tab bar width in pixels. */
long GetTabBarWidth() const;
/** Returns the current tab bar width relative to the frame window width
(0.0 ... 1.0). */
- SC_DLLPUBLIC double GetRelTabBarWidth() const;
+ SC_DLLPUBLIC static double GetRelTabBarWidth();
/** Returns the pending tab bar width relative to the frame window width
(0.0 ... 1.0). */
double GetPendingRelTabBarWidth() const { return
mfPendingTabBarWidth;}
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 42c62bb..29f9206 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -862,7 +862,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw
(css::uno::RuntimeException, st
ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell && pViewShell->GetViewData().GetView() )
{
- double fRatio =
pViewShell->GetViewData().GetView()->GetRelTabBarWidth();
+ double fRatio = ScTabView::GetRelTabBarWidth();
if ( fRatio >= 0.0 && fRatio <= 1.0 )
return fRatio;
}
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index c83ddd4..e2fa248 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -891,7 +891,7 @@ long ScTabView::GetTabBarWidth() const
return pTabControl->GetSizePixel().Width();
}
-double ScTabView::GetRelTabBarWidth() const
+double ScTabView::GetRelTabBarWidth()
{
return 0.5;
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 90d5cd6..614bd5f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2454,7 +2454,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions&
rDocOpt ) const
// width of the tabbar, relative to frame window width
rDocSett.mfTabBarWidth = pView->GetPendingRelTabBarWidth();
if( rDocSett.mfTabBarWidth < 0.0 )
- rDocSett.mfTabBarWidth = pView->GetRelTabBarWidth();
+ rDocSett.mfTabBarWidth = ScTabView::GetRelTabBarWidth();
// sheet settings
for( SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabData.size()); ++nTab )
commit cff185e438f2db564d0309f1c790cd79be908351
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:03:56 2016 +0200
loplugin:staticmethods: sd
Change-Id: I150a2f4011981be28a0a8fc09c29d3f152bd8b78
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index bd3da58..10d54f6 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -117,7 +117,7 @@ private:
SAL_DLLPRIVATE void importPresets( const css::uno::Reference<
css::lang::XMultiServiceFactory >& xConfigProvider, const OUString& rNodePath,
PresetCategoryList& rPresetMap );
- SAL_DLLPRIVATE const OUString& translateName( const OUString& rId, const
UStringMap& rNameMap ) const;
+ SAL_DLLPRIVATE static const OUString& translateName( const OUString& rId,
const UStringMap& rNameMap );
private:
css::uno::Reference< css::animations::XAnimationNode > mxRootNode;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index cc88e28..fadb16d 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -433,12 +433,12 @@ public:
return nPos < maFrameViewList.size() ? maFrameViewList[nPos] :
nullptr; }
/** deprecated*/
- SAL_DLLPRIVATE SdAnimationInfo* GetAnimationInfo(SdrObject* pObject)
const;
+ SAL_DLLPRIVATE static SdAnimationInfo* GetAnimationInfo(SdrObject*
pObject);
static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool
bCreate = false );
- SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const;
- SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject,
const Point& rWinPoint, const vcl::Window& rCmpWnd );
+ SAL_DLLPRIVATE static SdIMapInfo* GetIMapInfo( SdrObject* pObject );
+ SAL_DLLPRIVATE static IMapObject* GetHitIMapObject( SdrObject* pObject,
const Point& rWinPoint, const vcl::Window& rCmpWnd );
SAL_DLLPRIVATE CharClass* GetCharClass() const { return
mpCharClass; }
@@ -578,7 +578,7 @@ public:
SAL_DLLPRIVATE void UpdatePageRelativeURLs(const OUString& rOldName, const
OUString& rNewName);
- SAL_DLLPRIVATE void SetCalcFieldValueHdl( ::Outliner* pOutliner);
+ SAL_DLLPRIVATE static void SetCalcFieldValueHdl( ::Outliner* pOutliner);
SAL_DLLPRIVATE sal_uInt16 GetAnnotationAuthorIndex( const OUString&
rAuthor );
diff --git a/sd/source/core/CustomAnimationPreset.cxx
b/sd/source/core/CustomAnimationPreset.cxx
index 2773050..b3aefe8 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -513,7 +513,7 @@ const OUString&
CustomAnimationPresets::getUINameForProperty( const OUString& rP
return translateName( rPresetId, maPropertyNameMap );
}
-const OUString& CustomAnimationPresets::translateName( const OUString& rId,
const UStringMap& rNameMap ) const
+const OUString& CustomAnimationPresets::translateName( const OUString& rId,
const UStringMap& rNameMap )
{
UStringMap::const_iterator aIter( rNameMap.find( rId ) );
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 3ee8be9..530d0d6 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -945,7 +945,7 @@ void SdDrawDocument::StopWorkStartupDelay()
// When the WorkStartupTimer has been created (this only happens in
// SdDrawViewShell::Construct() ), the timer may be stopped and the WorkStartup
// may be initiated.
-SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const
+SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject)
{
DBG_ASSERT(pObject, "sd::SdDrawDocument::GetAnimationInfo(), invalid
argument!");
if( pObject )
@@ -980,7 +980,7 @@ SdAnimationInfo*
SdDrawDocument::GetShapeUserData(SdrObject& rObject, bool bCrea
return pRet;
}
-SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const
+SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject )
{
DBG_ASSERT(pObject, "Without an object there is no IMapInfo");
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 953342a..07ca030 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -228,7 +228,7 @@ SvxTextForwarder* TextAPIEditSource::GetTextForwarder()
{
//init draw model first
m_xImpl->mpOutliner = new Outliner(m_xImpl->mpDoc,
OutlinerMode::TextObject);
- m_xImpl->mpDoc->SetCalcFieldValueHdl(m_xImpl->mpOutliner);
+ SdDrawDocument::SetCalcFieldValueHdl(m_xImpl->mpOutliner);
}
if (!m_xImpl->mpTextForwarder)
@@ -245,7 +245,7 @@ void TextAPIEditSource::SetText( OutlinerParaObject& rText )
{
//init draw model first
m_xImpl->mpOutliner = new Outliner(m_xImpl->mpDoc,
OutlinerMode::TextObject);
- m_xImpl->mpDoc->SetCalcFieldValueHdl(m_xImpl->mpOutliner);
+ SdDrawDocument::SetCalcFieldValueHdl(m_xImpl->mpOutliner);
}
m_xImpl->mpOutliner->SetText( rText );
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 28141c3..5596fdd 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1566,8 +1566,8 @@ bool HtmlExport::CreateHtmlForPresPages()
SdrObject* pObject = aIter.Next();
while (pObject)
{
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject);
- SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject);
+ SdAnimationInfo* pInfo =
SdDrawDocument::GetAnimationInfo(pObject);
+ SdIMapInfo* pIMapInfo =
SdDrawDocument::GetIMapInfo(pObject);
if ((pInfo &&
(pInfo->meClickAction ==
presentation::ClickAction_BOOKMARK ||
@@ -1682,8 +1682,8 @@ bool HtmlExport::CreateHtmlForPresPages()
for (SdrObject* pObject : aClickableObjects)
{
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject);
- SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject);
+ SdAnimationInfo* pInfo =
SdDrawDocument::GetAnimationInfo(pObject);
+ SdIMapInfo* pIMapInfo =
SdDrawDocument::GetIMapInfo(pObject);
Rectangle aRect(pObject->GetCurrentBoundRect());
Point aLogPos(aRect.TopLeft());
diff --git a/sd/source/ui/annotations/annotationmanager.cxx
b/sd/source/ui/annotations/annotationmanager.cxx
index 748402b..b76825a 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -430,7 +430,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation(
SfxRequest& rReq )
{
std::unique_ptr< ::Outliner > pOutliner( new
::Outliner(GetAnnotationPool(),OutlinerMode::TextObject) );
- mpDoc->SetCalcFieldValueHdl( pOutliner.get() );
+ SdDrawDocument::SetCalcFieldValueHdl( pOutliner.get() );
pOutliner->SetUpdateMode( true );
OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY));
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index 21cf13b..5666ff4 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -317,7 +317,7 @@ void AnnotationWindow::InitControls()
mpMeta->SetSettings(aSettings);
mpOutliner = new ::Outliner(GetAnnotationPool(),OutlinerMode::TextObject);
- Doc()->SetCalcFieldValueHdl( mpOutliner );
+ SdDrawDocument::SetCalcFieldValueHdl( mpOutliner );
mpOutliner->SetUpdateMode( true );
Rescale();
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 27b8aab..c699a56 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -181,7 +181,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
catch( uno::Exception& )
{}
}
- else if( dynamic_cast< const SdrGrafObj *>( pObj ) != nullptr &&
(mpSourceDoc && !mpSourceDoc->GetAnimationInfo( pObj )) )
+ else if( dynamic_cast< const SdrGrafObj *>( pObj ) != nullptr &&
(mpSourceDoc && !SdDrawDocument::GetAnimationInfo( pObj )) )
{
mpGraphic = new Graphic( static_cast< SdrGrafObj* >( pObj
)->GetTransformedGraphic() );
}
@@ -246,7 +246,7 @@ void SdTransferable::CreateObjectReplacement( SdrObject*
pObj )
}
}
- SdIMapInfo* pInfo = static_cast< SdDrawDocument* >( pObj->GetModel()
)->GetIMapInfo( pObj );
+ SdIMapInfo* pInfo = SdDrawDocument::GetIMapInfo( pObj );
if( pInfo )
mpImageMap = new ImageMap( pInfo->GetImageMap() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 1bf21f2..84ad06b 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -720,7 +720,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
{
SdrMark* pMark = rMarkList.GetMark(0);
SdrObject* pObject = pMark->GetMarkedSdrObj();
- SdAnimationInfo* pAnimInfo = rView.GetDoc().GetAnimationInfo(
pObject );
+ SdAnimationInfo* pAnimInfo = SdDrawDocument::GetAnimationInfo(
pObject );
sal_uInt32 nInv = pObject->GetObjInventor();
sal_uInt16 nId = pObject->GetObjIdentifier();
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index f161acc..f3d7575 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -593,12 +593,12 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point&
rPos)
bool bSet = false;
bool bAnimationInfo = dynamic_cast< const GraphicDocShell *>( mpDocSh ) ==
nullptr &&
- mpDoc->GetAnimationInfo(pObj);
+ SdDrawDocument::GetAnimationInfo(pObj);
bool bImageMapInfo = false;
if (!bAnimationInfo)
- bImageMapInfo = mpDoc->GetIMapInfo(pObj) != nullptr;
+ bImageMapInfo = SdDrawDocument::GetIMapInfo(pObj) != nullptr;
if (bAnimationInfo || bImageMapInfo)
{
@@ -630,7 +630,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
/******************************************************
* Click-Action
******************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo =
SdDrawDocument::GetAnimationInfo(pObj);
if(( dynamic_cast< const DrawView *>( mpView ) != nullptr &&
(pInfo->meClickAction ==
presentation::ClickAction_BOOKMARK ||
@@ -659,7 +659,7 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
}
}
else if (bImageMapInfo &&
- mpDoc->GetHitIMapObject(pObj, rPos, *mpWindow))
+ SdDrawDocument::GetHitIMapObject(pObj, rPos, *mpWindow))
{
/******************************************************
* ImageMap
@@ -781,9 +781,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point&
rPosPixel, const SdrViewE
Point
aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel)));
// URL for IMapObject underneath pointer is help text
- if ( mpDoc->GetIMapInfo(pObj) )
+ if ( SdDrawDocument::GetIMapInfo(pObj) )
{
- IMapObject* pIMapObj = mpDoc->GetHitIMapObject(pObj, aPos, *mpWindow );
+ IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject(pObj, aPos,
*mpWindow );
if ( pIMapObj )
{
@@ -797,9 +797,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point&
rPosPixel, const SdrViewE
}
}
}
- else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr &&
mpDoc->GetAnimationInfo(pObj))
+ else if (dynamic_cast< GraphicDocShell *>( mpDocSh ) == nullptr &&
SdDrawDocument::GetAnimationInfo(pObj))
{
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
switch (pInfo->meClickAction)
{
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index e5ef8a4..89df12f 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -123,7 +123,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
// inspect first object
pMark = rMarkList.GetMark(0);
- pInfo = mpDoc->GetAnimationInfo(pMark->GetMarkedSdrObj());
+ pInfo = SdDrawDocument::GetAnimationInfo(pMark->GetMarkedSdrObj());
if( pInfo )
{
bActive = pInfo->mbActive;
@@ -180,7 +180,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
{
pMark = rMarkList.GetMark( nObject );
SdrObject* pObject = pMark->GetMarkedSdrObj();
- pInfo = mpDoc->GetAnimationInfo(pObject);
+ pInfo = SdDrawDocument::GetAnimationInfo(pObject);
if( pInfo )
{
if( bActive != pInfo->mbActive )
@@ -291,8 +291,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj();
SdrObjKind eKind1 = (SdrObjKind)pObject1->GetObjIdentifier();
SdrObjKind eKind2 = (SdrObjKind)pObject2->GetObjIdentifier();
- SdAnimationInfo* pInfo1 = mpDoc->GetAnimationInfo(pObject1);
- SdAnimationInfo* pInfo2 = mpDoc->GetAnimationInfo(pObject2);
+ SdAnimationInfo* pInfo1 = SdDrawDocument::GetAnimationInfo(pObject1);
+ SdAnimationInfo* pInfo2 = SdDrawDocument::GetAnimationInfo(pObject2);
pInfo = nullptr;
if (pObject1->GetObjInventor() == SdrInventor &&
@@ -679,7 +679,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
{
SdrObject* pObject = rMarkList.GetMark(nObject)->GetMarkedSdrObj();
- pInfo = mpDoc->GetAnimationInfo(pObject);
+ pInfo = SdDrawDocument::GetAnimationInfo(pObject);
bool bCreated = false;
if( !pInfo )
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 57491f6..e8f3b6e6 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1220,9 +1220,9 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const
Point& rPos)
SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog,
*mpView->GetSdrPageView(), pVisiLayer, false) &&
SdrObjectPrimitiveHit(*pObj, aHitPosB, nHitLog,
*mpView->GetSdrPageView(), pVisiLayer, false) ) )
{
- if ( mpDoc->GetIMapInfo( pObj ) )
+ if ( SdDrawDocument::GetIMapInfo( pObj ) )
{
- const IMapObject* pIMapObj = mpDoc->GetHitIMapObject( pObj, rPos,
*mpWindow );
+ const IMapObject* pIMapObj = SdDrawDocument::GetHitIMapObject(
pObj, rPos, *mpWindow );
if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
{
@@ -1243,12 +1243,12 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const
Point& rPos)
}
else if( dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr
&&
dynamic_cast< const DrawView *>( mpView ) != nullptr
&&
- mpDoc->GetAnimationInfo(pObj))
+ SdDrawDocument::GetAnimationInfo(pObj))
{
/**********************************************************
* Animation-object hit in the middle -> interaction
**********************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
DrawViewShell* pDrViewSh =
static_cast<DrawViewShell*>(mpViewShell);
mpWindow->ReleaseMouse();
@@ -1438,12 +1438,12 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const
Point& rPos)
dynamic_cast< const DrawView *>( mpView ) != nullptr
&&
dynamic_cast< const GraphicDocShell *>( mpDocSh ) == nullptr
&&
SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) &&
- mpDoc->GetAnimationInfo(pObj))
+ SdDrawDocument::GetAnimationInfo(pObj))
{
/**********************************************************
* Effect-Object hit in the middle -> Play effect
**********************************************************/
- SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObj);
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo(pObj);
switch (pInfo->meClickAction)
{
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index 9ffa976..e3f2c88 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -30,7 +30,7 @@ void SdAnimationPrmsUndoAction::Undo()
SdDrawDocument* pDoc =
static_cast<SdDrawDocument*>(pObject->GetModel());
if( pDoc )
{
- SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject );
+ SdAnimationInfo* pInfo = SdDrawDocument::GetAnimationInfo( pObject
);
pInfo->mbActive = bOldActive;
pInfo->meEffect = eOldEffect;
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index d49a4a4..b360cdd 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -646,7 +646,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString&
aPropertyName, const c
if( !xImageMap.is() || !SvUnoImageMap_fillImageMap(
xImageMap, aImageMap ) )
throw lang::IllegalArgumentException();
- SdIMapInfo* pIMapInfo = pDoc->GetIMapInfo(pObj);
+ SdIMapInfo* pIMapInfo =
SdDrawDocument::GetIMapInfo(pObj);
if( pIMapInfo )
{
// replace existing image map
@@ -805,7 +805,7 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const
OUString& PropertyName
if( pDoc )
{
- SdIMapInfo* pIMapInfo =
pDoc->GetIMapInfo(mpShape->GetSdrObject());
+ SdIMapInfo* pIMapInfo =
SdDrawDocument::GetIMapInfo(mpShape->GetSdrObject());
if( pIMapInfo )
{
const ImageMap& rIMap = pIMapInfo->GetImageMap();
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 3bbb3a7..9f245cc 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -59,7 +59,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
Graphic aGraphic;
ImageMap* pIMap = nullptr;
TargetList* pTargetList = nullptr;
- SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pObj );
+ SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo( pObj );
// get graphic from shape
SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >( pObj );
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 81fe3a7..4123cc4 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -59,7 +59,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq )
if ( pDlg->GetEditingObject() == static_cast<void*>(pSdrObj) )
{
const ImageMap& rImageMap = pDlg->GetImageMap();
- SdIMapInfo* pIMapInfo = GetDoc()->GetIMapInfo( pSdrObj );
+ SdIMapInfo* pIMapInfo = SdDrawDocument::GetIMapInfo(
pSdrObj );
if ( !pIMapInfo )
pSdrObj->AppendUserData( new SdIMapInfo( rImageMap ) );
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 574e456..ddae5e88 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -726,7 +726,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
{
// insert as clip action => jump
OUString aBookmark( aINetBookmark.GetURL() );
- SdAnimationInfo* pInfo =
mrDoc.GetAnimationInfo( pPickObj );
+ SdAnimationInfo* pInfo =
SdDrawDocument::GetAnimationInfo( pPickObj );
if( !aBookmark.isEmpty() )
{
commit a360d0b33a66be1ae190196e39c12b0494ba2840
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:03:43 2016 +0200
loplugin:staticmethods: sfx2
Change-Id: I64bd8564b335481a8cdfb053cc9563bea8ef47d3
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 67df6f2..99577e6 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -118,7 +118,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
{
std::unique_ptr<SfxAppData_Impl> pImpl;
- DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
+ DECL_DLLPRIVATE_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl,
StarBASIC*, bool );
void Deinitialize();
@@ -215,23 +215,23 @@ public:
SAL_DLLPRIVATE void OpenRemoteExec_Impl(SfxRequest &);
SAL_DLLPRIVATE void MiscExec_Impl(SfxRequest &);
SAL_DLLPRIVATE void MiscState_Impl(SfxItemSet &);
- SAL_DLLPRIVATE void PropExec_Impl(SfxRequest &);
- SAL_DLLPRIVATE void PropState_Impl(SfxItemSet &);
+ SAL_DLLPRIVATE static void PropExec_Impl(SfxRequest &);
+ SAL_DLLPRIVATE static void PropState_Impl(SfxItemSet &);
SAL_DLLPRIVATE void OfaExec_Impl(SfxRequest &);
- SAL_DLLPRIVATE void OfaState_Impl(SfxItemSet &);
+ SAL_DLLPRIVATE static void OfaState_Impl(SfxItemSet &);
SAL_DLLPRIVATE void SetProgress_Impl(SfxProgress *);
SAL_DLLPRIVATE const OUString& GetLastDir_Impl() const;
SAL_DLLPRIVATE void SetLastDir_Impl( const OUString & );
- SAL_DLLPRIVATE void Registrations_Impl();
+ SAL_DLLPRIVATE static void Registrations_Impl();
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame
*pFrame=nullptr) const;
// TODO/CLEANUP: still needed? -- unclear whether this comment
// refers to the GetDisabledSlotList_Impl() method which was
// already removed, or the below methods?
SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
- SAL_DLLPRIVATE SfxModule* GetModule_Impl();
+ SAL_DLLPRIVATE static SfxModule* GetModule_Impl();
static void SetModule(SfxToolsModule nSharedLib,
std::unique_ptr<SfxModule> pModule);
static SfxModule* GetModule(SfxToolsModule nSharedLib);
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 7dc7289..6e1c336 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -204,7 +204,7 @@ public:
void SetVisible_Impl( bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE void Activate_Impl();
- SAL_DLLPRIVATE void Deactivate_Impl();
+ SAL_DLLPRIVATE static void Deactivate_Impl();
SAL_DLLPRIVATE SfxChildWindowContext*
GetContext_Impl() const
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 8d88ce0..783f0c2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -181,8 +181,8 @@ public:
SAL_DLLPRIVATE void SetQuietMode_Impl( bool bOn );
SAL_DLLPRIVATE bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
- SAL_DLLPRIVATE void DoParentActivate_Impl();
- SAL_DLLPRIVATE void DoParentDeactivate_Impl();
+ SAL_DLLPRIVATE static void DoParentActivate_Impl();
+ SAL_DLLPRIVATE static void DoParentDeactivate_Impl();
SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI );
SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew );
SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 03201c7..9d10cf5 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -102,7 +102,7 @@ public:
DECL_LINK(TimerHdl, Idle *, void);
SAL_DLLPRIVATE void Initialize_Impl();
- SAL_DLLPRIVATE SplitWindowItemFlags GetWinBits_Impl() const;
+ SAL_DLLPRIVATE static SplitWindowItemFlags GetWinBits_Impl();
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
SAL_DLLPRIVATE void Disappear_Impl();
SAL_DLLPRIVATE void Reappear_Impl();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 1b9dfaf..7276339 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -625,7 +625,7 @@ public:
SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile>
CreatePreviewMetaFile_Impl(bool bFullContent) const;
- SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
+ SAL_DLLPRIVATE static bool IsPackageStorageFormat_Impl(const SfxMedium &);
SAL_DLLPRIVATE bool ConnectTmpStorage_Impl( const css::uno::Reference<
css::embed::XStorage >& xStorage, SfxMedium* pMedium );
SAL_DLLPRIVATE bool DisconnectStorage_Impl( SfxMedium& rSrcMedium,
SfxMedium& rTargetMedium );
@@ -642,7 +642,7 @@ public:
SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing );
SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const
css::uno::Reference< css::task::XInteractionHandler >& xHandler );
- SAL_DLLPRIVATE SignatureState ImplCheckSignaturesInformation(
+ SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation(
const css::uno::Sequence<
css::security::DocumentSignatureInformation >& aInfos );
SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference<
css::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE void SetModifyPasswordEntered( bool bEntered = true );
@@ -673,7 +673,7 @@ public:
SAL_DLLPRIVATE void ExecProps_Impl(SfxRequest &);
SAL_DLLPRIVATE void StateProps_Impl(SfxItemSet &);
SAL_DLLPRIVATE void ExecView_Impl(SfxRequest &);
- SAL_DLLPRIVATE void StateView_Impl(SfxItemSet &);
+ SAL_DLLPRIVATE static void StateView_Impl(SfxItemSet &);
// Load/Save public internals
SAL_DLLPRIVATE bool ImportFromGeneratedStream_Impl(
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index da6a5a2..561b336 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -33,11 +33,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
bool bIsDebug;
private:
- SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window*
pWindow, const OUString& rKeyword );
+ SAL_DLLPRIVATE static bool Start_Impl( const OUString& rURL, const
vcl::Window* pWindow, const OUString& rKeyword );
SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord )
override;
SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const
vcl::Window* pWindow ) override;
- SAL_DLLPRIVATE OUString GetHelpModuleName_Impl();
- SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL,
const OUString& rModuleName );
+ SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl();
+ SAL_DLLPRIVATE static OUString CreateHelpURL_Impl( const OUString&
aCommandURL, const OUString& rModuleName );
public:
SfxHelp();
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index ec4e931..a413638 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -196,7 +196,7 @@ public:
SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet );
SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
- SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
+ SAL_DLLPRIVATE static SfxViewFrame* GetParentViewFrame_Impl();
SAL_DLLPRIVATE void ForceOuterResize_Impl();
SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const;
SAL_DLLPRIVATE void UpdateDocument_Impl();
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 0b65b94..0b0c2d8 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -314,11 +314,11 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame
*pFrame )
{
// get the containerframes ( if one of the frames is an InPlaceFrame )
SfxViewFrame *pOldContainerFrame = pImpl->pViewFrame;
- while ( pOldContainerFrame &&
pOldContainerFrame->GetParentViewFrame_Impl() )
- pOldContainerFrame = pOldContainerFrame->GetParentViewFrame_Impl();
+ while ( pOldContainerFrame && SfxViewFrame::GetParentViewFrame_Impl() )
+ pOldContainerFrame = SfxViewFrame::GetParentViewFrame_Impl();
SfxViewFrame *pNewContainerFrame = pFrame;
- while ( pNewContainerFrame &&
pNewContainerFrame->GetParentViewFrame_Impl() )
- pNewContainerFrame = pNewContainerFrame->GetParentViewFrame_Impl();
+ while ( pNewContainerFrame && SfxViewFrame::GetParentViewFrame_Impl() )
+ pNewContainerFrame = SfxViewFrame::GetParentViewFrame_Impl();
// DocWinActivate : both frames belong to the same TopWindow
// TopWinActivate : both frames belong to different TopWindows
@@ -467,7 +467,7 @@ extern "C" void basicide_macro_organizer(sal_Int16);
#endif
-IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic,
bool )
+IMPL_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*,
pStarBasic, bool )
{
#if !HAVE_FEATURE_SCRIPTING
(void) pStarBasic;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 8e10bb7..9247ac5 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -658,7 +658,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow, const
OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString&
rModuleName)
{
SfxHelp* pHelp = static_cast< SfxHelp* >(Application::GetHelp());
- return pHelp ? pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName ) :
OUString();
+ return pHelp ? SfxHelp::CreateHelpURL_Impl( aCommandURL, rModuleName ) :
OUString();
}
OUString SfxHelp::GetDefaultHelpModule()
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 971c750..e401186 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -333,7 +333,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS &&
!HasChildPathFocus() )
{
pBindings->SetActiveFrame( css::uno::Reference< css::frame::XFrame
> () );
- pImpl->pMgr->Deactivate_Impl();
+ SfxChildWindow::Deactivate_Impl();
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -421,7 +421,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
if ( !HasChildPathFocus() )
{
pBindings->SetActiveFrame( nullptr );
- pImpl->pMgr->Deactivate_Impl();
+ SfxChildWindow::Deactivate_Impl();
}
}
else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index f74494f..9365efe 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1657,14 +1657,14 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
{
pBindings->SetActiveFrame( nullptr );
if (pMgr != nullptr)
- pMgr->Deactivate_Impl();
+ SfxChildWindow::Deactivate_Impl();
}
return DockingWindow::Notify( rEvt );
}
-SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const
+SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl()
{
return SplitWindowItemFlags::NONE;
}
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 978cf37..a0a41e7 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -95,7 +95,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window*
pParent, const Sfx
else
m_pEditLinkStyleBtn->Enable();
- ResMgr* pResMgr = SfxGetpApp()->GetModule_Impl()->GetResMgr();
+ ResMgr* pResMgr = SfxApplication::GetModule_Impl()->GetResMgr();
OSL_ENSURE( pResMgr, "No ResMgr in Module" );
pFamilies = new SfxStyleFamilies( ResId( DLG_STYLE_DESIGNER, *pResMgr ) );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index a31e356..2e80e3b 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -663,7 +663,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
{
SfxDockingWindow* pDockWin = pDock->pWin;
- SplitWindowItemFlags nItemBits = pDockWin->GetWinBits_Impl();
+ SplitWindowItemFlags nItemBits = SfxDockingWindow::GetWinBits_Impl();
long nWinSize, nSetSize;
if ( IsHorizontal() )
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 60f4c63..13e762a 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1867,7 +1867,7 @@ bool SfxObjectShell_Impl::hasTrustedScriptingSignature(
bool bAllowUIToAddAuthor
if ( aInfo.getLength() )
{
if ( nScriptingSignatureState == SignatureState::UNKNOWN )
- nScriptingSignatureState =
rDocShell.ImplCheckSignaturesInformation( aInfo );
+ nScriptingSignatureState =
SfxObjectShell::ImplCheckSignaturesInformation( aInfo );
if ( nScriptingSignatureState == SignatureState::OK
|| nScriptingSignatureState == SignatureState::NOTVALIDATED )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3de2dc3..6edaf11 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -981,7 +981,7 @@ bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium
&rMedium)
}
-bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium)
const
+bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium)
{
return !rMedium.GetFilter() || // Embedded
( rMedium.GetFilter()->UsesStorage() &&
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f84b8b2..1a161f3 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1082,7 +1082,7 @@ void SfxViewFrame::DoActivate( bool bUI )
SfxViewFrame *pFrame = GetParentViewFrame();
while ( pFrame )
{
- pFrame->m_pDispatcher->DoParentActivate_Impl();
+ SfxDispatcher::DoParentActivate_Impl();
pFrame = pFrame->GetParentViewFrame();
}
}
@@ -1101,7 +1101,7 @@ void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame*
pNewFrame )
while ( pFrame )
{
if ( !pNewFrame || !pNewFrame->GetFrame().IsParent(
&pFrame->GetFrame() ) )
- pFrame->m_pDispatcher->DoParentDeactivate_Impl();
+ SfxDispatcher::DoParentDeactivate_Impl();
pFrame = pFrame->GetParentViewFrame();
}
}
@@ -1555,7 +1555,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
The ParentViewFrame of the Containers ViewFrame in the internal InPlace
*/
//TODO/LATER: is it still necessary? is there a replacement for
GetParentViewFrame_Impl?
-SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const
+SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl()
{
return nullptr;
}
@@ -1700,7 +1700,7 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus )
{
SfxInPlaceClient *pCli =
GetViewShell()->GetUIActiveClient();
if ( ( !pCli || !pCli->IsObjectUIActive() ) &&
- ( !pCurrent || pCurrent->GetParentViewFrame_Impl()
!= this ) )
+ ( !pCurrent ||
SfxViewFrame::GetParentViewFrame_Impl() != this ) )
GetFrame().GrabFocusOnComponent_Impl();
}
}
@@ -2812,8 +2812,8 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
{
// Get the ContainerFrame, when internal InPlace.
SfxViewFrame *pFrame = this;
- if ( pFrame->GetParentViewFrame_Impl() )
- pFrame = pFrame->GetParentViewFrame_Impl();
+ if ( SfxViewFrame::GetParentViewFrame_Impl() )
+ pFrame = SfxViewFrame::GetParentViewFrame_Impl();
rSet.Put( SfxStringItem( nWhich,
pFrame->GetActualPresentationURL_Impl() ) );
break;
}
commit 5700899b13826f27be9c43fa9d7b5df786dd66df
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:03:30 2016 +0200
loplugin:staticmethods: svl
Change-Id: I5cadb5e19790a941c719253966bc65d54e2b60bd
diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index b5da86a..50be721 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -470,7 +470,7 @@ private:
@returns one of css::i18n::CalendarDisplayCode values
according to eCodeType and the check executed (or passed).
*/
- SVL_DLLPRIVATE sal_Int32 ImpUseMonthCase( int & io_nState, const
ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType ) const;
+ SVL_DLLPRIVATE static sal_Int32 ImpUseMonthCase( int & io_nState, const
ImpSvNumFor& rNumFor, NfKeywordIndex eCodeType );
/// Whether it's a (YY)YY-M(M)-D(D) format.
SVL_DLLPRIVATE bool ImpIsIso8601( const ImpSvNumFor& rNumFor );
@@ -542,7 +542,7 @@ private:
// check subcondition
// OP undefined => -1
// else 0 or 1
- SVL_DLLPRIVATE short ImpCheckCondition(double& fNumber,
+ SVL_DLLPRIVATE static short ImpCheckCondition(double& fNumber,
double& fLimit,
SvNumberformatLimitOps eOp);
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index bdeb74f..17583d4 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2893,7 +2893,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
// inspection of month name around that one, that would enable different month
// cases in one format. Though probably the most rare use case ever..
-sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor&
rNumFor, NfKeywordIndex eCodeType ) const
+sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor&
rNumFor, NfKeywordIndex eCodeType )
{
using namespace ::com::sun::star::i18n;
if (!io_nState)
commit 789280ef6450a3e484316ace55b082dfdb588f7c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 12:00:08 2016 +0200
loplugin:staticmethods: svtools
Change-Id: I0d44473c34131d7e843a40ade7261c0022104bfa
diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx
index f7a4019..653dda7 100644
--- a/include/svtools/apearcfg.hxx
+++ b/include/svtools/apearcfg.hxx
@@ -54,7 +54,7 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public
utl::ConfigItem
static bool bInitialized ;
- SVT_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
+ SVT_DLLPRIVATE static const css::uno::Sequence<OUString>&
GetPropertyNames();
virtual void ImplCommit() override;
public:
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 70e1b7f..606d0dd 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -218,7 +218,7 @@ private:
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
- SVT_DLLPRIVATE void ImplGetWeekFont( vcl::Font& rFont ) const;
+ SVT_DLLPRIVATE static void ImplGetWeekFont( vcl::Font& rFont );
SVT_DLLPRIVATE void ImplFormat();
using Window::ImplHitTest;
SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate )
const;
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 7649e13..653af7e 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -64,7 +64,7 @@ private:
ResMgr *pMgr;
ResMgr *pFreeMgr;
- SVT_DLLPRIVATE void GetClassString(sal_uLong lErrId, OUString &) const;
+ SVT_DLLPRIVATE static void GetClassString(sal_uLong lErrId, OUString &);
virtual bool CreateString( const ErrorInfo *, OUString &,
sal_uInt16 &) const override;
};
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 7a44153..fe850c9 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -50,7 +50,7 @@ private:
~StaticFormatter();
operator SvNumberFormatter* () { return GetFormatter(); }
- SVT_DLLPUBLIC SvNumberFormatter* GetFormatter();
+ SVT_DLLPUBLIC static SvNumberFormatter* GetFormatter();
};
protected:
diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index c1ce6de..1c5b0cd 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -671,7 +671,7 @@ private:
long nMin, long nMax, long nStart, long
nVirTop, long nVirBottom);
SVT_DLLPRIVATE void ImplDrawBorders(vcl::RenderContext& rRenderContext,
long nMin, long nMax, long nVirTop,
long nVirBottom);
- SVT_DLLPRIVATE void ImplDrawIndent(vcl::RenderContext& rRenderContext,
+ SVT_DLLPRIVATE static void ImplDrawIndent(vcl::RenderContext&
rRenderContext,
const tools::Polygon& rPoly, bool
bIsHit);
SVT_DLLPRIVATE void ImplDrawIndents(vcl::RenderContext& rRenderContext,
long nMin, long nMax, long nVirTop,
long nVirBottom);
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index d83deee..7bcc858 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -115,7 +115,7 @@ class SVT_DLLPUBLIC SvTreeList
* Invalidate the cached position data to have them re-generated before
* the next access.
*/
- SVT_DLLPRIVATE void SetListPositions( SvTreeListEntries& rEntries );
+ SVT_DLLPRIVATE static void SetListPositions( SvTreeListEntries& rEntries );
// rPos is not changed for SortModeNone
SVT_DLLPRIVATE void GetInsertionPos(
diff --git a/svtools/source/control/calendar.cxx
b/svtools/source/control/calendar.cxx
index 0ef2b5e..464a748 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -296,7 +296,7 @@ DayOfWeek Calendar::ImplGetWeekStart() const
return eDay;
}
-void Calendar::ImplGetWeekFont( vcl::Font& rFont ) const
+void Calendar::ImplGetWeekFont( vcl::Font& rFont )
{
// weeknumber is displayed in WEEKNUMBER_HEIGHT%-Fontheight
Size aFontSize = rFont.GetFontSize();
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 3534f50..3f6e282 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -249,7 +249,7 @@ struct ErrorResource_Impl : private Resource
};
-void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const
+void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr)
/* [Description]
commit 358d88d08bbbee155aaf9eeb49846f75cbead1c5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 11:59:50 2016 +0200
loplugin:staticmethods: svx
Change-Id: If03d9797fddd88662cf7d0ba2a70c2841983b37b
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d385b1f..c9a9f95 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -199,7 +199,7 @@ private:
SVX_DLLPRIVATE void Construct();
SVX_DLLPRIVATE void Reset();
- SVX_DLLPRIVATE bool LBSelectColor( ColorLB* pLb, const Color&
rColor );
+ SVX_DLLPRIVATE static bool LBSelectColor( ColorLB* pLb, const Color&
rColor );
SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn );
SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn =
nullptr );
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index ff26909..46e294f 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -41,8 +41,8 @@ private:
SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground);
SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext)
override;
SVX_DLLPRIVATE void Init ();
- SVX_DLLPRIVATE void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont);
- SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot,
SvxFont& rFont);
+ SVX_DLLPRIVATE static void SetFontSize(const SfxItemSet& rSet, sal_uInt16
nSlot, SvxFont& rFont);
+ SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16
nSlot, SvxFont& rFont);
public:
SvxFontPrevWindow(vcl::Window* pParent, const ResId&
rId);
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 6bf5ffb..d1abb8b 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -104,7 +104,7 @@ private:
return i;
return size_t(-1);
}
- SAL_DLLPRIVATE INetURLObject ImplGetURL( const GalleryObject* pObject )
const;
+ SAL_DLLPRIVATE static INetURLObject ImplGetURL( const GalleryObject*
pObject );
SAL_DLLPRIVATE INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind,
ConvertDataFormat nFormat = ConvertDataFormat::Unknown );
SAL_DLLPRIVATE void ImplSetModified( bool bModified );
SAL_DLLPRIVATE void ImplBroadcast( sal_uIntPtr nUpdatePos );
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 68053d4..c8601d0 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -215,8 +215,8 @@ private:
SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString,
Color*& rpColor );
- SVX_DLLPRIVATE void PosToCategory_Impl(sal_uInt16 nPos, short& rCategory)
const;
- SVX_DLLPRIVATE void CategoryToPos_Impl(short nCategory, sal_uInt16& rPos)
const;
+ SVX_DLLPRIVATE static void PosToCategory_Impl(sal_uInt16 nPos, short&
rCategory);
+ SVX_DLLPRIVATE static void CategoryToPos_Impl(short nCategory, sal_uInt16&
rPos);
};
#endif
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 0a001b0..553237d 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -260,7 +260,7 @@ private:
// help functions
SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol);
- SVX_DLLPRIVATE Color GetLuminance(const Color& rCol);
+ SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol);
SVX_DLLPRIVATE void CallColorChangeLink();
public:
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 6bbdbb8..5cca473 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -66,11 +66,11 @@ private:
private:
SVX_DLLPRIVATE void ImpGetCaptParams(ImpCaptParams& rPara) const;
- SVX_DLLPRIVATE void ImpCalcTail1(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail2(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail3(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail4(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect) const;
- SVX_DLLPRIVATE void ImpCalcTail (const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect) const;
+ SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail4(const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect);
+ SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara,
tools::Polygon& rPoly, Rectangle& rRect);
SVX_DLLPRIVATE void ImpRecalcTail();
public:
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index a713586..fc64086 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -56,7 +56,7 @@ protected:
long nEndAngle;
private:
SVX_DLLPRIVATE basegfx::B2DPolygon ImpCalcXPolyCirc(const SdrObjKind
eKind, const Rectangle& rRect1, long nStart, long nEnd) const;
- SVX_DLLPRIVATE void ImpSetCreateParams(SdrDragStat& rStat) const;
+ SVX_DLLPRIVATE static void ImpSetCreateParams(SdrDragStat& rStat);
SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // copy values from pool
SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // copy values into pool
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 64b8e49..c2d9922 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -63,7 +63,7 @@ private:
SvXMLGraphicHelperMode meCreateMode;
bool mbDirect;
- SVX_DLLPRIVATE bool ImplGetStreamNames( const OUString&
rURLStr,
+ SVX_DLLPRIVATE static bool ImplGetStreamNames( const OUString&
rURLStr,
OUString&
rPictureStorageName,
OUString&
rPictureStreamName );
SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage >
@@ -71,7 +71,7 @@ private:
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl
ImplGetGraphicStream( const
OUString& rPictureStorageName,
const OUString&
rPictureStreamName );
- SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const
OUString& rFileName ) const;
+ SVX_DLLPRIVATE static OUString ImplGetGraphicMimeType( const
OUString& rFileName );
SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString&
rPictureStorageName,
const OUString&
rPictureStreamName );
SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString&
rPictureStorageName,
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index b7dcb07..1acfbfd 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -77,7 +77,7 @@ namespace svxform
}
- OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
+ OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId )
{
OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId ==
SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 45969cb..4829fb3 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -226,7 +226,7 @@ const GalleryObject* GalleryTheme::ImplGetGalleryObject(
const INetURLObject& rU
return nullptr;
}
-INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
+INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject )
{
INetURLObject aURL;
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 075e4e0..9887404 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -44,8 +44,8 @@ namespace svxform
/** retrieves the URI for the toolbox associated with the given slot,
depending
on the type of our document
*/
- SVX_DLLPUBLIC OUString
- getToolboxResourceName( sal_uInt16 _nSlotId ) const;
+ SVX_DLLPUBLIC static OUString
+ getToolboxResourceName( sal_uInt16 _nSlotId );
/** toggles the toolbox associated with the given slot
*/
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 150a904..aba7875 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1154,7 +1154,7 @@ bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey )
}
// Konvertierungs-Routinen:
-void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short&
rCategory) const
+void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short&
rCategory)
{
// Kategorie css::form-Positionen abbilden (->Resource)
switch ( nPos )
@@ -1174,7 +1174,7 @@ void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16
nPos, short& rCategory)
}
}
-void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16&
rPos) const
+void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16&
rPos)
{
// Kategorie auf css::form-Positionen abbilden (->Resource)
switch ( nCategory )
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index d660e87..0a032ed 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -449,7 +449,7 @@ void SdrCaptionObj::ImpRecalcTail()
// tail end pos for SdrCaptionType::Type1. This sure was the simplest method
// to achieve this, at the cost of making a whole group of const methods
// of this object implicitly change the object's position.
-void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect) const
+void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect)
{
tools::Polygon aPol(2);
Point aTl(rPoly[0]);
@@ -475,7 +475,7 @@ void SdrCaptionObj::ImpCalcTail1(const ImpCaptParams&
rPara, tools::Polygon& rPo
rPoly = aPol;
}
-void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect) const
+void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect)
{ // Gap/EscDir/EscPos/Angle
tools::Polygon aPol(2);
Point aTl(rPoly[0]);
@@ -492,7 +492,7 @@ void SdrCaptionObj::ImpCalcTail2(const ImpCaptParams&
rPara, tools::Polygon& rPo
rPoly=aPol;
}
-void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect) const
+void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect)
{ // Gap/EscDir/EscPos/Angle/LineLen
tools::Polygon aPol(3);
Point aTl(rPoly[0]);
@@ -525,12 +525,12 @@ void SdrCaptionObj::ImpCalcTail3(const ImpCaptParams&
rPara, tools::Polygon& rPo
rPoly=aPol;
}
-void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect) const
+void SdrCaptionObj::ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect)
{
ImpCalcTail3(rPara,rPoly,rRect);
}
-void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect) const
+void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, tools::Polygon&
rPoly, Rectangle& rRect)
{
switch (rPara.eType) {
case SdrCaptionType::Type1: ImpCalcTail1(rPara,rPoly,rRect); break;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index e00783e..e4b3a01d 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -663,7 +663,7 @@ void ImpCircUser::SetCreateParams(SdrDragStat& rStat)
} else aP2=aCenter;
}
-void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const
+void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat)
{
ImpCircUser* pU=static_cast<ImpCircUser*>(rStat.GetUser());
if (pU==nullptr) {
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 81bad8f..72f4a15 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -195,7 +195,7 @@ protected:
SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override;
SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem)
override;
- SVX_DLLPRIVATE css::uno::Any GetAnyForItem( SfxItemSet& aSet, const
SfxItemPropertySimpleEntry* pMap );
+ SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet& aSet, const
SfxItemPropertySimpleEntry* pMap );
private:
SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject*
pOutlinerParaObject ) throw(css::uno::RuntimeException);
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 22df739..6ac0f44 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -458,7 +458,7 @@ SvxGraphicHelperStream_Impl
SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
return aRet;
}
-OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName
) const
+OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName
)
{
struct XMLGraphicMimeTypeMapper
{
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 0b7cf51..e7a7962 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -521,7 +521,7 @@ SvxXMLBitmapEntryExporter::~SvxXMLBitmapEntryExporter()
void SvxXMLBitmapEntryExporter::exportEntry( const OUString& rStrName, const
Any& rValue )
{
- maImageStyle.exportXML( rStrName, rValue, mrExport );
+ XMLImageStyle::exportXML( rStrName, rValue, mrExport );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 2307e69..186b00c 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -301,7 +301,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16
nPrfx, const OUString& r
try
{
XMLImageStyle aImageStyle;
- aImageStyle.importXML( xAttrList, rAny, rName, GetImport() );
+ XMLImageStyle::importXML( xAttrList, rAny, rName, GetImport() );
}
catch (const Exception&)
{
commit b9589f237b5d74f8b70f9478a5c04285b6fcfc5a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 11:59:30 2016 +0200
loplugin:staticmethods: unotools
Change-Id: I99debf2434c72cf4f5d0859dfd7a40ae331c65ab
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 3ac9709..60a933d 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -140,9 +140,7 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry
class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options
{
// returns static object
- UNOTOOLS_DLLPRIVATE SvtLinguConfigItem & GetConfigItem();
-
- SvtLinguConfigItem & GetConfigItem() const { return const_cast<
SvtLinguConfig * >( this )->GetConfigItem(); }
+ UNOTOOLS_DLLPRIVATE static SvtLinguConfigItem & GetConfigItem();
// configuration update access for the 'Linguistic' main node
mutable css::uno::Reference< css::util::XChangesBatch >
m_xMainUpdateAccess;
commit f1cb6a031e5ba3fbdfb722175d82f48ee1e6067f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 11:58:44 2016 +0200
loplugin:staticmethods: sw
Change-Id: I2b06eb926ebc8ab04883da3272ea239a12e09436
diff --git a/compilerplugins/clang/staticmethods.cxx
b/compilerplugins/clang/staticmethods.cxx
index 8727026..c92eef4 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -195,7 +195,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const
CXXMethodDecl * pCXXMethodDecl)
|| (fdc.Function("Read_F_Shape").Class("SwWW8ImplReader")
.GlobalNamespace())
|| (fdc.Function("Read_Majority").Class("SwWW8ImplReader")
- .GlobalNamespace()))
+ .GlobalNamespace())
+ || fdc.Function("Ignore").Class("SwWrtShell").GlobalNamespace())
{
return true;
}
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index a4e2b65..79bb65d 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -223,15 +223,15 @@ private:
SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow =
nullptr, bool* pbCol = nullptr ) const;
// 0 == not in any column.
- SAL_DLLPRIVATE sal_uInt16 GetCurColNum_( const SwFrame *pFrame,
- SwGetCurColNumPara* pPara ) const;
+ SAL_DLLPRIVATE static sal_uInt16 GetCurColNum_( const SwFrame *pFrame,
+ SwGetCurColNumPara* pPara );
- SAL_DLLPRIVATE void GetTabCols_( SwTabCols &rToFill, const SwFrame *pBox )
const;
- SAL_DLLPRIVATE void GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox )
const;
+ SAL_DLLPRIVATE static void GetTabCols_( SwTabCols &rToFill, const SwFrame
*pBox );
+ SAL_DLLPRIVATE static void GetTabRows_( SwTabCols &rToFill, const SwFrame
*pBox );
SAL_DLLPRIVATE bool ImpEndCreate();
- SAL_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
+ SAL_DLLPRIVATE static ObjCntType GetObjCntType( const SdrObject& rObj );
/// Methods for copying of draw objects.
SAL_DLLPRIVATE bool CopyDrawSel( SwFEShell* pDestShell, const Point&
rSttPt,
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index ae5646b..c78fc49 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1611,7 +1611,7 @@ const SwFrameFormat* SwFEShell::GetFormatFromAnyObj(
const Point& rPt ) const
return pRet;
}
-ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj ) const
+ObjCntType SwFEShell::GetObjCntType( const SdrObject& rObj )
{
ObjCntType eType = OBJCNT_NONE;
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 88b9ce6..ae41921 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -518,7 +518,7 @@ bool SwFEShell::SplitTab( bool bVert, sal_uInt16 nCnt, bool
bSameHeight )
return bRet;
}
-void SwFEShell::GetTabCols_( SwTabCols &rToFill, const SwFrame *pBox ) const
+void SwFEShell::GetTabCols_( SwTabCols &rToFill, const SwFrame *pBox )
{
const SwTabFrame *pTab = pBox->FindTabFrame();
if ( pLastCols )
@@ -582,7 +582,7 @@ void SwFEShell::GetTabCols_( SwTabCols &rToFill, const
SwFrame *pBox ) const
}
}
-void SwFEShell::GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox ) const
+void SwFEShell::GetTabRows_( SwTabCols &rToFill, const SwFrame *pBox )
{
const SwTabFrame *pTab = pBox->FindTabFrame();
if ( pLastRows )
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index e5cbd3b..9d206c1 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -602,7 +602,7 @@ bool SwFEShell::IsColRightToLeft() const
}
sal_uInt16 SwFEShell::GetCurColNum_( const SwFrame *pFrame,
- SwGetCurColNumPara* pPara ) const
+ SwGetCurColNumPara* pPara )
{
sal_uInt16 nRet = 0;
while ( pFrame )
diff --git a/sw/source/uibase/inc/dbconfig.hxx
b/sw/source/uibase/inc/dbconfig.hxx
index a04b32f..33fedf1 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.hxx
@@ -27,7 +27,7 @@ struct SwDBData;
class SW_DLLPUBLIC SwDBConfig : public utl::ConfigItem
{
private:
- SAL_DLLPRIVATE const css::uno::Sequence<OUString>& GetPropertyNames();
+ SAL_DLLPRIVATE static const css::uno::Sequence<OUString>&
GetPropertyNames();
virtual void ImplCommit() override;
SwDBData* pAdrImpl;
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index 2a03d56..72e113b 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -58,7 +58,7 @@ class SW_DLLPUBLIC SwStdFontConfig : public utl::ConfigItem
OUString sDefaultFonts[DEF_FONT_COUNT];
sal_Int32 nDefaultFontHeight[DEF_FONT_COUNT];
- SAL_DLLPRIVATE css::uno::Sequence<OUString> GetPropertyNames();
+ SAL_DLLPRIVATE static css::uno::Sequence<OUString> GetPropertyNames();
void ChangeString(sal_uInt16 nFontType, const OUString& rSet)
{
diff --git a/sw/source/uibase/inc/numfmtlb.hxx
b/sw/source/uibase/inc/numfmtlb.hxx
index d5c69e6..68e2423 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -40,7 +40,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
DECL_DLLPRIVATE_LINK( SelectHdl, ListBox&, void );
- SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const;
+ SAL_DLLPRIVATE static double GetDefValue(const short nFormatType);
SAL_DLLPRIVATE void Init();
SAL_DLLPRIVATE SwView* GetView();
diff --git a/sw/source/uibase/inc/prcntfld.hxx
b/sw/source/uibase/inc/prcntfld.hxx
index 9255b23..9476ff3 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -40,7 +40,7 @@ class SW_DLLPUBLIC PercentField
bool bLockAutoCalculation; //prevent recalcution of percent values when the
//reference value is changed
- SAL_DLLPRIVATE sal_Int64 ImpPower10(sal_uInt16 n);
+ SAL_DLLPRIVATE static sal_Int64 ImpPower10(sal_uInt16 n);
public:
diff --git a/sw/source/uibase/inc/redlndlg.hxx
b/sw/source/uibase/inc/redlndlg.hxx
index ddd7f00..0adca71 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -109,10 +109,10 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
SAL_DLLPRIVATE void RemoveParents(sal_uInt16 nStart, sal_uInt16
nEnd);
SAL_DLLPRIVATE void InitAuthors();
- SAL_DLLPRIVATE OUString GetRedlineText(const SwRangeRedline& rRedln,
DateTime &rDateTime, sal_uInt16 nStack = 0);
+ SAL_DLLPRIVATE static OUString GetRedlineText(const SwRangeRedline&
rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0);
SAL_DLLPRIVATE Image GetActionImage(const SwRangeRedline& rRedln,
sal_uInt16 nStack = 0);
SAL_DLLPRIVATE OUString GetActionText(const SwRangeRedline& rRedln,
sal_uInt16 nStack = 0);
- SAL_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry)
const;
+ SAL_DLLPRIVATE static sal_uInt16 GetRedlinePos( const SvTreeListEntry&
rEntry);
SwRedlineAcceptDlg(SwRedlineAcceptDlg const&) = delete;
SwRedlineAcceptDlg& operator=(SwRedlineAcceptDlg const&) = delete;
diff --git a/sw/source/uibase/misc/redlndlg.cxx
b/sw/source/uibase/misc/redlndlg.cxx
index 0da1e18..dc70813 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -876,7 +876,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect,
bool bAccept )
m_pTPView->EnableUndo();
}
-sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry )
const
+sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry )
{
SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr();
return pSh->FindRedlineOfData(
*static_cast<SwRedlineDataParent*>(static_cast<RedlinData *>(
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx
b/sw/source/uibase/utlui/numfmtlb.cxx
index cd69de7..5ecdbd8 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -436,7 +436,7 @@ IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox,
void )
}
}
-double NumFormatListBox::GetDefValue(const short nFormatType) const
+double NumFormatListBox::GetDefValue(const short nFormatType)
{
SvxNumValCategory nDefValue = SvxNumValCategory::Standard;
commit cb2b7a951ba447796611eaf411842ef9572a3d6c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 11:57:50 2016 +0200
loplugin:staticmethods: vcl
Change-Id: I9a563100400375cd185729282b3e4f1ff3a44151
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 13f3df1..22cf1675 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -730,7 +730,7 @@ public:
SAL_DLLPRIVATE bool ImplSeparableBlurFilter( const double aRadius );
SAL_DLLPRIVATE bool ImplSeparableUnsharpenFilter( const double aRadius
);
SAL_DLLPRIVATE bool ImplDuotoneFilter( const sal_uLong nColorOne,
sal_uLong nColorTwo );
- SAL_DLLPRIVATE void ImplBlurContributions(
+ SAL_DLLPRIVATE static void ImplBlurContributions(
const int aSize,
const int aNumberOfContributions,
double* pBlurVector,
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 3610370..f6e05f4 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -122,7 +122,7 @@ protected:
bool mbIsActive;
SAL_DLLPRIVATE void ImplInitPushButtonData();
- SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window*
pPrevWindow, WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window*
pPrevWindow, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
SAL_DLLPRIVATE void ImplDrawPushButtonContent(OutputDevice*
pDev, DrawFlags nDrawFlags,
const Rectangle&
rRect, bool bMenuBtnSep);
@@ -407,7 +407,7 @@ private:
// to the left or right ( depending on RTL or LTR settings )
bool mbLegacyNoTextAlign;
SAL_DLLPRIVATE void ImplInitCheckBoxData();
- SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow,
WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( const vcl::Window*
pPrevWindow, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags
nDrawFlags,
const Point& rPos, const Size& rSize,
diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 81d1b90..e67a4e2 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -42,7 +42,7 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplCalcEditHeight();
SAL_DLLPRIVATE long getMaxWidthScrollBarAndDownButton() const;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 8bc6b2b..5aaa9f7 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -108,7 +108,7 @@ private:
SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection,
sal_uInt8 nDirection, sal_uInt8 nMode );
SAL_DLLPRIVATE void ImplSetText( const OUString& rStr, const
Selection* pNewSelection );
SAL_DLLPRIVATE void ImplInsertText( const OUString& rStr, const
Selection* pNewSelection = nullptr, bool bIsUserInput = false );
- SAL_DLLPRIVATE OUString ImplGetValidString( const OUString& rString )
const;
+ SAL_DLLPRIVATE static OUString ImplGetValidString( const OUString& rString
);
SAL_DLLPRIVATE void ImplClearBackground(vcl::RenderContext&
rRenderContext, const Rectangle& rRectangle, long nXStart, long nXEnd);
SAL_DLLPRIVATE void ImplPaintBorder(vcl::RenderContext&
rRenderContext, long nXStart, long nXEnd);
SAL_DLLPRIVATE void ImplShowCursor( bool bOnlyIfVisible = true );
@@ -124,14 +124,14 @@ private:
SAL_DLLPRIVATE void
ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard>&
rxClipboard);
SAL_DLLPRIVATE long ImplGetTextYPosition() const;
SAL_DLLPRIVATE
css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > const &
ImplGetInputSequenceChecker();
- SAL_DLLPRIVATE css::uno::Reference<css::i18n::XBreakIterator >
ImplGetBreakIterator() const;
+ SAL_DLLPRIVATE static css::uno::Reference<css::i18n::XBreakIterator >
ImplGetBreakIterator();
SAL_DLLPRIVATE void filterText();
protected:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle
);
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection,
bool bPaint = true );
SAL_DLLPRIVATE ControlType ImplGetNativeControlType() const;
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 4209054..93dafda 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -40,7 +40,7 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
const Point& rPos, const Size& rSize, bool
bFillLayout = false ) const;
public:
@@ -95,7 +95,7 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
protected:
@@ -127,7 +127,7 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
const Point& rPos, const Size& rSize );
@@ -156,7 +156,7 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
protected:
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 882f6fb..f0ac2ac 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -85,13 +85,13 @@ private:
SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc
pFncCol, const void* pColParam,
BmpExchangeFnc
pFncBmp, const void* pBmpParam );
- SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt,
const Point& rRotatePt,
+ SAL_DLLPRIVATE static Point ImplGetRotatedPoint( const Point& rPt,
const Point& rRotatePt,
const Size&
rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE tools::Polygon ImplGetRotatedPolygon( const
tools::Polygon& rPoly, const Point& rRotatePt,
+ SAL_DLLPRIVATE static tools::Polygon ImplGetRotatedPolygon( const
tools::Polygon& rPoly, const Point& rRotatePt,
const Size&
rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE tools::PolyPolygon ImplGetRotatedPolyPolygon( const
tools::PolyPolygon& rPoly, const Point& rRotatePt,
+ SAL_DLLPRIVATE static tools::PolyPolygon ImplGetRotatedPolyPolygon( const
tools::PolyPolygon& rPoly, const Point& rRotatePt,
const Size&
rOffset, double fSin, double fCos );
- SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf,
+ SAL_DLLPRIVATE static void ImplAddGradientEx( GDIMetaFile& rMtf,
const OutputDevice&
rMapDev,
const
tools::PolyPolygon& rPolyPoly,
const Gradient&
rGrad );
diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx
index a66b134..3c68a4c 100644
--- a/include/vcl/group.hxx
+++ b/include/vcl/group.hxx
@@ -31,7 +31,7 @@ private:
using Control::ImplInitSettings;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground,
bool bBackground );
SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
const Point& rPos, const Size& rSize,
bool bLayout = false );
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index f4ae404..3133304 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -106,7 +106,7 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
+ SAL_DLLPRIVATE static WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
bool IsDropDownBox() const { return mpFloatWin != nullptr; }
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 38681ab..684c2a8 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -196,7 +196,7 @@ protected:
// returns native submenu arrow size and spacing from right border
// return value is whether it's supported natively
- SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize(vcl::RenderContext&
rRenderContext, Size& rArrowSize, long& rArrowSpacing) const;
+ SAL_DLLPRIVATE static bool
ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext, Size&
rArrowSize, long& rArrowSpacing);
SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel );
SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel );
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index 9d5fa19..a3aa33e 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -57,8 +57,8 @@ private:
css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass;
protected:
- SAL_DLLPRIVATE sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c );
- SAL_DLLPRIVATE sal_Unicode ImplFindMnemonic( const OUString& rKey );
+ SAL_DLLPRIVATE static sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c );
+ SAL_DLLPRIVATE static sal_Unicode ImplFindMnemonic( const OUString& rKey );
public:
MnemonicGenerator();
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9ccfb67..7342f52 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1170,7 +1170,7 @@ private:
SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& );
SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY,
long nX, long nY, long nWidth, long nHeight );
- SAL_DLLPRIVATE void ImplDrawWavePixel( long nOriginX, long
nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics,
OutputDevice* pOutDev,
+ SAL_DLLPRIVATE static void ImplDrawWavePixel( long nOriginX, long
nOriginY, long nCurX, long nCurY, short nOrientation, SalGraphics* pGraphics,
OutputDevice* pOutDev,
bool bDrawPixAsRect, long
nPixWidth, long nPixHeight );
SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY,
long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short
nOrientation, const Color& rColor );
SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long
nBaseY, long nX, long nY, long nWidth, FontLineStyle eTextLine, Color aColor,
bool bIsAbove );
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 2bacd58..2be7030 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -110,7 +110,7 @@ private:
static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow,
ImplSplitSet* pSet, bool bHide,
bool bRows, bool bDown = true );
SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext,
ImplSplitSet* pSet );
- SAL_DLLPRIVATE void ImplDrawBack(vcl::RenderContext& rRenderContext, const
Rectangle& rRect,
+ SAL_DLLPRIVATE static void ImplDrawBack(vcl::RenderContext&
rRenderContext, const Rectangle& rRect,
const Wallpaper* pWall, const
Bitmap* pBitmap );
static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const
Point& rPos,
long& rMouseOff,
ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos,
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index fe3fa39..f1ad481 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -227,7 +227,7 @@ public:
SAL_DLLPRIVATE void ImplDrawGradientBackground(vcl::RenderContext&
rRenderContext, ImplDockingWindowWrapper *pWrapper);
SAL_DLLPRIVATE bool ImplDrawNativeBackground(vcl::RenderContext&
rRenderContext, const vcl::Region &rRegion);
SAL_DLLPRIVATE void ImplDrawTransparentBackground(vcl::RenderContext&
rRenderContext, const vcl::Region &rRegion);
- SAL_DLLPRIVATE void ImplDrawConstantBackground(vcl::RenderContext&
rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode);
+ SAL_DLLPRIVATE static void ImplDrawConstantBackground(vcl::RenderContext&
rRenderContext, const vcl::Region &rRegion, bool bIsInPopupMode);
SAL_DLLPRIVATE void ImplDrawBackground(vcl::RenderContext& rRenderContext,
const Rectangle &rRect);
SAL_DLLPRIVATE void ImplErase(vcl::RenderContext& rRenderContext, const
Rectangle &rRect, bool bHighlight, bool bHasOpenPopup = false );
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index bfcd72f..ac1d3d2 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -59,7 +59,7 @@ public:
private:
ImplType mpImplWallpaper;
- SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const;
+ SAL_DLLPRIVATE static Gradient ImplGetApplicationGradient();
public:
Wallpaper();
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7de1c77..9b36a55 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -650,7 +650,7 @@ private:
SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const;
- SAL_DLLPRIVATE void ImplCallFocusChangeActivate(
vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow );
+ SAL_DLLPRIVATE static void ImplCallFocusChangeActivate(
vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow );
SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow();
SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const;
@@ -738,7 +738,7 @@ private:
SAL_DLLPRIVATE void
ImplCallActivateListeners(vcl::Window*);
SAL_DLLPRIVATE void
ImplCallDeactivateListeners(vcl::Window*);
- SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl,
long nX, ScrollBar* pVScrl, long nY );
+ SAL_DLLPRIVATE static void ImplHandleScroll( ScrollBar* pHScrl,
long nX, ScrollBar* pVScrl, long nY );
SAL_DLLPRIVATE Rectangle
ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const;
SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX();
diff --git a/vcl/inc/svmconverter.hxx b/vcl/inc/svmconverter.hxx
index 0372e16..a8ae99e 100644
--- a/vcl/inc/svmconverter.hxx
+++ b/vcl/inc/svmconverter.hxx
@@ -78,7 +78,7 @@
class VCL_PLUGIN_PUBLIC SVMConverter
{
private:
- SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf );
+ SAL_DLLPRIVATE static void ImplConvertFromSVM1( SvStream& rIStm,
GDIMetaFile& rMtf );
SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm,
GDIMetaFile& rMtf );
SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm,
GDIMetaFile& rMtf,
VirtualDevice& rSaveVDev, bool&
rRop_0_1,
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a090d9f..dbb6a76 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -768,7 +768,7 @@ void Edit::ImplDelete( const Selection& rSelection,
sal_uInt8 nDirection, sal_uI
mbInternModified = true;
}
-OUString Edit::ImplGetValidString( const OUString& rString ) const
+OUString Edit::ImplGetValidString( const OUString& rString )
{
OUString aValidString( rString );
aValidString = aValidString.replaceAll("\n", "").replaceAll("\r", "");
@@ -776,7 +776,7 @@ OUString Edit::ImplGetValidString( const OUString& rString
) const
return aValidString;
}
-uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const
+uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator()
{
//!! since we don't want to become incompatible in the next minor update
//!! where this code will get integrated into, xISC will be a local
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 291e9fe..30cba89 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -325,7 +325,7 @@ bool Wallpaper::IsGradient() const
return (mpImplWallpaper->mpGradient != nullptr);
}
-Gradient Wallpaper::ImplGetApplicationGradient() const
+Gradient Wallpaper::ImplGetApplicationGradient()
{
Gradient g;
g.SetAngle( 900 );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a13bc63..bb2f60d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1386,7 +1386,7 @@ Size
Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, lo
return Size(std::max(nCheckWidth, nRadioWidth), std::max(rCheckHeight,
rRadioHeight));
}
-bool Menu::ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext,
Size& rArrowSize, long& rArrowSpacing) const
+bool Menu::ImplGetNativeSubmenuArrowSize(vcl::RenderContext& rRenderContext,
Size& rArrowSize, long& rArrowSpacing)
{
ImplControlValue aVal;
Rectangle aNativeBounds;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 440de8c..72dc107 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5703,6 +5703,8 @@ void ToolBox::ImplDisableFlatButtons()
}
if( bValue )
mnOutStyle &= ~TOOLBOX_STYLE_FLAT;
+#else
+ (void) this; // loplugin:staticmethods
#endif
}
commit 51e472296b42ea27532c80f68ed741ce204e1e59
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 7 11:57:40 2016 +0200
loplugin:staticmethods: xmloff
Change-Id: Iad001ce011cd6aff4af9bb2e9129abee7fb935dc
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 62becb8..2fd3f01 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -37,14 +37,14 @@ public:
XMLImageStyle();
~XMLImageStyle();
- void exportXML( const OUString& rStrName, const css::uno::Any& rValue,
SvXMLExport& rExport );
- void importXML( const css::uno::Reference< css::xml::sax::XAttributeList
>& xAttrList, css::uno::Any& rValue, OUString& rStrName, SvXMLImport& rImport );
+ static void exportXML( const OUString& rStrName, const css::uno::Any&
rValue, SvXMLExport& rExport );
+ static void importXML( const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString&
rStrName, SvXMLImport& rImport );
private:
- SAL_DLLPRIVATE void ImpExportXML( const OUString& rStrName, const
css::uno::Any& rValue,
+ SAL_DLLPRIVATE static void ImpExportXML( const OUString& rStrName, const
css::uno::Any& rValue,
SvXMLExport& rExport );
- SAL_DLLPRIVATE bool ImpImportXML( const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList,
+ SAL_DLLPRIVATE static bool ImpImportXML( const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList,
css::uno::Any& rValue, OUString& rStrName,
SvXMLImport& rImport );
};
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
