extensions/source/propctrlr/eventhandler.cxx | 2 - extensions/source/propctrlr/formgeometryhandler.cxx | 2 - extensions/source/propctrlr/pushbuttonnavigation.cxx | 4 +-- filter/source/svg/svgreader.cxx | 4 +-- forms/source/component/DatabaseForm.cxx | 2 - forms/source/component/propertybaghelper.cxx | 2 - forms/source/misc/InterfaceContainer.cxx | 2 - forms/source/richtext/richtextcontrol.cxx | 12 +++++----- forms/source/richtext/rtattributehandler.cxx | 2 - forms/source/runtime/formoperations.cxx | 6 ++--- forms/source/solar/component/navbarcontrol.cxx | 2 - forms/source/solar/control/navtoolbar.cxx | 4 +-- forms/source/xforms/datatypes.cxx | 4 +-- fpicker/source/office/iodlg.cxx | 2 - framework/source/services/substitutepathvars.cxx | 2 - framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 4 +-- framework/source/uiconfiguration/uiconfigurationmanager.cxx | 4 +-- framework/source/uielement/popuptoolbarcontroller.cxx | 2 - framework/source/uielement/statusbarmanager.cxx | 2 - framework/source/uielement/statusbarmerger.cxx | 10 ++++---- i18nlangtag/qa/cppunit/test_languagetag.cxx | 2 - l10ntools/source/export.cxx | 4 +-- l10ntools/source/lngmerge.cxx | 2 - l10ntools/source/treemerge.cxx | 6 ++--- l10ntools/source/xmlparse.cxx | 6 ++--- oox/source/mathml/importutils.cxx | 2 - 26 files changed, 48 insertions(+), 48 deletions(-)
New commits: commit 1271eadfac7e77ff7b249e64be3857ffdc0a261c Author: Wastack <[email protected]> Date: Thu Mar 31 08:43:53 2016 +0200 tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: Id9dd5a53d6ea5134ebb473bd0463f8f42965a211 Reviewed-on: https://gerrit.libreoffice.org/23674 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3827e32..6263417 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -456,7 +456,7 @@ void SubstitutePathVariables_Impl::ImplCommit() { } -static inline OperatingSystem GetOperatingSystem() +inline OperatingSystem GetOperatingSystem() { #ifdef SOLARIS return OS_SOLARIS; diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index b862ad8..15b26ba 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -238,7 +238,7 @@ static const char RESOURCEURL_PREFIX[] = "private:resource/"; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_"; -static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) +sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && @@ -260,7 +260,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) return ui::UIElementType::UNKNOWN; } -static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) +OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index f90ef07..1bcb6ce 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -214,7 +214,7 @@ static const char* UIELEMENTTYPENAMES[] = static const char RESOURCEURL_PREFIX[] = "private:resource/"; static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; -static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) +sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && @@ -236,7 +236,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const OUString& aResourceURL ) return UIElementType::UNKNOWN; } -static OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) +OUString RetrieveNameFromResourceURL( const OUString& aResourceURL ) { if (( aResourceURL.startsWith( RESOURCEURL_PREFIX ) ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index b64ff51..23c81d7 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -675,7 +675,7 @@ void NewToolbarController::functionExecuted( const OUString &rCommand ) @return sal_True - if URL could be located as an item of the popup menu. sal_False - otherwhise. */ -static bool Impl_ExistURLInMenu( +bool Impl_ExistURLInMenu( const css::uno::Reference< css::awt::XPopupMenu > &rPopupMenu, OUString &sURL, OUString &sFallback, diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index fc47cd2..cdc77f7 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -100,7 +100,7 @@ struct lcl_RemoveController : public std::unary_function< typename MAP::value_ty } }; -static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) +sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) { sal_uInt16 nItemBits( 0 ); diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 6946e9a..f056500 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -48,7 +48,7 @@ static const char MERGEFALLBACK_ADDLAST[] = "AddLast"; static const char MERGEFALLBACK_ADDFIRST[] = "AddFirst"; static const char MERGEFALLBACK_IGNORE[] = "Ignore"; -static void lcl_ConvertSequenceToValues( +void lcl_ConvertSequenceToValues( const Sequence< PropertyValue > &rSequence, AddonStatusbarItem &rItem ) { @@ -95,7 +95,7 @@ static void lcl_ConvertSequenceToValues( rItem.nItemBits = nItemBits; } -static void lcl_CreateStatusbarItem( StatusBar* pStatusbar, +void lcl_CreateStatusbarItem( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonStatusbarItem& rAddonItem ) @@ -116,7 +116,7 @@ static void lcl_CreateStatusbarItem( StatusBar* pStatusbar, pStatusbar->SetItemData( nItemId, pUserData ); } -static bool lcl_MergeItems( StatusBar* pStatusbar, +bool lcl_MergeItems( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, @@ -141,7 +141,7 @@ static bool lcl_MergeItems( StatusBar* pStatusbar, return true; } -static bool lcl_ReplaceItem( StatusBar* pStatusbar, +bool lcl_ReplaceItem( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, @@ -151,7 +151,7 @@ static bool lcl_ReplaceItem( StatusBar* pStatusbar, return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, rModuleIdentifier, rAddonToolbarItems ); } -static bool lcl_RemoveItems( StatusBar* pStatusbar, +bool lcl_RemoveItems( StatusBar* pStatusbar, sal_uInt16 nPos, const ::rtl::OUString& rMergeCommandParameter ) { diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 8696408..125c22b 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -630,7 +630,7 @@ void TestLanguageTag::testAllTags() } } -static bool checkMapping( const OUString& rStr1, const OUString& rStr2 ) +bool checkMapping( const OUString& rStr1, const OUString& rStr2 ) { if (rStr1 == "la-Latn" ) return rStr2 == "la"; if (rStr1 == "tzm-Latn-DZ" ) return rStr2 == "kab-DZ"; diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 26b3fe5..d8dbaae 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -48,7 +48,7 @@ std::unique_ptr< Export > exporter; } -static OString lcl_GetListTyp( const sal_uInt16 nTyp, const bool bUpperCamelCase ) +OString lcl_GetListTyp( const sal_uInt16 nTyp, const bool bUpperCamelCase ) { OString sType; switch (nTyp) @@ -176,7 +176,7 @@ bool ResData::SetId( const OString& rId, sal_uInt16 nLevel ) namespace { -static sal_Int32 lcl_countOccurrences(const OString& text, char c) +sal_Int32 lcl_countOccurrences(const OString& text, char c) { sal_Int32 n = 0; for (sal_Int32 i = 0;; ++i) { diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index da26398..1d33c92 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -33,7 +33,7 @@ OString getBracketedContent(const OString& text) { return text.getToken(1, '[').getToken(0, ']'); } -static void lcl_RemoveUTF8ByteOrderMarker( OString &rString ) +void lcl_RemoveUTF8ByteOrderMarker( OString &rString ) { if( rString.getLength() >= 3 && rString[0] == '\xEF' && rString[1] == '\xBB' && rString[2] == '\xBF' ) diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index b98b0621..978d393 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -27,7 +27,7 @@ namespace { // Extract strings from nodes on all level recursively - static void lcl_ExtractLevel( + void lcl_ExtractLevel( const xmlDocPtr pSource, const xmlNodePtr pRoot, const xmlChar* pNodeName, PoOfstream& rPOStream ) { @@ -59,7 +59,7 @@ namespace } // Update id and content of the topic - static xmlNodePtr lcl_UpdateTopic( + xmlNodePtr lcl_UpdateTopic( const xmlNodePtr pCurrent, const OString& rXhpRoot ) { xmlNodePtr pReturn = pCurrent; @@ -139,7 +139,7 @@ namespace return pReturn; } // Localize title attribute of help_section and node tags - static void lcl_MergeLevel( + void lcl_MergeLevel( xmlDocPtr io_pSource, const xmlNodePtr pRoot, const xmlChar * pNodeName, MergeDataFile* pMergeDataFile, const OString& rLang, const OString& rXhpRoot ) diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index 97d6012..3f23923 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -764,7 +764,7 @@ void XMLElement::Print(XMLNode *pCur, OStringBuffer& rBuffer, bool bRootelement namespace { -static OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname) +OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname) { OUString sPath = OStringToOUString(rPathname, RTL_TEXTENCODING_UTF8 ); OUString sUrl; @@ -1034,7 +1034,7 @@ XMLFile *SimpleXMLParser::Execute( const OString &rFileName, XMLFile* pXMLFileIn namespace { -static icu::UnicodeString lcl_QuotRange( +icu::UnicodeString lcl_QuotRange( const icu::UnicodeString& rString, const sal_Int32 nStart, const sal_Int32 nEnd, bool bInsideTag = false ) { @@ -1072,7 +1072,7 @@ static icu::UnicodeString lcl_QuotRange( return sReturn; } -static bool lcl_isTag( const icu::UnicodeString& rString ) +bool lcl_isTag( const icu::UnicodeString& rString ) { static const int nSize = 13; static const icu::UnicodeString vTags[nSize] = { diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 463372a..e3f4d90 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -54,7 +54,7 @@ AttributeListBuilder::AttributeListBuilder( const uno::Reference< xml::sax::XFas } } -static OString tokenToString( int token ) +OString tokenToString( int token ) { const uno::Sequence< sal_Int8 > aTokenNameSeq = StaticTokenMap::get().getUtf8TokenName( token & TOKEN_MASK ); OString tokenname( reinterpret_cast< const char* >( aTokenNameSeq.getConstArray() ), aTokenNameSeq.getLength() ); commit 20ba5d464a9fba3090af6a644a331ee237356fea Author: Wastack <[email protected]> Date: Thu Mar 31 08:42:46 2016 +0200 tdf#97966 Drop 'static' keywords Including no keywords from extern "C" blocks Change-Id: I8bcd7e8a492ee4dbfa5141416c7c038a1391cf20 Reviewed-on: https://gerrit.libreoffice.org/23673 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: Stephan Bergmann <[email protected]> diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 496ccd0..396239d 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -1046,7 +1046,7 @@ namespace pcr namespace { - static bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) + bool lcl_endsWith( const OUString& _rText, const OUString& _rCheck ) { sal_Int32 nTextLen = _rText.getLength(); sal_Int32 nCheckLen = _rCheck.getLength(); diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx index 99f1e13..1664f8c 100644 --- a/extensions/source/propctrlr/formgeometryhandler.cxx +++ b/extensions/source/propctrlr/formgeometryhandler.cxx @@ -611,7 +611,7 @@ namespace pcr namespace { - static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows, + sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows, const css::awt::Point& _rRelativePosition ) { sal_Int32 nAccumulated = 0; diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx index 095d142..e4c7560 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.cxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx @@ -54,7 +54,7 @@ namespace pcr nullptr }; - static sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) + sal_Int32 lcl_getNavigationURLIndex( const OUString& _rNavURL ) { const sal_Char** pLookup = pNavigationURLs; while ( *pLookup ) @@ -66,7 +66,7 @@ namespace pcr return -1; } - static const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex ) + const sal_Char* lcl_getNavigationURL( sal_Int32 _nButtonTypeIndex ) { const sal_Char** pLookup = pNavigationURLs; while ( _nButtonTypeIndex-- && *pLookup++ ) diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index 2deff75..8feb4bf 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -1373,7 +1373,7 @@ struct AnnotatingVisitor }; /// Annotate svg styles with unique references to state pool -static void annotateStyles( StatePool& rStatePool, +void annotateStyles( StatePool& rStatePool, StateMap& rStateMap, const State& rInitialState, uno::Reference<xml::dom::XElement>& rElem, @@ -1943,7 +1943,7 @@ struct ShapeWritingVisitor }; /// Write out shapes from DOM tree -static void writeShapes( StatePool& rStatePool, +void writeShapes( StatePool& rStatePool, StateMap& rStateMap, const uno::Reference<xml::dom::XElement>& rElem, const uno::Reference<xml::sax::XDocumentHandler>& xDocHdl, diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 4245ff9..e44e90e 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -565,7 +565,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr namespace { - static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut ) + void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut ) { sal_Int32 nCurLen = _rOut.getLength(); _rOut.append( _nNumber ); diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 0c02677..b0774a3 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -63,7 +63,7 @@ namespace frm namespace { - static ::comphelper::IPropertyInfoService& lcl_getPropertyInfos() + ::comphelper::IPropertyInfoService& lcl_getPropertyInfos() { static ConcreteInfoService s_aPropInfos; return s_aPropInfos; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index fc04dc5..9dde69c 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star::util; namespace { - static void lcl_throwIllegalArgumentException() + void lcl_throwIllegalArgumentException() { throw IllegalArgumentException(); } diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index e3bfef6..c535f5a 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -77,7 +77,7 @@ namespace frm namespace { - static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, + void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag ) { bool bFlagValue = false; @@ -86,7 +86,7 @@ namespace frm } - static void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) + void implAdjustTwoStateFlag( const Any& _rValue, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { bool bFlagValue = false; if ( _rValue >>= bFlagValue ) @@ -101,14 +101,14 @@ namespace frm } - static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, + void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert ); } - static void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) + void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) { WinBits nBits = _pWindow->GetStyle(); implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert ); @@ -116,7 +116,7 @@ namespace frm } - static WinBits getWinBits( const Reference< XControlModel >& _rxModel ) + WinBits getWinBits( const Reference< XControlModel >& _rxModel ) { WinBits nBits = 0; try @@ -431,7 +431,7 @@ namespace frm namespace { - static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) + SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool ) { // HACK HACK HACK // unfortunately, some of our applications have some conflicting slots, diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index b4793cb..37037fc 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -96,7 +96,7 @@ namespace frm namespace { - static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) + WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId ) { WhichId nWhich = 0; switch ( _nAttributeId ) diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 33a2fa1..4f9884f 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -407,7 +407,7 @@ namespace frm namespace { - static bool lcl_needConfirmCommit( sal_Int32 _nFeature ) + bool lcl_needConfirmCommit( sal_Int32 _nFeature ) { return ( ( _nFeature == FormFeature::ReloadForm ) || ( _nFeature == FormFeature::RemoveFilterAndSort ) @@ -419,11 +419,11 @@ namespace frm || ( _nFeature == FormFeature::InteractiveFilter ) ); } - static bool lcl_requiresArguments( sal_Int32 _nFeature ) + bool lcl_requiresArguments( sal_Int32 _nFeature ) { return ( _nFeature == FormFeature::MoveAbsolute ); } - static bool lcl_isExecutableFeature( sal_Int32 _nFeature ) + bool lcl_isExecutableFeature( sal_Int32 _nFeature ) { return ( _nFeature != FormFeature::TotalRecords ); } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 6c182cb..cc7be7a 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -85,7 +85,7 @@ namespace frm namespace { - static WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) + WinBits lcl_getWinBits_nothrow( const Reference< XControlModel >& _rxModel ) { WinBits nBits = 0; try diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 8b767e4..79b75ca 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -47,13 +47,13 @@ namespace frm namespace { - static bool isArtificialItem( sal_Int16 _nFeatureId ) + bool isArtificialItem( sal_Int16 _nFeatureId ) { return ( _nFeatureId == LID_RECORD_LABEL ) || ( _nFeatureId == LID_RECORD_FILLER ); } - static OUString getLabelString( sal_uInt16 _nResId ) + OUString getLabelString( sal_uInt16 _nResId ) { OUString sLabel( " " ); sLabel += FRM_RES_STRING( _nResId ); diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 016243a..8d1c2bc 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -191,7 +191,7 @@ namespace xforms namespace { - static void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) + void lcl_initializePatternMatcher( ::std::unique_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW @@ -200,7 +200,7 @@ namespace xforms // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity } - static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText ) + bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 3d86696..6d42b49 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -270,7 +270,7 @@ namespace } #endif - static OUString lcl_ensureFinalSlash( const OUString& _rDir ) + OUString lcl_ensureFinalSlash( const OUString& _rDir ) { INetURLObject aWorkPathObj( _rDir, INetProtocol::File ); aWorkPathObj.setFinalSlash(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
