diff options
Diffstat (limited to 'sfx2')
26 files changed, 61 insertions, 57 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index c2a91d51283d..5cc4ce4edf16 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -158,7 +158,7 @@ extern "C" bool GetSpecialCharsForEdit( vcl::Window const * i_pParent, const vcl #endif -OUString SfxGetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont) +static OUString SfxGetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont) { static bool bDetermineFunction = false; static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = nullptr; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 3b7c6fe3549d..fb111b64a935 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1225,7 +1225,7 @@ extern "C" rtl_uString* basicide_choose_macro(void*, void*, sal_Bool); #endif -OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, const Reference< XFrame >& xDocFrame, bool bChooseOnly ) +static OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, const Reference< XFrame >& xDocFrame, bool bChooseOnly ) { #ifndef DISABLE_DYNLOADING osl::Module aMod; diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 239614444688..7032dce1e1bc 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -201,7 +201,7 @@ bool SvFileObject::LoadFile_Impl() If the URL doesn't denote a valid (existent and accessible) file, the request is silently dropped. */ -OUString impl_getFilter( const OUString& _rURL ) +static OUString impl_getFilter( const OUString& _rURL ) { OUString sFilter; if ( _rURL.isEmpty() ) diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index b503e06f0cf6..059dcb22a48b 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -556,7 +556,7 @@ bool LinkManager::GetGraphicFromAny(const OUString& rMimeType, return bRet; } -OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) +static OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL ) { OUString sRet; INetURLObject aURL( rTopic ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f72a03149d32..f2a28bb418ed 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -196,7 +196,7 @@ namespace sfx2 "text*" | "text*" | "text" "text menu" | "text* menu*" | "text|menu" */ - OUString PrepareSearchString( const OUString& rSearchString, + static OUString PrepareSearchString( const OUString& rSearchString, const Reference< XBreakIterator >& xBreak, bool bForSearch ) { OUStringBuffer sSearchStr; @@ -1114,7 +1114,7 @@ bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) // class BookmarksTabPage_Impl ------------------------------------------- -void GetBookmarkEntry_Impl +static void GetBookmarkEntry_Impl ( Sequence< PropertyValue >& aBookmarkEntry, OUString& rTitle, diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 9f17de32c1a1..8de81b856815 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::uno; using namespace ::cppu; -const char* SvxOpenGrfErr2ResId( ErrCode err ) +static const char* SvxOpenGrfErr2ResId( ErrCode err ) { if (err == ERRCODE_GRFILTER_OPENERROR) return RID_SVXSTR_GRFILTER_OPENERROR; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 8092367eafce..956c600de6d9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -294,7 +294,7 @@ void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark ) rURL.append(utl::ConfigManager::getProductVersion()); } -bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) +static bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) { bool bRet = false; OUString sAnchor; @@ -359,7 +359,7 @@ SfxHelp::~SfxHelp() { } -OUString getDefaultModule_Impl() +static OUString getDefaultModule_Impl() { OUString sDefaultModule; SvtModuleOptions aModOpt; @@ -386,7 +386,7 @@ OUString getDefaultModule_Impl() return sDefaultModule; } -OUString getCurrentModuleIdentifier_Impl() +static OUString getCurrentModuleIdentifier_Impl() { OUString sIdentifier; Reference < XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -539,7 +539,7 @@ OUString SfxHelp::CreateHelpURL_Impl( const OUString& aCommandURL, const OUStrin return aHelpURL.makeStringAndClear(); } -SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , +static SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , Reference< XFrame >& rHelpContent) { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index af5d0cdb4bbf..b6906eea72ad 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -338,7 +338,7 @@ static OUString GetResourceURLFromToolbarId(ToolbarId eId) return theFilledToolBarResIdToResourceURLMap::get().findURL(eId); } -bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos ) +static bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos ) { switch ( nPos ) { @@ -351,7 +351,7 @@ bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos ) } } -sal_uInt16 TbxMatch( sal_uInt16 nPos ) +static sal_uInt16 TbxMatch( sal_uInt16 nPos ) { switch ( nPos ) { @@ -374,7 +374,7 @@ sal_uInt16 TbxMatch( sal_uInt16 nPos ) } } -sal_uInt16 ChildAlignValue(SfxChildAlignment eAlign) +static sal_uInt16 ChildAlignValue(SfxChildAlignment eAlign) { sal_uInt16 ret = 17; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index bc005a0da152..5a67eb969795 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -119,7 +119,7 @@ static void CreateFilterArr() theSfxFilterListener::get(); } -inline OUString ToUpper_Impl( const OUString &rStr ) +static inline OUString ToUpper_Impl( const OUString &rStr ) { return SvtSysLocale().GetCharClass().uppercase( rStr ); } @@ -859,7 +859,7 @@ std::shared_ptr<const SfxFilter> SfxFilterMatcherIter::Next() helper to build own formatted string from given stringlist by using given separator ---------------------------------------------------------------*/ -OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList , +static OUString implc_convertStringlistToString( const uno::Sequence< OUString >& lList , sal_Unicode cSeparator, const OUString& sPrefix ) { diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 72fa2f92652f..211b6fd1a774 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -116,7 +116,7 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName } -uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) +static uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) { /* This function converts a SvxMacro into an Any containing three @@ -189,7 +189,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) } -void PropagateEvent_Impl( SfxObjectShell const *pDoc, const OUString& aEventName, const SvxMacro* pMacro ) +static void PropagateEvent_Impl( SfxObjectShell const *pDoc, const OUString& aEventName, const SvxMacro* pMacro ) { uno::Reference < document::XEventsSupplier > xSupplier; if ( pDoc ) diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index efe847cd4a1d..edbb2d2f9387 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -879,7 +879,7 @@ void SfxDispatcher::Execute_(SfxShell& rShell, const SfxSlot& rSlot, /** Helper function to put from rItem below the Which-ID in the pool of the Item Sets rSet. */ -void MappedPut_Impl(SfxAllItemSet &rSet, const SfxPoolItem &rItem) +static void MappedPut_Impl(SfxAllItemSet &rSet, const SfxPoolItem &rItem) { // Put with mapped Which-Id if possible const SfxItemPool *pPool = rSet.GetPool(); @@ -1614,11 +1614,15 @@ void SfxDispatcher::SetSlotFilter(SfxSlotFilterState nEnable, GetBindings()->InvalidateAll(true); } -extern "C" int SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) +extern "C" { + +static int SfxCompareSIDs_Impl(const void* pSmaller, const void* pBigger) { return static_cast<long>(*static_cast<sal_uInt16 const *>(pSmaller)) - static_cast<long>(*static_cast<sal_uInt16 const *>(pBigger)); } +} + /** Searches for 'nSID' in the Filter set by <SetSlotFilter()> and returns sal_True, if the SIDis allowed, or sal_False, if it is disabled by the Filter. diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 2d8b9b0a707d..c7a7731ba5c7 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -401,7 +401,7 @@ bool SfxShell::IsConditionalFastCall( const SfxRequest &rReq ) } -void ShellCall_Impl( void* pObj, void* pArg ) +static void ShellCall_Impl( void* pObj, void* pArg ) { static_cast<SfxShell*>(pObj)->ExecuteSlot( *static_cast<SfxRequest*>(pArg) ); } @@ -514,8 +514,8 @@ const SfxPoolItem* SfxShell::GetSlotState return pTemp; } -SFX_EXEC_STUB(SfxShell, VerbExec) -void SfxStubSfxShellVerbState(SfxShell *, SfxItemSet& rSet) +static SFX_EXEC_STUB(SfxShell, VerbExec) +static void SfxStubSfxShellVerbState(SfxShell *, SfxItemSet& rSet) { SfxShell::VerbState( rSet ); } @@ -653,7 +653,7 @@ bool SfxShell::HasUIFeature(SfxShellFeature) const return false; } -void DispatcherUpdate_Impl( void*, void* pArg ) +static void DispatcherUpdate_Impl( void*, void* pArg ) { static_cast<SfxDispatcher*>(pArg)->Update_Impl( true ); static_cast<SfxDispatcher*>(pArg)->GetBindings()->InvalidateAll(false); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index b5f132aae9fe..d85b1b38ff6f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -130,7 +130,7 @@ namespace } } -const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) +static const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) { static const OUString aSD_EXPORT_IDENTIFIER("SdExportLastFilter"); static const OUString aSI_EXPORT_IDENTIFIER("SiExportLastFilter"); @@ -149,8 +149,8 @@ const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext ) return pRet; } -OUString EncodeSpaces_Impl( const OUString& rSource ); -OUString DecodeSpaces_Impl( const OUString& rSource ); +static OUString EncodeSpaces_Impl( const OUString& rSource ); +static OUString DecodeSpaces_Impl( const OUString& rSource ); // FileDialogHelper_Impl @@ -1328,7 +1328,7 @@ void FileDialogHelper_Impl::implStartExecute() } } -void lcl_saveLastURLs(std::vector<OUString>& rpURLList, +static void lcl_saveLastURLs(std::vector<OUString>& rpURLList, ::std::vector< OUString >& lLastURLs ) { lLastURLs.clear(); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index a24281ba1454..f5fbc9ec4658 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -146,7 +146,7 @@ namespace sfx2 // = reading of configuration data - void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, + static void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { // the description node for the current class @@ -218,7 +218,7 @@ namespace sfx2 }; - void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames ) + static void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames ) { _rGlobalClasses.clear(); _rGlobalClassNames.clear(); @@ -288,7 +288,7 @@ namespace sfx2 }; - void lcl_ReadLocalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rLocalClasses ) + static void lcl_ReadLocalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rLocalClasses ) { _rLocalClasses.clear(); @@ -305,7 +305,7 @@ namespace sfx2 } - void lcl_ReadClassification( FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames, FilterClassList& _rLocalClasses ) + static void lcl_ReadClassification( FilterClassList& _rGlobalClasses, std::vector<OUString>& _rGlobalClassNames, FilterClassList& _rLocalClasses ) { // open our config node @@ -495,7 +495,7 @@ namespace sfx2 } - void lcl_InitGlobalClasses( GroupedFilterList& _rAllFilters, const FilterClassList& _rGlobalClasses, FilterGroupEntryReferrer& _rGlobalClassesRef ) + static void lcl_InitGlobalClasses( GroupedFilterList& _rAllFilters, const FilterClassList& _rGlobalClasses, FilterGroupEntryReferrer& _rGlobalClassesRef ) { // we need an extra group in our "all filters" container _rAllFilters.push_front( FilterGroup() ); @@ -555,7 +555,7 @@ namespace sfx2 }; - void lcl_GroupAndClassify( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rAllFilters ) + static void lcl_GroupAndClassify( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rAllFilters ) { _rAllFilters.clear(); @@ -745,7 +745,7 @@ namespace sfx2 // = handling for the "all files" entry - bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) + static bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { bool bHasAll = false; _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ); @@ -761,7 +761,7 @@ namespace sfx2 } - void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters ) + static void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters ) { OUString sAllFilterName; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 50d6f4764d96..88042ea54ea4 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -521,7 +521,7 @@ public: }; -void MakeTree_Impl(StyleTreeArr_Impl& rArr) +static void MakeTree_Impl(StyleTreeArr_Impl& rArr) { const comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), @@ -564,7 +564,7 @@ void MakeTree_Impl(StyleTreeArr_Impl& rArr) }); } -inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, +static inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, const OUString &rStr) { for (const auto & rEntry : rEntries) @@ -575,7 +575,7 @@ inline bool IsExpanded_Impl( const std::vector<OUString>& rEntries, return false; } -SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, +static SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, StyleTree_Impl* pEntry, const std::vector<OUString>& rEntries, SfxStyleFamily eStyleFamily, @@ -601,7 +601,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, namespace SfxTemplate { // converts from SFX_STYLE_FAMILY Ids to 1-6 - sal_uInt16 SfxFamilyIdToNId(SfxStyleFamily nFamily) + static sal_uInt16 SfxFamilyIdToNId(SfxStyleFamily nFamily) { switch ( nFamily ) { @@ -616,7 +616,7 @@ namespace SfxTemplate } // converts from 1-6 to SFX_STYLE_FAMILY Ids - SfxStyleFamily NIdToSfxFamilyId(sal_uInt16 nId) + static SfxStyleFamily NIdToSfxFamilyId(sal_uInt16 nId) { switch (nId) { diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index d01e5c8c0932..5e903319bb05 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -242,7 +242,7 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersion m_pVersionBox->setColSizes(); } -OUString ConvertWhiteSpaces_Impl( const OUString& rText ) +static OUString ConvertWhiteSpaces_Impl( const OUString& rText ) { // converted linebreaks and tabs to blanks; it's necessary for the display OUStringBuffer sConverted; diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 6ef5a029b3d6..6df5505c2961 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -206,7 +206,7 @@ struct DocumentMetadataAccess_Impl // this is... a hack. template<sal_Int16 Constant> -/*static*/ uno::Reference<rdf::XURI> const & +static uno::Reference<rdf::XURI> const & getURI(uno::Reference< uno::XComponentContext > const & i_xContext) { static uno::Reference< rdf::XURI > xURI( diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 7d7ac24f658a..65b386640845 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -378,7 +378,7 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const /// generate unique xml:id template< typename T > -/*static*/ OUString create_id(const +static OUString create_id(const std::unordered_map< OUString, T > & i_rXmlIdMap) { static bool bHack = (getenv("LIBO_ONEWAY_STABLE_ODF_EXPORT") != nullptr); @@ -1302,7 +1302,7 @@ void Metadatable::EnsureMetadataReference() m_pReg = &rReg; } -const ::sfx2::IXmlIdRegistry& GetRegistryConst(Metadatable const& i_rObject) +static const ::sfx2::IXmlIdRegistry& GetRegistryConst(Metadatable const& i_rObject) { return const_cast< Metadatable& >( i_rObject ).GetRegistry(); } diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 987548f1f80e..d0f2a0df252c 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -166,7 +166,7 @@ SfxMediumList* DocumentInserter::CreateMediumList() return pMediumList; } -void impl_FillURLList( sfx2::FileDialogHelper const * _pFileDlg, std::vector<OUString>& _rpURLList ) +static void impl_FillURLList( sfx2::FileDialogHelper const * _pFileDlg, std::vector<OUString>& _rpURLList ) { DBG_ASSERT( _pFileDlg, "DocumentInserter::fillURLList(): invalid file dialog" ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index f08529be0ce2..86a94f0d57ba 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -3262,7 +3262,7 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt return bResult; } -bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource, +static bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource, const uno::Reference< embed::XStorage >& xTarget ) { OSL_ENSURE( xSource.is() && xTarget.is(), "Source and/or target storages are not available!" ); diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 1bdf74f8f4e0..522b6db3272b 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -79,7 +79,7 @@ struct IMPL_PrintListener_DataContainer : public SfxListener const SfxHint& aHint ) override ; }; -awt::Size impl_Size_Object2Struct( const Size& aSize ) +static awt::Size impl_Size_Object2Struct( const Size& aSize ) { awt::Size aReturnValue; aReturnValue.Width = aSize.Width() ; @@ -87,7 +87,7 @@ awt::Size impl_Size_Object2Struct( const Size& aSize ) return aReturnValue ; } -Size impl_Size_Struct2Object( const awt::Size& aSize ) +static Size impl_Size_Struct2Object( const awt::Size& aSize ) { Size aReturnValue; aReturnValue.setWidth( aSize.Width ) ; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 3c6e2ae18737..76b24debb328 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -580,7 +580,7 @@ Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() // XStarBasicAccess -Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell const * pObjectShell ) +static Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell const * pObjectShell ) { Reference< script::XStarBasicAccess > xRet; @@ -2631,7 +2631,7 @@ SfxMedium* SfxBaseModel::handleLoadError( ErrCode nError, SfxMedium* pMedium ) // SfxListener -void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle ) +static void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle ) { sal_Int32 nCount = rSeq.getLength(); sal_Int32 nArg; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index ff481013bfa8..839342506ed7 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -265,7 +265,7 @@ void Deck::ShowPanel(const Panel& rPanel) } } -const OUString GetWindowClassification(const vcl::Window* pWindow) +static const OUString GetWindowClassification(const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); if (!rsName.isEmpty()) diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 6c7bc18bb719..a4d268eb134b 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -179,7 +179,7 @@ sal_uInt32 Get10ThSec() static sal_Int32 m_nInReschedule = 0; /// static counter for rescheduling -void reschedule() +static void reschedule() { if ( m_nInReschedule == 0 ) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 918cc51edc18..33cd93852e32 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2201,7 +2201,7 @@ void SfxViewFrame::ExecView_Impl TODO: export special helper "framework::FrameListAnalyzer" within the framework module and use it here. */ -bool impl_maxOpenDocCountReached() +static bool impl_maxOpenDocCountReached() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); boost::optional<sal_Int32> x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext)); @@ -2399,7 +2399,7 @@ void SfxViewFrame::Resize( bool bForce ) #define LINE_SEP 0x0A -void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines ) +static void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 124ef2bd38e4..f00c976b5e9f 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -296,7 +296,7 @@ enum ETypeFamily E_OOO_DOC }; -OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , +static OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , ETypeFamily eTypeFamily) { try @@ -1769,7 +1769,7 @@ void SfxViewShell::RemoveContextMenuInterceptor_Impl( const uno::Reference< ui:: pImpl->aInterceptorContainer.removeInterface( xInterceptor ); } -void Change( Menu* pMenu, SfxViewShell* pView ) +static void Change( Menu* pMenu, SfxViewShell* pView ) { SfxDispatcher *pDisp = pView->GetViewFrame()->GetDispatcher(); sal_uInt16 nCount = pMenu->GetItemCount(); |