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 /xmloff | |
parent | 9af411abce1e22d55b73d5bbac3b7a6a8535eb3b (diff) |
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>
Diffstat (limited to 'xmloff')
-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 |
6 files changed, 11 insertions, 11 deletions
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()) |