diff options
Diffstat (limited to 'sd')
36 files changed, 57 insertions, 53 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index c39f13a490d8..046c9f0734a2 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -93,7 +93,7 @@ bool checkBeginWithNumber(const OUString& rStr) #define CPPUNIT_ASSERT_MOTIONPATH(expect, actual) \ assertMotionPath(expect, actual, CPPUNIT_SOURCELINE()) -void assertMotionPath(const OUString &rStr1, const OUString &rStr2, const CppUnit::SourceLine &rSourceLine) +static void assertMotionPath(const OUString &rStr1, const OUString &rStr2, const CppUnit::SourceLine &rSourceLine) { sal_Int32 nIdx1 = 0; sal_Int32 nIdx2 = 0; @@ -496,7 +496,7 @@ void SdOOXMLExportTest2::testTdf91378() xDocShRef->DoClose(); } -bool checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> const & xDoc, sal_Int32 nSlideNumber, +static bool checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> const & xDoc, sal_Int32 nSlideNumber, sal_Int16 nExpectedTransitionType, sal_Int16 nExpectedTransitionSubType, bool bExpectedDirection = true) { diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 2427b3dbdc20..cb06f043a0aa 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -93,7 +93,7 @@ using namespace ::com::sun::star; namespace com { namespace sun { namespace star { namespace uno { template<class T> -std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xRef) +static std::ostream& operator<<(std::ostream& rStrm, const uno::Reference<T>& xRef) { rStrm << xRef.get(); return rStrm; diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 369de3136adb..715cf2f6d5a8 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -390,7 +390,7 @@ const deprecated_AnimationEffect_conversion_table[] = { AnimationEffect_NONE, nullptr, nullptr } }; -EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem ) +static EffectSequence::iterator ImplFindEffect( MainSequencePtr const & pMainSequence, const Reference< XShape >& rShape, sal_Int16 nSubItem ) { EffectSequence::iterator aIter; @@ -1318,7 +1318,7 @@ void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj const * pPa } // #i42894# helper which creates the needed XAnimate for changing visibility and all the (currently) needed embeddings -void createVisibilityOnOffNode(Reference< XTimeContainer > const & rxParentContainer, SdrObject& rCandidate, bool bVisible, bool bOnClick, double fDuration) +static void createVisibilityOnOffNode(Reference< XTimeContainer > const & rxParentContainer, SdrObject& rCandidate, bool bVisible, bool bOnClick, double fDuration) { Reference< XMultiServiceFactory > xMsf(::comphelper::getProcessServiceFactory()); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 74373005298a..7173959d0572 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1340,7 +1340,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnl * If rLayoutName is empty, the first master page is used. */ // #i121863# factored out functionality -bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const OUString& rCandidate) +static bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const OUString& rCandidate) { if (rCandidate.isEmpty()) { @@ -1367,7 +1367,7 @@ bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const OUString& rC } // #i121863# factored out functinality -OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc) +static OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc) { const OUString aBaseName(SdResId(STR_LAYOUT_DEFAULT_NAME)); sal_uInt16 nCount(0); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7f9c18e72978..3901a13c008d 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1272,7 +1272,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout ) return aLayouts[ eLayout - AUTOLAYOUT_START ]; } -rtl::OUString enumtoString(AutoLayout aut) +static rtl::OUString enumtoString(AutoLayout aut) { rtl::OUString retstr; switch (aut) @@ -1435,7 +1435,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r } } -void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescriptor, std::vector< SdrObject* >& rShapes, bool bInit, bool bSwitchLayout ) +static void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescriptor, std::vector< SdrObject* >& rShapes, bool bInit, bool bSwitchLayout ) { int i; @@ -2074,7 +2074,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const ::tools::Rectangle& rN } } -SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, PresObjKind& eObjKind, bool bVertical, const ::tools::Rectangle& rRect) +static SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, PresObjKind& eObjKind, bool bVertical, const ::tools::Rectangle& rRect) { SdDrawDocument& rModel(static_cast< SdDrawDocument& >(rPage.getSdrModelFromSdrPage())); if( !pSourceObj ) diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 9cfc8dfcdb47..584a84dd3207 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -105,7 +105,7 @@ public: SdDrawDocument* GetDoc() { return m_xImpl->mpDoc; } }; -const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() +static const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap() { static const SfxItemPropertyMapEntry aSdTextPortionPropertyEntries[] = { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 1ec8b3d11d75..230797458c05 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -163,7 +163,7 @@ void PPTWriter::exportPPTPost( ) mbStatus = true; }; -void ImplExportComments( const uno::Reference< drawing::XDrawPage >& xPage, SvMemoryStream& rBinaryTagData10Atom ); +static void ImplExportComments( const uno::Reference< drawing::XDrawPage >& xPage, SvMemoryStream& rBinaryTagData10Atom ); void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, bool bHasBackground, Reference< XPropertySet > const & aXBackgroundPropSet ) diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 7d5040e8664d..f5df6e331b8a 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -3008,7 +3008,7 @@ bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 n } //get merged cell's width -sal_Int32 GetCellRight( sal_Int32 nColumn, +static sal_Int32 GetCellRight( sal_Int32 nColumn, ::tools::Rectangle const & rect, std::vector< std::pair< sal_Int32, sal_Int32 > >& aColumns, uno::Reference< table::XMergeableCell > const & xCell ) @@ -3025,7 +3025,7 @@ sal_Int32 GetCellRight( sal_Int32 nColumn, return nRight; } //get merged cell's height -sal_Int32 GetCellBottom( sal_Int32 nRow, +static sal_Int32 GetCellBottom( sal_Int32 nRow, ::tools::Rectangle const & rect, std::vector< std::pair< sal_Int32, sal_Int32 > >& aRows, uno::Reference< table::XMergeableCell > const & xCell ) diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 70a2286eb031..f0211dd9c728 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::presentation; namespace ppt { -void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMode ) +static void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMode ) { if ( eTranslateMode != TRANSLATE_NONE ) { diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 79df8be785cf..7968a60d0054 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -77,6 +77,10 @@ const char* const aPageHelpIds[NOOFPAGES] = HID_SD_HTMLEXPORT_PAGE6 }; +static SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign); + +static SvStream& WriteSdPublishingDesign(SvStream& rOut, const SdPublishingDesign& rDesign); + // This class has all the settings for the HTML-export autopilot class SdPublishingDesign { diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 8e553159d968..5c600a3629f0 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -87,7 +87,7 @@ using namespace ::com::sun::star::presentation; namespace ppt { -SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) +static SvStream& operator>>(SvStream& rIn, AnimationNode& rNode ) { rIn.ReadInt32( rNode.mnU1 ); rIn.ReadInt32( rNode.mnRestart ); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 687c46591774..eb2a7d2f66db 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -147,7 +147,7 @@ struct XML_SERVICES const sal_Char* mpSettings; }; -XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) +static XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) { static XML_SERVICES gServices[] = { @@ -416,7 +416,7 @@ ErrCode ReadThroughComponent( //But there exist documents which were saved previous to that modification //so here we detect such cases and fix them up to ensure the previews //numbering level matches that of the outline level it previews -void fixupOutlinePlaceholderNumberingDepths(SdDrawDocument* pDoc) +static void fixupOutlinePlaceholderNumberingDepths(SdDrawDocument* pDoc) { for (sal_uInt16 i = 0; i < pDoc->GetMasterSdPageCount(PageKind::Standard); ++i) { diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 835ef4a08828..016f6a4a2df5 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -26,7 +26,7 @@ namespace accessibility { -AccessibleShape* +static AccessibleShape* CreateSdAccessibleShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo, diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index d759a36a6737..c896d0003587 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -759,7 +759,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect ) } } -void selectShape( SvTreeListBox* pTreeList, const Reference< XShape >& xShape ) +static void selectShape( SvTreeListBox* pTreeList, const Reference< XShape >& xShape ) { CustomAnimationListEntry* pEntry = static_cast< CustomAnimationListEntry* >(pTreeList->First()); while( pEntry ) diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index ca2a57dc099a..6fa5f9aefeb0 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -917,7 +917,7 @@ void CustomAnimationPane::UpdateLook() } } -void addValue( std::unique_ptr<STLPropertySet>& pSet, sal_Int32 nHandle, const Any& rValue ) +static void addValue( std::unique_ptr<STLPropertySet>& pSet, sal_Int32 nHandle, const Any& rValue ) { switch( pSet->getPropertyState( nHandle ) ) { @@ -1703,7 +1703,7 @@ void CustomAnimationPane::onChangeCurrentPage() } } -bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::vector< sal_Int16 >& rParaList ) +static bool getTextSelection( const Any& rSelection, Reference< XShape >& xShape, std::vector< sal_Int16 >& rParaList ) { Reference< XTextRange > xSelectedText; rSelection >>= xSelectedText; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index e8f518582ef1..d6ddd78d23cd 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -99,7 +99,7 @@ using namespace ::com::sun::star::text; namespace sd { -Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color const &aFront, Color const &aBack ) +static Color ColorFromAlphaColor(sal_uInt8 aTransparency, Color const &aFront, Color const &aBack ) { return Color(static_cast<sal_uInt8>(aFront.GetRed() * aTransparency/double(255) + aBack.GetRed() * (1-aTransparency/double(255))), static_cast<sal_uInt8>(aFront.GetGreen() * aTransparency/double(255) + aBack.GetGreen() * (1-aTransparency/double(255))), diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index a00c357f7f08..f2c2414fdb46 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -34,7 +34,7 @@ using namespace ::utl; using namespace ::com::sun::star::uno; -template< class T > T getSafeValue( const Any& rAny ) +template< class T > static T getSafeValue( const Any& rAny ) { T value = T(); bool bOk = (rAny >>= value); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 3b9510fc36c2..de4b927bb8a5 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -304,26 +304,26 @@ void LayoutToolbarMenu::SelectHdl(void const * pControl) } /// @throws css::uno::RuntimeException -OUString SlideLayoutController_getImplementationName() +static OUString SlideLayoutController_getImplementationName() { return OUString( "com.sun.star.comp.sd.SlideLayoutController" ); } /// @throws RuntimeException -Sequence< OUString > SlideLayoutController_getSupportedServiceNames() +static Sequence< OUString > SlideLayoutController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; } /// @throws css::uno::RuntimeException -OUString InsertSlideController_getImplementationName() +static OUString InsertSlideController_getImplementationName() { return OUString( "com.sun.star.comp.sd.InsertSlideController" ); } /// @throws RuntimeException -Sequence< OUString > InsertSlideController_getSupportedServiceNames() +static Sequence< OUString > InsertSlideController_getSupportedServiceNames() { Sequence<OUString> aSNS { "com.sun.star.frame.ToolbarController" }; return aSNS; diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 1f15efe8c0bd..2daabfb4cab2 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -30,7 +30,7 @@ namespace sd { SFX_IMPL_CHILDWINDOWCONTEXT(NavigatorChildWindow, SID_NAVIGATOR) -void RequestNavigatorUpdate (SfxBindings const * pBindings) +static void RequestNavigatorUpdate (SfxBindings const * pBindings) { if (pBindings != nullptr && pBindings->GetDispatcher() != nullptr) diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 1cca1e11aa62..bc7c814d562a 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -501,7 +501,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) /** * set line starts and ends for the object to be created */ -::basegfx::B2DPolyPolygon getPolygon(const char* pResId, const SdrModel& rModel) +static ::basegfx::B2DPolyPolygon getPolygon(const char* pResId, const SdrModel& rModel) { ::basegfx::B2DPolyPolygon aRetval; XLineEndListRef pLineEndList(rModel.GetLineEndList()); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index f05b6055de57..2390e16eb828 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -183,7 +183,7 @@ void FuMorph::DoExecute( SfxRequest& ) } } -::basegfx::B2DPolygon ImpGetExpandedPolygon( +static ::basegfx::B2DPolygon ImpGetExpandedPolygon( const ::basegfx::B2DPolygon& rCandidate, sal_uInt32 nNum ) diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 5376b61e6588..c5b38dba95be 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -84,7 +84,7 @@ namespace sd { #define MAXWIDTH 28350 -void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) +static void mergeItemSetsImpl( SfxItemSet& rTarget, const SfxItemSet& rSource ) { const sal_uInt16* pPtr = rSource.GetRanges(); sal_uInt16 p1, p2; diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 75896752ca1e..c3cd93d73c6a 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -870,13 +870,13 @@ registerWithDefaultAdapter( DBusConnection *pConnection ) return pService; } -void ProfileUnregisterFunction +static void ProfileUnregisterFunction (DBusConnection *, void *) { // We specifically don't need to do anything here. } -DBusHandlerResult ProfileMessageFunction +static DBusHandlerResult ProfileMessageFunction (DBusConnection *pConnection, DBusMessage *pMessage, void *user_data) { SAL_INFO("sdremote.bluetooth", "ProfileMessageFunction||" << dbus_message_get_interface(pMessage) << "||" << dbus_message_get_member(pMessage)); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index f2ae67cb306e..abe81bd05ae3 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -94,7 +94,7 @@ namespace { }; } -const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() +static const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap() { // NOTE: First member must be sorted static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] = diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 79738a04389d..ba4237082110 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -665,7 +665,7 @@ void SelectionFunction::ProcessEvent (EventDescriptor& rDescriptor) pModeHandler->ProcessEvent(rDescriptor); } -bool Match ( +static bool Match ( const sal_uInt32 nEventCode, const sal_uInt32 nPositivePattern) { diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index b2eb097bbad5..736760e7aefb 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -33,7 +33,7 @@ namespace sd { namespace slidesorter { namespace view { const static Color Black = Color(0x000000); const static Color White = Color(0xffffff); -Color ChangeLuminance (Color aColor, const int nValue) +static Color ChangeLuminance (Color aColor, const int nValue) { if (nValue > 0) aColor.IncreaseLuminance(nValue); @@ -42,7 +42,7 @@ Color ChangeLuminance (Color aColor, const int nValue) return aColor; } -Color HGBAdapt ( +static Color HGBAdapt ( const Color aColor, const sal_Int32 nNewSaturation, const sal_Int32 nNewBrightness) diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index a752b7407a70..3c1a0ed4e7a5 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -576,7 +576,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe } } -const BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark ) +static const BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark ) { CellInfoVector aCellInfoVector(sdr::table::style_count); FillCellInfoVector( xTableStyle, aCellInfoVector ); diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 6dc303791f8f..5eec0ffda4c3 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -149,7 +149,7 @@ enum SdDocumentSettingsPropertyHandles #define MID_PRINTER 1 - rtl::Reference<PropertySetInfo> createSettingsInfoImpl( bool bIsDraw ) + static rtl::Reference<PropertySetInfo> createSettingsInfoImpl( bool bIsDraw ) { static PropertyMapEntry const aImpressSettingsInfoMap[] = { diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index a3ae65fec939..2096f4be704e 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star; #define WID_LAYER_TITLE 5 #define WID_LAYER_DESC 6 -const SvxItemPropertySet* ImplGetSdLayerPropertySet() +static const SvxItemPropertySet* ImplGetSdLayerPropertySet() { static const SfxItemPropertyMapEntry aSdLayerPropertyMap_Impl[] = { diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index c1930c454166..2ba00268001c 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -198,7 +198,7 @@ const sal_uInt16 WID_MODEL_DIALOGLIBS = 12; const sal_uInt16 WID_MODEL_FONTS = 13; const sal_uInt16 WID_MODEL_INTEROPGRABBAG = 14; -const SvxItemPropertySet* ImplGetDrawModelPropertySet() +static const SvxItemPropertySet* ImplGetDrawModelPropertySet() { // Attention: the first parameter HAS TO BE sorted!!! const static SfxItemPropertyMapEntry aDrawModelPropertyMap_Impl[] = @@ -1555,7 +1555,7 @@ ImplRenderPaintProc::ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* { } -sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument const & rDoc ) +static sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument const & rDoc ) { sal_Int32 nPage = -1; @@ -1581,7 +1581,7 @@ sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument cons return nPage; } -void ImplPDFExportComments( const uno::Reference< drawing::XDrawPage >& xPage, vcl::PDFExtOutDevData& rPDFExtOutDevData ) +static void ImplPDFExportComments( const uno::Reference< drawing::XDrawPage >& xPage, vcl::PDFExtOutDevData& rPDFExtOutDevData ) { try { @@ -1618,7 +1618,7 @@ void ImplPDFExportComments( const uno::Reference< drawing::XDrawPage >& xPage, v } } -void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape >& xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData ) +static void ImplPDFExportShapeInteraction( const uno::Reference< drawing::XShape >& xShape, SdDrawDocument& rDoc, vcl::PDFExtOutDevData& rPDFExtOutDevData ) { if ( xShape->getShapeType() == "com.sun.star.drawing.GroupShape" ) { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index f3641695697e..95aec6b9b17e 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -99,7 +99,7 @@ enum WID_PAGE static sal_Char const sEmptyPageName[sizeof("page")] = "page"; // this function stores the property maps for draw pages in impress and draw -const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind ) +static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind ) { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { @@ -255,7 +255,7 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP } /** this function stores the property map for master pages in impress and draw */ -const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) +static const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] = { diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 33573b3bea49..6b91088aeab2 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace ::cppu; using namespace ::comphelper; -LanguageType SdUnoGetLanguage( const lang::Locale& rLocale ) +static LanguageType SdUnoGetLanguage( const lang::Locale& rLocale ) { // empty language -> LANGUAGE_SYSTEM if ( rLocale.Language.getLength() == 0 ) diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 7233d37d3b77..d4c65435fd1a 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; #define WID_SEARCH_CASE 1 #define WID_SEARCH_WORDS 2 -const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap() +static const SfxItemPropertyMapEntry* ImplGetSearchPropertyMap() { static const SfxItemPropertyMapEntry aSearchPropertyMap_Impl[] = { diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index ce0d879415c8..2ed053c37beb 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -111,7 +111,7 @@ using namespace ::com::sun::star::linguistic2; current clipboard content and the DrawViewShell. The list is stored in a new instance of SvxClipboardFormatItem. */ -::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats ( +static ::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats ( TransferableDataHelper& rDataHelper) { ::std::unique_ptr<SvxClipboardFormatItem> pResult ( diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 6245206d2c0a..fbd489a74c98 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -105,7 +105,7 @@ namespace sd { // Permanent Functions -void ImpAddPrintableCharactersToTextEdit(SfxRequest const & rReq, ::sd::View* pView) +static void ImpAddPrintableCharactersToTextEdit(SfxRequest const & rReq, ::sd::View* pView) { // evtl. feed characters to activated textedit const SfxItemSet* pSet = rReq.GetArgs(); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 1245065e6814..1506542b30c8 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -104,7 +104,7 @@ struct ImpRememberOrigAndClone SdrObject* pClone; }; -SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>& aConnectorContainer, SdrObject const * pConnObj) +static SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>& aConnectorContainer, SdrObject const * pConnObj) { for(ImpRememberOrigAndClone* p : aConnectorContainer) { @@ -115,7 +115,7 @@ SdrObject* ImpGetClone(std::vector<ImpRememberOrigAndClone*>& aConnectorContaine } // restrict movement to WorkArea -void ImpCheckInsertPos(Point& rPos, const Size& rSize, const ::tools::Rectangle& rWorkArea) +static void ImpCheckInsertPos(Point& rPos, const Size& rSize, const ::tools::Rectangle& rWorkArea) { if(!rWorkArea.IsEmpty()) { |