diff options
author | Wastack <btomi96@gmail.com> | 2016-03-31 08:43:53 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 06:45:46 +0000 |
commit | 1271eadfac7e77ff7b249e64be3857ffdc0a261c (patch) | |
tree | bebb8924d3efea223eef40a85c5a239195b18330 /framework | |
parent | 20ba5d464a9fba3090af6a644a331ee237356fea (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
6 files changed, 12 insertions, 12 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3827e3233247..6263417ca285 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 b862ad810164..15b26bae1bfb 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 f90ef07d18bd..1bcb6ce67449 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 b64ff51a26d4..23c81d72453a 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 fc47cd237af6..cdc77f7bd09b 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 6946e9ac6be2..f056500d9934 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 ) { |