diff options
Diffstat (limited to 'sd/source/filter')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptinanimations.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 4 |
6 files changed, 11 insertions, 7 deletions
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) { |