diff options
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/config/cache/cacheitem.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swffilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 2 | ||||
-rw-r--r-- | filter/source/flash/swfwriter2.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfgrprd.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ieps/ieps.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/ipict/shape.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 18 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 8 | ||||
-rw-r--r-- | filter/source/msfilter/msoleexp.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 12 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 24 | ||||
-rw-r--r-- | filter/source/msfilter/util.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 6 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 6 |
18 files changed, 58 insertions, 54 deletions
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index 1e3b9a42fc6a..a8ac838dee1e 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -112,7 +112,7 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa } -bool isSubSet(const css::uno::Any& aSubSet, +static bool isSubSet(const css::uno::Any& aSubSet, const css::uno::Any& aSet ) { const css::uno::Type& aT1 = aSubSet.getValueType(); diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index 8812065fd744..77ba50328163 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -183,7 +183,7 @@ FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxCon { } -OUString exportBackground(FlashExporter &aFlashExporter, const Reference< XDrawPage >& xDrawPage, const OUString& sPath, sal_uInt32 nPage, const char* suffix) +static OUString exportBackground(FlashExporter &aFlashExporter, const Reference< XDrawPage >& xDrawPage, const OUString& sPath, sal_uInt32 nPage, const char* suffix) { OUString filename = "slide" + OUString::number(nPage+1) + OUString::createFromAscii(suffix) + ".swf"; OUString fullpath = sPath + "/" + filename; @@ -207,7 +207,7 @@ OUString exportBackground(FlashExporter &aFlashExporter, const Reference< XDrawP } template <typename TYPE> -TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const sal_Char* name, TYPE def) +static TYPE findPropertyValue(const Sequence< PropertyValue >& aPropertySequence, const sal_Char* name, TYPE def) { TYPE temp = TYPE(); diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index e2478ffd6b96..6e6ea996b82f 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -94,7 +94,7 @@ Writer::~Writer() } -void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > const &xOut ) +static void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > const &xOut ) { sal_uInt32 nBufferSize = 64*1024; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 067f238bd31c..77af4c859fa6 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -353,7 +353,7 @@ void Writer::setClipping( const tools::PolyPolygon* pClipPolyPolygon ) // differences in font that actually require different glyphs to be defined, // and some that don't. This function is meant to capture all the differences // that we care about. -bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2) +static bool compare_fonts_for_me(const vcl::Font& rFont1, const vcl::Font& rFont2) { return rFont1.GetFamilyName() == rFont2.GetFamilyName() && rFont1.GetWeight() == rFont2.GetWeight() && diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index 512e34654753..2b7a4bbee717 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue ) +static sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue ) { sal_uInt16 nBits = 0; @@ -484,7 +484,7 @@ FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DH } -FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient ) +static FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient ) { switch( rGradient.GetStyle() ) { diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index 3ae2f7db8b5c..79520d18c655 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -27,7 +27,7 @@ // a 0-sign occurs; this function converts 0-signs to blanks and reads // a complete line until a cr/lf is found -OString DXFReadLine(SvStream& rIStm) +static OString DXFReadLine(SvStream& rIStm) { char buf[256 + 1]; bool bEnd = false; @@ -84,7 +84,7 @@ OString DXFReadLine(SvStream& rIStm) return aBuf.makeStringAndClear(); } -void DXFSkipLine(SvStream& rIStm) +static void DXFSkipLine(SvStream& rIStm) { while (rIStm.good()) { diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 6b047eef7ed5..cd247a23e110 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -408,7 +408,7 @@ static bool RenderAsBMP(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r // this method adds a replacement action containing the original wmf or tiff replacement, // so the original eps can be written when storing to ODF. -void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 nOrigPos, sal_uInt32 nPSSize, +static void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 nOrigPos, sal_uInt32 nPSSize, sal_uInt32 nPosWMF, sal_uInt32 nSizeWMF, sal_uInt32 nPosTIFF, sal_uInt32 nSizeTIFF ) { OString aComment("EPSReplacementGraphic"); @@ -449,7 +449,7 @@ void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 } //there is no preview -> make a red box -void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, +static void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, long nWidth, long nHeight, Graphic &rGraphic) { GDIMetaFile aMtf; diff --git a/filter/source/graphicfilter/ipict/shape.cxx b/filter/source/graphicfilter/ipict/shape.cxx index 772632041a51..f9bae2acd4eb 100644 --- a/filter/source/graphicfilter/ipict/shape.cxx +++ b/filter/source/graphicfilter/ipict/shape.cxx @@ -38,7 +38,7 @@ Here, we choose: namespace PictReaderShapePrivate { /** returns an inside rectangle knowing the penSize in order to obtain the ``correct'' position when we draw a frame in wide length*/ - tools::Rectangle contractRectangle(bool drawFrame, tools::Rectangle const &rect, Size const &pSize) { + static tools::Rectangle contractRectangle(bool drawFrame, tools::Rectangle const &rect, Size const &pSize) { if (!drawFrame) return rect; long penSize=(pSize.Width()+pSize.Height())/2; if (2*penSize > rect.Right()-rect.Left()) penSize = (rect.Right()-rect.Left()+1)/2; @@ -51,7 +51,7 @@ namespace PictReaderShapePrivate { namespace PictReaderShape { //--------- draws a horizontal/vertical/small line (by creating a "rectangle/polygon") --------- - bool drawLineHQ(VirtualDevice *dev, Point const &orig, Point const &dest, Size const &pSize) { + static bool drawLineHQ(VirtualDevice *dev, Point const &orig, Point const &dest, Size const &pSize) { long dir[2] = { dest.X()-orig.X(), dest.Y()-orig.Y() }; bool vertic = dir[0] == 0; bool horiz = dir[1] == 0; diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index b5951b441f9c..8eea3a8585ea 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -302,7 +302,9 @@ EscherProperties EscherPropertyContainer::GetOpts() const return aVector; } -extern "C" int EscherPropSortFunc( const void* p1, const void* p2 ) +extern "C" { + +static int EscherPropSortFunc( const void* p1, const void* p2 ) { sal_Int16 nID1 = static_cast<EscherPropSortStruct const *>(p1)->nPropId &~0xc000; sal_Int16 nID2 = static_cast<EscherPropSortStruct const *>(p2)->nPropId &~0xc000; @@ -315,6 +317,8 @@ extern "C" int EscherPropSortFunc( const void* p1, const void* p2 ) return 0; } +} + void EscherPropertyContainer::Commit( SvStream& rSt, sal_uInt16 nVersion, sal_uInt16 nRecType ) { rSt.WriteUInt16( ( nCountCount << 4 ) | ( nVersion & 0xf ) ).WriteUInt16( nRecType ).WriteUInt32( nCountSize ); @@ -1997,7 +2001,7 @@ when save as MS file, the connector must be convert to corresponding type. "standard" <-> "bentConnector2-5" "curve" <-> "curvedConnector2-5" */ -sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) +static sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) { int nRet = 0; switch ( rPoly.GetSize() ) @@ -2021,7 +2025,7 @@ sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly ) } // Adjust value decide the position which connector should turn a corner -sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex ) +static sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex ) { sal_uInt16 k = rPoly.GetSize(); OSL_ASSERT ( k >= ( 3 + nIndex ) ); @@ -2049,7 +2053,7 @@ sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex } -void lcl_Rotate(sal_Int32 nAngle, Point center, Point& pt) +static void lcl_Rotate(sal_Int32 nAngle, Point center, Point& pt) { nAngle = NormAngle36000(nAngle); @@ -2086,7 +2090,7 @@ void lcl_Rotate(sal_Int32 nAngle, Point center, Point& pt) Generally, draw the connector from top to bottom, from left to right when meet the adjust value, but when (X1>X2 or Y1>Y2),the draw director must be reverse, FlipV or FlipH should be set to true. */ -bool lcl_GetAngle(tools::Polygon &rPoly, ShapeFlag& rShapeFlags,sal_Int32& nAngle ) +static bool lcl_GetAngle(tools::Polygon &rPoly, ShapeFlag& rShapeFlags,sal_Int32& nAngle ) { Point aStart = rPoly[0]; Point aEnd = rPoly[rPoly.GetSize()-1]; @@ -2334,7 +2338,7 @@ sal_Int32 EscherPropertyContainer::GetValueForEnhancedCustomShapeParameter( cons return nValue; } -bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const drawing::EnhancedCustomShapeParameter& rParameter ) +static bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const drawing::EnhancedCustomShapeParameter& rParameter ) { bool bSpecial = false; nRetValue = 0; @@ -2384,7 +2388,7 @@ bool GetValueForEnhancedCustomShapeHandleParameter( sal_Int32& nRetValue, const return bSpecial; } -void ConvertEnhancedCustomShapeEquation( +static void ConvertEnhancedCustomShapeEquation( const SdrObjCustomShape& rSdrObjCustomShape, std::vector< EnhancedCustomShapeEquation >& rEquations, std::vector< sal_Int32 >& rEquationOrder ) diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index a28d7357bf68..0485d6f55930 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -1038,7 +1038,7 @@ ImplEESdrObject::~ImplEESdrObject() { } -basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape) +static basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference< XShape >& rxShape) { basegfx::B2DRange aRetval; diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 4b650c272c70..c484871dfe81 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -380,7 +380,7 @@ DffPropertyReader::~DffPropertyReader() } -SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) +static SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rRule ) { sal_uInt32 nRuleId; rIn.ReadUInt32( nRuleId ) @@ -1065,7 +1065,7 @@ struct ShadeColor ShadeColor( const Color& rC, double fR ) : aColor( rC ), fDist( fR ) {}; }; -void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& rProperties, SvStream& rIn, std::vector< ShadeColor >& rShadeColors ) +static void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& rProperties, SvStream& rIn, std::vector< ShadeColor >& rShadeColors ) { sal_uInt32 nPos = rIn.Tell(); if ( rProperties.IsProperty( DFF_Prop_fillShadeColors ) ) @@ -1098,7 +1098,7 @@ void GetShadeColors( const SvxMSDffManager& rManager, const DffPropertyReader& r rIn.Seek( nPos ); } -void ApplyRectangularGradientAsBitmap( const SvxMSDffManager& rManager, SvStream& rIn, SfxItemSet& rSet, const std::vector< ShadeColor >& rShadeColors, const DffObjData& rObjData, sal_Int32 nFix16Angle ) +static void ApplyRectangularGradientAsBitmap( const SvxMSDffManager& rManager, SvStream& rIn, SfxItemSet& rSet, const std::vector< ShadeColor >& rShadeColors, const DffObjData& rObjData, sal_Int32 nFix16Angle ) { Size aBitmapSizePixel( static_cast< sal_Int32 >( ( rObjData.aBoundRect.GetWidth() / 2540.0 ) * 90.0 ), // we will create a bitmap with 90 dpi static_cast< sal_Int32 >( ( rObjData.aBoundRect.GetHeight() / 2540.0 ) * 90.0 ) ); @@ -6927,7 +6927,7 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen, return false; } -const char* GetInternalServerName_Impl( const SvGlobalName& aGlobName ) +static const char* GetInternalServerName_Impl( const SvGlobalName& aGlobName ) { if ( aGlobName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_60 ) || aGlobName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_8 ) ) diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index e47470b27603..13b24f80e936 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; -SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName ) +static SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName ) { if ( aAppName == SvGlobalName( SO3_SM_CLASSID_60 ) ) return SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_8 ); @@ -66,7 +66,7 @@ SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName ) return SvGlobalName(); } -OUString GetStorageType( const SvGlobalName& aEmbName ) +static OUString GetStorageType( const SvGlobalName& aEmbName ) { if ( aEmbName == SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_8 ) ) return OUString( "LibreOffice.MathDocument.1" ); @@ -83,7 +83,7 @@ OUString GetStorageType( const SvGlobalName& aEmbName ) return OUString(); } -bool UseOldMSExport() +static bool UseOldMSExport() { uno::Reference< lang::XMultiServiceFactory > xProvider( configuration::theDefaultProvider::get( diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 92d4b98229d4..6e611824e163 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -68,7 +68,7 @@ OUString extractMacroName( const OUString& rMacroUrl ) return OUString(); } -OUString trimMacroName( const OUString& rMacroName ) +static OUString trimMacroName( const OUString& rMacroName ) { // the name may contain whitespaces and may be enclosed in apostrophs OUString aMacroName = rMacroName.trim(); @@ -78,7 +78,7 @@ OUString trimMacroName( const OUString& rMacroName ) return aMacroName; } -SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) +static SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) { SfxObjectShell* pFoundShell=nullptr; SfxObjectShell* pShell = SfxObjectShell::GetFirst(); @@ -173,7 +173,7 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath ) // sMod can be empty ( but we really need the library to search in ) // if sMod is empty and a macro is found then sMod is updated // if sMod is empty, only standard modules will be searched (no class, document, form modules) -bool hasMacro( SfxObjectShell const * pShell, const OUString& sLibrary, OUString& sMod, const OUString& sMacro ) +static bool hasMacro( SfxObjectShell const * pShell, const OUString& sLibrary, OUString& sMod, const OUString& sMacro ) { bool bFound = false; @@ -236,7 +236,7 @@ OUString getDefaultProjectName( SfxObjectShell const * pShell ) return aPrjName; } -void parseMacro( const OUString& sMacro, OUString& sContainer, OUString& sModule, OUString& sProcedure ) +static void parseMacro( const OUString& sMacro, OUString& sContainer, OUString& sModule, OUString& sProcedure ) { sal_Int32 nMacroDot = sMacro.lastIndexOf( '.' ); @@ -603,7 +603,7 @@ OUString SAL_CALL VBAMacroResolver::resolveScriptURLtoVBAMacro( const OUString& throw uno::RuntimeException(); } -bool getModifier( sal_Unicode c, sal_uInt16& mod ) +static bool getModifier( sal_Unicode c, sal_uInt16& mod ) { if ( c == '+' ) { mod |= KEY_SHIFT; @@ -619,7 +619,7 @@ bool getModifier( sal_Unicode c, sal_uInt16& mod ) } /// @throws uno::RuntimeException -sal_uInt16 parseChar( sal_Unicode c ) +static sal_uInt16 parseChar( sal_Unicode c ) { sal_uInt16 nVclKey = 0; // do we care about locale here for letters/digits? probably not diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6d891d6ad06c..f15f4b245900 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1766,7 +1766,7 @@ void PPTConvertOCXControls::GetDrawPage() } } -bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32 nInputSize ) +static bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32 nInputSize ) { sal_uInt32 nOldPos = rInput.Tell(); std::unique_ptr<char[]> pBuf(new char[ nInputSize ]); @@ -2669,7 +2669,7 @@ SdrPage* SdrPowerPointImport::MakeBlancPage( bool bMaster ) const return pRet; } -void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage* pPage, DffRecordHeader const & rComment10Hd ) +static void ImportComment10( SvxMSDffManager const & rMan, SvStream& rStCtrl, SdrPage* pPage, DffRecordHeader const & rComment10Hd ) { OUString sAuthor; OUString sText; @@ -7144,14 +7144,14 @@ PPTTextObj& PPTTextObj::operator=( PPTTextObj& rTextObj ) return *this; } -bool IsLine( const SdrObject* pObj ) +static bool IsLine( const SdrObject* pObj ) { return dynamic_cast< const SdrPathObj* >(pObj) != nullptr && static_cast<const SdrPathObj*>(pObj)->IsLine() && static_cast<const SdrPathObj*>(pObj)->GetPointCount() == 2; } -bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns, +static bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns, sal_Int32& nTableIndex, sal_Int32& nRow, sal_Int32& nRowCount, sal_Int32& nColumn, sal_Int32& nColumnCount ) { tools::Rectangle aSnapRect( pObj->GetSnapRect() ); @@ -7194,7 +7194,7 @@ bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, #define LinePositionBLTR 0x20000000 -void GetRowPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int32 >& rRows, +static void GetRowPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns, std::vector< sal_Int32 >& rPositions, sal_Int32 nColumn, sal_Int32 nFlags ) { std::set< sal_Int32 >::const_iterator aRow( rRows.find( rSnapRect.Top() ) ); @@ -7215,7 +7215,7 @@ void GetRowPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int } -void GetColumnPositions( const tools::Rectangle& rSnapRect, +static void GetColumnPositions( const tools::Rectangle& rSnapRect, const std::set< sal_Int32 >& rColumns, std::vector< sal_Int32 >& rPositions, sal_Int32 nRow, sal_Int32 nFlags ) { std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( rSnapRect.Left() ) ); @@ -7235,7 +7235,7 @@ void GetColumnPositions( const tools::Rectangle& rSnapRect, } } -void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns, +static void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 >& rRows, const std::set< sal_Int32 >& rColumns, std::vector< sal_Int32 >& rPositions, const tools::Rectangle& rGroupSnap ) { tools::Rectangle aSnapRect( pObj->GetSnapRect() ); @@ -7301,7 +7301,7 @@ void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 >& rRows } } -void CreateTableRows( const Reference< XTableRows >& xTableRows, const std::set< sal_Int32 >& rRows, sal_Int32 nTableBottom ) +static void CreateTableRows( const Reference< XTableRows >& xTableRows, const std::set< sal_Int32 >& rRows, sal_Int32 nTableBottom ) { if ( rRows.size() > 1 ) xTableRows->insertByIndex( 0, rRows.size() - 1 ); @@ -7328,7 +7328,7 @@ void CreateTableRows( const Reference< XTableRows >& xTableRows, const std::set< } } -void CreateTableColumns( const Reference< XTableColumns >& xTableColumns, const std::set< sal_Int32 >& rColumns, sal_Int32 nTableRight ) +static void CreateTableColumns( const Reference< XTableColumns >& xTableColumns, const std::set< sal_Int32 >& rColumns, sal_Int32 nTableRight ) { if ( rColumns.size() > 1 ) xTableColumns->insertByIndex( 0, rColumns.size() - 1 ); @@ -7355,7 +7355,7 @@ void CreateTableColumns( const Reference< XTableColumns >& xTableColumns, const } } -void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) +static void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan ) { DBG_ASSERT( (nColSpan > 1) || (nRowSpan > 1), "nonsense parameter!!" ); DBG_ASSERT( (nCol >= 0) && (nCol < xTable->getColumnCount()) && (nRow >= 0) && (nRow < xTable->getRowCount()), "the cell does not exists!!" ); @@ -7374,7 +7374,7 @@ void MergeCells( const Reference< XTable >& xTable, sal_Int32 nCol, sal_Int32 nR } } -void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const & xCell ) +static void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const & xCell ) { try { @@ -7476,7 +7476,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell > const & xCel } } -void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable > const & xTable, const std::vector< sal_Int32 >& vPositions, sal_Int32 nColumns ) +static void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable > const & xTable, const std::vector< sal_Int32 >& vPositions, sal_Int32 nColumns ) { try { diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index 9335cc4d2b00..2764dfc2fb23 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -453,7 +453,7 @@ bool WW8ReadFieldParams::GetTokenSttFromTo(sal_Int32* pFrom, sal_Int32* pTo, sal return nStart && nEnd && (nMax >= nStart) && (nMax >= nEnd); } -EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam) +static EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam) { EquationResult aResult; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 59aca05f0efb..bbedad6c6f80 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -43,7 +43,7 @@ #include <com/sun/star/security/DocumentDigitalSignatures.hpp> #include <com/sun/star/security/XCertificate.hpp> -OUString PDFFilterResId(const char* pId) +static OUString PDFFilterResId(const char* pId) { return Translate::get(pId, Translate::Create("flt")); } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index fa0958decc10..ac9550d7c6ca 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -302,7 +302,7 @@ public: }; -bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField ) +static bool operator==( const TextField & aLhsTextField, const TextField & aRhsTextField ) { return aLhsTextField.equalTo( aRhsTextField ); } @@ -439,7 +439,7 @@ BitmapChecksum GetBitmapChecksum( const MetaAction* pAction ) } // end anonymous namespace -void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) +static void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt ) { const MetaActionType nType = pAction->GetType(); switch( nType ) @@ -878,7 +878,7 @@ bool SVGFilter::implExportDocument() /// Append aField to aFieldSet if it is not already present in the set and create the field id sFieldId template< typename TextFieldType > -OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet, +static OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet, const TextFieldType & aField, const OUString & sOOOElemField, const Reference< css::drawing::XDrawPage >& xMasterPage ) diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 0e55cd318141..ffa2eebdcf7b 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -164,20 +164,20 @@ void SAL_CALL XMLFilterDialogComponent::release() throw () } /// @throws RuntimeException -OUString XMLFilterDialogComponent_getImplementationName() +static OUString XMLFilterDialogComponent_getImplementationName() { return OUString( "com.sun.star.comp.ui.XSLTFilterDialog" ); } /// @throws RuntimeException -Sequence< OUString > XMLFilterDialogComponent_getSupportedServiceNames() +static Sequence< OUString > XMLFilterDialogComponent_getSupportedServiceNames() { Sequence< OUString > aSupported { "com.sun.star.ui.dialogs.XSLTFilterDialog" }; return aSupported; } /// @throws Exception -Reference< XInterface > XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) +static Reference< XInterface > XMLFilterDialogComponent_createInstance( const Reference< XMultiServiceFactory > & rSMgr) { return static_cast<OWeakObject*>(new XMLFilterDialogComponent( comphelper::getComponentContext(rSMgr) )); } |