diff options
Diffstat (limited to 'filter/source/msfilter/escherex.cxx')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
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 ) |