diff options
author | Wastack <btomi96@gmail.com> | 2016-03-31 08:48:33 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 06:46:47 +0000 |
commit | 84fd42c1f58627f3e03ee6062fa2812a4890d941 (patch) | |
tree | 3efa54d897e832904b5441654b7c6f4fe24faebc | |
parent | tdf#97966 Drop 'static' keywords (diff) | |
download | core-84fd42c1f58627f3e03ee6062fa2812a4890d941.tar.gz core-84fd42c1f58627f3e03ee6062fa2812a4890d941.zip |
tdf#97966 Drop 'static' keywords
Including no keywords from extern "C" blocks
Change-Id: I7769c9d2a131d7389ef6ab08c0fbd12bc624778c
Reviewed-on: https://gerrit.libreoffice.org/23678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r-- | uui/source/iahndl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 10 | ||||
-rw-r--r-- | vcl/source/control/imp_listbox.cxx | 4 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 10 | ||||
-rw-r--r-- | vcl/source/filter/wmf/enhwmf.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 4 | ||||
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtimppr.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtparae.cxx | 4 |
18 files changed, 42 insertions, 42 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 762535349cd0..c8e0601fa034 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -300,7 +300,7 @@ UUIInteractionHelper::tryOtherInteractionHandler( namespace { - static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) + bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) { const css::uno::TypeDescription aTypeDesc( i_rTypeName ); const typelib_TypeDescription* pTypeDesc = aTypeDesc.get(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 75565c5be564..849f2f05f1ad 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -51,7 +51,7 @@ namespace #define FORMAT_METRIC 2 #define FORMAT_CURRENCY 3 -static sal_Int64 ImplPower10( sal_uInt16 n ) +sal_Int64 ImplPower10( sal_uInt16 n ) { sal_uInt16 i; sal_Int64 nValue = 1; @@ -62,7 +62,7 @@ static sal_Int64 ImplPower10( sal_uInt16 n ) return nValue; } -static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, +bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, bool bStrictFormat, bool bThousandSep, const LocaleDataWrapper& rLocaleDataWrappper ) { @@ -85,7 +85,7 @@ static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, } } -static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, +bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrappper, bool bCurrency = false ) { @@ -293,7 +293,7 @@ static bool ImplNumericGetValue( const OUString& rStr, sal_Int64& rValue, return true; } -static void ImplUpdateSeparatorString( OUString& io_rText, +void ImplUpdateSeparatorString( OUString& io_rText, const OUString& rOldDecSep, const OUString& rNewDecSep, const OUString& rOldThSep, const OUString& rNewThSep ) { @@ -329,7 +329,7 @@ static void ImplUpdateSeparatorString( OUString& io_rText, io_rText = aBuf.makeStringAndClear(); } -static void ImplUpdateSeparators( const OUString& rOldDecSep, const OUString& rNewDecSep, +void ImplUpdateSeparators( const OUString& rOldDecSep, const OUString& rNewDecSep, const OUString& rOldThSep, const OUString& rNewThSep, Edit* pEdit ) { diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 19835250a3f9..65a359ae7041 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -1635,7 +1635,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) namespace { - static vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) + vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_Int32 _nPos, OUString& _out_entryText ) { OSL_PRECOND( ( _nPos != LISTBOX_ENTRY_NOTFOUND ), "lcl_getEntry: invalid position!" ); sal_Int32 nEntryCount( _rList.GetEntryCount() ); @@ -1648,7 +1648,7 @@ namespace return reinterpret_cast< vcl::StringEntryIdentifier >( _nPos + 1 ); } - static sal_Int32 lcl_getEntryPos( vcl::StringEntryIdentifier _entry ) + sal_Int32 lcl_getEntryPos( vcl::StringEntryIdentifier _entry ) { // our pos is 0-based, but StringEntryIdentifier does not allow for a NULL return static_cast< sal_Int32 >( reinterpret_cast< sal_Int64 >( _entry ) ) - 1; diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 3e7c1f0ccf0a..d58bd1955f9f 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -38,7 +38,7 @@ namespace #define FORMAT_LONGCURRENCY 4 -static BigInt ImplPower10( sal_uInt16 n ) +BigInt ImplPower10( sal_uInt16 n ) { sal_uInt16 i; BigInt nValue = 1; @@ -49,7 +49,7 @@ static BigInt ImplPower10( sal_uInt16 n ) return nValue; } -static OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const BigInt &rNumber, sal_uInt16 nDigits, const OUString& rCurrSymbol, bool bShowThousandSep ) +OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const BigInt &rNumber, sal_uInt16 nDigits, const OUString& rCurrSymbol, bool bShowThousandSep ) { DBG_ASSERT( nDigits < 10, "LongCurrency may only have 9 decimal places" ); @@ -97,7 +97,7 @@ static OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const return aTemplate.makeStringAndClear(); } -static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, +bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, bool bStrictFormat, bool bThousandSep, const LocaleDataWrapper& rLocaleDataWrapper ) { @@ -120,7 +120,7 @@ static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, } } -static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, +bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, bool bCurrency = false ) { @@ -244,7 +244,7 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, return true; } -static bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, +bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, bool, bool bUseThousandSep, const LocaleDataWrapper& rLocaleDataWrapper ) { // There's no StrictFormat that makes sense here, thus allow all chars diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 15845a0bd1b3..1a0e7def2de7 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -361,7 +361,7 @@ SvStream& operator>>(SvStream& rInStream, XForm& rXForm) return rInStream; } -static bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) +bool ImplReadRegion( tools::PolyPolygon& rPolyPoly, SvStream& rStream, sal_uInt32 nLen ) { if (nLen == 0) return false; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 0509015c1428..725605348e32 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -49,14 +49,14 @@ int nImplSysDialog = 0; namespace { - static Paper ImplGetPaperFormat( long nWidth100thMM, long nHeight100thMM ) + Paper ImplGetPaperFormat( long nWidth100thMM, long nHeight100thMM ) { PaperInfo aInfo(nWidth100thMM, nHeight100thMM); aInfo.doSloppyFit(); return aInfo.getPaper(); } - static const PaperInfo& ImplGetEmptyPaper() + const PaperInfo& ImplGetEmptyPaper() { static PaperInfo aInfo(PAPER_USER); return aInfo; diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index 4c616d752987..e7dfc0f495f0 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -53,12 +53,12 @@ using namespace css; namespace { -static OUString createPath(OUString const & name, sal_Int32 pos, OUString const & locale) +OUString createPath(OUString const & name, sal_Int32 pos, OUString const & locale) { return name.copy(0, pos + 1) + locale + name.copy(pos); } -static std::shared_ptr<SvStream> wrapStream(css::uno::Reference< css::io::XInputStream > const & stream) +std::shared_ptr<SvStream> wrapStream(css::uno::Reference< css::io::XInputStream > const & stream) { // This could use SvInputStream instead if that did not have a broken // SeekPos implementation for an XInputStream that is not also XSeekable @@ -79,7 +79,7 @@ static std::shared_ptr<SvStream> wrapStream(css::uno::Reference< css::io::XInput return s; } -static void loadImageFromStream(std::shared_ptr<SvStream> xStream, OUString const & rPath, BitmapEx & rBitmap) +void loadImageFromStream(std::shared_ptr<SvStream> xStream, OUString const & rPath, BitmapEx & rBitmap) { if (rPath.endsWith(".png")) { diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 94cd082b7ed2..d7ea498c6982 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2240,7 +2240,7 @@ Size ToolBox::ImplGetOptimalFloatingSize() namespace { -static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems ) +void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems ) { bool bLastSep( true ); std::vector< ImplToolItem >::iterator it; diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 8bccc020b92a..73ad87afe6b0 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -251,7 +251,7 @@ void FontCfgWrapper::release() namespace { - static FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag); + FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag); FcChar8* bestname(const std::vector<lang_and_element> &elements, const LanguageTag & rLangTag) { diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index b470eff7052a..6444cc4fe522 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -495,7 +495,7 @@ cairo::SurfaceSharedPtr X11SalGraphics::CreateSurface(const cairo::CairoSurfaceS namespace { - static cairo::X11SysData getSysData( const vcl::Window& rWindow ) + cairo::X11SysData getSysData( const vcl::Window& rWindow ) { const SystemEnvData* pSysData = cairo::GetSysData(&rWindow); @@ -505,7 +505,7 @@ namespace return cairo::X11SysData(*pSysData); } - static cairo::X11SysData getSysData( const VirtualDevice& rVirDev ) + cairo::X11SysData getSysData( const VirtualDevice& rVirDev ) { return cairo::X11SysData( rVirDev.GetSystemGfxData() ); } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index a8e0cabf7bba..b6881401f07e 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2547,7 +2547,7 @@ struct CompressWheelEventsData int count; // number of compressed events }; -static Bool compressWheelEvents( Display*, XEvent* event, XPointer p ) +Bool compressWheelEvents( Display*, XEvent* event, XPointer p ) { CompressWheelEventsData* data = reinterpret_cast< CompressWheelEventsData* >( p ); if( data->ignore ) diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index 6ea55a5f21d9..3a37197ffa6d 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -147,14 +147,14 @@ GtkSalPrinter_Impl::~GtkSalPrinter_Impl() namespace { -static GtkInstance const& +GtkInstance const& lcl_getGtkSalInstance() { // we _know_ this is GtkInstance return *static_cast<GtkInstance*>(GetGtkSalData()->m_pInstance); } -static bool +bool lcl_useSystemPrintDialog() { return officecfg::Office::Common::Misc::UseSystemPrintDialog::get() @@ -312,7 +312,7 @@ GtkSalPrinter::EndJob() namespace { -static void +void lcl_setHelpText( GtkWidget* const io_pWidget, const uno::Sequence<OUString>& i_rHelpTexts, @@ -323,7 +323,7 @@ lcl_setHelpText( OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); } -static GtkWidget* +GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, const OUString &i_rText, @@ -352,7 +352,7 @@ lcl_makeFrame( return pFrame; } -static void +void lcl_extractHelpTextsOrIds( const beans::PropertyValue& rEntry, uno::Sequence<OUString>& rHelpStrings) @@ -368,7 +368,7 @@ lcl_extractHelpTextsOrIds( } } -static GtkWidget* +GtkWidget* lcl_combo_box_text_new() { #if GTK_CHECK_VERSION(3,0,0) @@ -378,7 +378,7 @@ lcl_combo_box_text_new() #endif } -static void +void lcl_combo_box_text_append(GtkWidget* const pWidget, gchar const* const pText) { #if GTK_CHECK_VERSION(3,0,0) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index d5fcb949741c..bf9e5de022e1 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -141,7 +141,7 @@ void SAL_CALL SvXMLImportEventListener::disposing( const lang::EventObject& ) namespace { -static OUString +OUString getBuildIdsProperty(uno::Reference<beans::XPropertySet> const& xImportInfo) { if (xImportInfo.is()) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index b9fdc78f652e..c12775989f8f 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -74,7 +74,7 @@ namespace return aTime; } - static css::util::Date lcl_getDate( double _nValue ) + css::util::Date lcl_getDate( double _nValue ) { Date aToolsDate((sal_uInt32)_nValue); css::util::Date aDate; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index fecc47acdce1..582d541c7998 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -41,7 +41,7 @@ using namespace ::xmloff::token; namespace { - static void lcl_exportDataStyle( SvXMLExport& _rExport, const rtl::Reference< XMLPropertySetMapper >& _rxMapper, + void lcl_exportDataStyle( SvXMLExport& _rExport, const rtl::Reference< XMLPropertySetMapper >& _rxMapper, const XMLPropertyState& _rProperty ) { assert(_rxMapper.is()); diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 6192bcf0a47f..8b072c68d499 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -330,9 +330,9 @@ void XMLTextExportPropertySetMapper::ContextFontHeightFilter( namespace { // helper method; implementation below -static bool lcl_IsOutlineStyle(const SvXMLExport&, const OUString&); +bool lcl_IsOutlineStyle(const SvXMLExport&, const OUString&); -static void +void lcl_checkMultiProperty(XMLPropertyState *const pState, XMLPropertyState *const pRelState) { @@ -358,7 +358,7 @@ lcl_checkMultiProperty(XMLPropertyState *const pState, * Compress border attributes. If one of groupable attributes (border type, border width, padding) * is equal for all four side then just one general attribute will be exported. **/ -static void lcl_FilterBorders( +void lcl_FilterBorders( XMLPropertyState* pAllBorderWidthState, XMLPropertyState* pLeftBorderWidthState, XMLPropertyState* pRightBorderWidthState, XMLPropertyState* pTopBorderWidthState, XMLPropertyState* pBottomBorderWidthState, XMLPropertyState* pAllBorderDistanceState, @@ -1160,7 +1160,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( namespace { -static bool lcl_IsOutlineStyle(const SvXMLExport &rExport, const OUString & rName) +bool lcl_IsOutlineStyle(const SvXMLExport &rExport, const OUString & rName) { Reference< XChapterNumberingSupplier > xCNSupplier(rExport.GetModel(), UNO_QUERY); diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 2e0139d3fecc..44ab6903613a 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -254,7 +254,7 @@ namespace { //crock. //On import clear 100% all-margins relative sizes. -static bool +bool isNotDefaultRelSize(const XMLPropertyState* pRelState, const rtl::Reference<XMLPropertySetMapper>& rPrMap) { if (rPrMap->GetEntryContextId(pRelState->mnIndex) == CTF_PARAMARGINALL_REL) @@ -272,7 +272,7 @@ isNotDefaultRelSize(const XMLPropertyState* pRelState, const rtl::Reference<XMLP * Since Writer hasn't the same compressed attributes, but has distinct ones for all * four side, we have to duplicate the compressed attribute during import. **/ -static void lcl_SeparateBorder( +void lcl_SeparateBorder( sal_uInt16 nIndex, XMLPropertyState* pAllBorderDistance, XMLPropertyState* pBorderDistances[4], XMLPropertyState* pNewBorderDistances[4], XMLPropertyState* pAllBorder, XMLPropertyState* pBorders[4], diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 3cadc6acab51..f094cff39cb5 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -154,10 +154,10 @@ namespace { return sal::static_int_cast<size_t>(reinterpret_cast<sal_uIntPtr>(rFrame.get())); } }; - static bool lcl_TextContentsUnfiltered(const Reference<XTextContent>&) + bool lcl_TextContentsUnfiltered(const Reference<XTextContent>&) { return true; }; - static bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent) + bool lcl_ShapeFilter(const Reference<XTextContent>& xTxtContent) { Reference<XShape> xShape(xTxtContent, UNO_QUERY); if(!xShape.is()) |