diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-15 19:13:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-17 09:05:38 +0200 |
| commit | 206b5b2661be37efdff3c6aedb6f248c4636be79 (patch) | |
| tree | af385e5b4725dcfea23988d9113cced8e9ccaf3c /svx | |
| parent | a85d3ba1c0de313b60324b9ecfa488bb99d69d06 (diff) | |
New loplugin:external
...warning about (for now only) functions and variables with external linkage
that likely don't need it.
The problems with moving entities into unnamed namespacs and breaking ADL
(as alluded to in comments in compilerplugins/clang/external.cxx) are
illustrated by the fact that while
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
returns 1, both moving just the struct S2 into an nunnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
namespace { struct S2: S1 { int f() { return 1; } }; }
int f(S2 s) { return s.f(); }
}
int main() { return f(N::S2()); }
as well as moving just the function f overload into an unnamed namespace,
struct S1 { int f() { return 0; } };
int f(S1 s) { return s.f(); }
namespace N {
struct S2: S1 { int f() { return 1; } };
namespace { int f(S2 s) { return s.f(); } }
}
int main() { return f(N::S2()); }
would each change the program to return 0 instead.
Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c
Reviewed-on: https://gerrit.libreoffice.org/60539
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx')
52 files changed, 137 insertions, 130 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 821c921d6336..9f622b696cd5 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -78,7 +78,7 @@ namespace accessibility // AccessibleTextHelper_Impl declaration template < typename first_type, typename second_type > - ::std::pair< first_type, second_type > makeSortedPair( first_type first, + static ::std::pair< first_type, second_type > makeSortedPair( first_type first, second_type second ) { if( first > second ) diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 376c6e0ad24f..cf0dc4a155d8 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -41,7 +41,7 @@ ShapeTypeHandler* ShapeTypeHandler::instance = nullptr; // Create an empty reference to an accessible object. -AccessibleShape* +static AccessibleShape* CreateEmptyShapeReference ( const AccessibleShapeInfo& /*rShapeInfo*/, const AccessibleShapeTreeInfo& /*rShapeTreeInfo*/, diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index fb53f41c52ed..9677eb869b3f 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -27,7 +27,7 @@ namespace accessibility { -AccessibleShape* CreateSvxAccessibleShape ( +static AccessibleShape* CreateSvxAccessibleShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo, ShapeTypeId nId) diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 7e2111f0dc07..0cb389a9d488 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -2049,7 +2049,7 @@ void EnhancedCustomShape2d::CreateSubPath( } } -void CorrectCalloutArrows( +static void CorrectCalloutArrows( MSO_SPT eSpType, sal_uInt32 nLineObjectCount, std::vector< std::pair< SdrPathObj*, double> >& vObjectList ) diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 48bbb91e81f5..ac559be40f63 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -146,7 +146,7 @@ static bool InitializeFontWorkData( return bNoErr; } -double GetLength( const tools::Polygon& rPolygon ) +static double GetLength( const tools::Polygon& rPolygon ) { double fLength = 0; if ( rPolygon.GetSize() > 1 ) @@ -161,7 +161,7 @@ double GetLength( const tools::Polygon& rPolygon ) /* CalculateHorizontalScalingFactor returns the horizontal scaling factor for the whole text object, so that each text will match its corresponding 2d Outline */ -void CalculateHorizontalScalingFactor( +static void CalculateHorizontalScalingFactor( const SdrObjCustomShape& rSdrObjCustomShape, FWData& rFWData, const tools::PolyPolygon& rOutline2d) @@ -259,7 +259,7 @@ void CalculateHorizontalScalingFactor( rFWData.fHorizontalTextScaling = fScalingFactor; } -void GetTextAreaOutline( +static void GetTextAreaOutline( const FWData& rFWData, const SdrObjCustomShape& rSdrObjCustomShape, FWTextArea& rTextArea, @@ -468,7 +468,7 @@ void GetTextAreaOutline( } } -bool GetFontWorkOutline( +static bool GetFontWorkOutline( FWData& rFWData, const SdrObjCustomShape& rSdrObjCustomShape) { @@ -617,7 +617,7 @@ bool GetFontWorkOutline( return true; } -basegfx::B2DPolyPolygon GetOutlinesFromShape2d( const SdrObject* pShape2d ) +static basegfx::B2DPolyPolygon GetOutlinesFromShape2d( const SdrObject* pShape2d ) { basegfx::B2DPolyPolygon aOutlines2d; @@ -639,7 +639,7 @@ basegfx::B2DPolyPolygon GetOutlinesFromShape2d( const SdrObject* pShape2d ) return aOutlines2d; } -void CalcDistances( const tools::Polygon& rPoly, std::vector< double >& rDistances ) +static void CalcDistances( const tools::Polygon& rPoly, std::vector< double >& rDistances ) { sal_uInt16 i, nCount = rPoly.GetSize(); if ( nCount > 1 ) @@ -661,7 +661,7 @@ void CalcDistances( const tools::Polygon& rPoly, std::vector< double >& rDistanc } } -void InsertMissingOutlinePoints( const std::vector< double >& rDistances, +static void InsertMissingOutlinePoints( const std::vector< double >& rDistances, const tools::Rectangle& rTextAreaBoundRect, tools::Polygon& rPoly ) { sal_uInt16 nSize = rPoly.GetSize(); @@ -715,7 +715,7 @@ void InsertMissingOutlinePoints( const std::vector< double >& rDistances, } } -void GetPoint( const tools::Polygon& rPoly, const std::vector< double >& rDistances, const double& fX, double& fx1, double& fy1 ) +static void GetPoint( const tools::Polygon& rPoly, const std::vector< double >& rDistances, const double& fX, double& fx1, double& fy1 ) { fy1 = fx1 = 0.0; if ( rPoly.GetSize() > 1 ) @@ -743,7 +743,7 @@ void GetPoint( const tools::Polygon& rPoly, const std::vector< double >& rDistan } } -void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWData& rFWData ) +static void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWData& rFWData ) { std::vector< FWTextArea >::iterator aTextAreaIter = rFWData.vTextAreas.begin(); std::vector< FWTextArea >::iterator aTextAreaIEnd = rFWData.vTextAreas.end(); @@ -911,7 +911,7 @@ void FitTextOutlinesToShapeOutlines( const tools::PolyPolygon& aOutlines2d, FWDa } } -SdrObject* CreateSdrObjectFromParagraphOutlines( +static SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const SdrObjCustomShape& rSdrObjCustomShape) { diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9621a0c03fab..d7265a42447d 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -828,7 +828,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, } -short impl_askUserForWizardCancel(weld::Widget* pParent, const char* pRes) +static short impl_askUserForWizardCancel(weld::Widget* pParent, const char* pRes) { std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(pParent, VclMessageType::Question, VclButtonsType::YesNo, SvxResId(pRes))); diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index fd5681a634d9..2f069e1dad72 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -351,7 +351,7 @@ struct ExtendSet ExtendSet() : mfExtLeft(0.0), mfExtRight(0.0) {} }; -void getCutSet( +static void getCutSet( CutSet& rCutSet, const basegfx::B2DPoint& rLeft, const basegfx::B2DPoint& rRight, @@ -393,7 +393,7 @@ void getCutSet( &rCutSet.mfORMR); } -void getExtends( +static void getExtends( std::vector<ExtendSet>& rExtendSet, // target Left/Right values to fill const basegfx::B2DPoint& rOrigin, // own vector start const StyleVectorCombination& rCombination, // own vector and offsets for lines diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 5b24b6d75c45..4a1af71a7dca 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -147,7 +147,7 @@ void Cell::MirrorSelfX() } -void lclRecalcCoordVec( std::vector<long>& rCoords, const std::vector<long>& rSizes ) +static void lclRecalcCoordVec( std::vector<long>& rCoords, const std::vector<long>& rSizes ) { DBG_ASSERT( rCoords.size() == rSizes.size() + 1, "lclRecalcCoordVec - inconsistent vectors" ); auto aCIt = rCoords.begin(); @@ -158,7 +158,7 @@ void lclRecalcCoordVec( std::vector<long>& rCoords, const std::vector<long>& rSi } } -void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) +static void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow ) { for( size_t nCol = nFirstCol; nCol <= nLastCol; ++nCol ) { @@ -918,7 +918,7 @@ void Array::MirrorSelfX() } // drawing -void HelperCreateHorizontalEntry( +static void HelperCreateHorizontalEntry( const Array& rArray, const Style& rStyle, size_t col, size_t row, const basegfx::B2DPoint& rOrigin, const basegfx::B2DVector& rX, const basegfx::B2DVector& rY, drawinglayer::primitive2d::Primitive2DContainer& rSequence, @@ -966,7 +966,7 @@ void HelperCreateHorizontalEntry( ); } -void HelperCreateVerticalEntry( +static void HelperCreateVerticalEntry( const Array& rArray, const Style& rStyle, size_t col, size_t row, const basegfx::B2DPoint& rOrigin, const basegfx::B2DVector& rX, const basegfx::B2DVector& rY, drawinglayer::primitive2d::Primitive2DContainer& rSequence, diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index bb0f185ad310..109fd7c78d83 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -143,7 +143,7 @@ struct SearchDlg_Impl } }; -void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox& rCBox ) +static void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox& rCBox ) { const SfxStringListItem* pSrchItem = static_cast<const SfxStringListItem*>(SfxGetpApp()->GetItem( nId )); @@ -160,7 +160,7 @@ void ListToStrArr_Impl( sal_uInt16 nId, std::vector<OUString>& rStrLst, ComboBox } } -void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst ) +static void StrArrToList_Impl( sal_uInt16 nId, const std::vector<OUString>& rStrLst ) { DBG_ASSERT( !rStrLst.empty(), "check in advance"); SfxGetpApp()->PutItem( SfxStringListItem( nId, &rStrLst ) ); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 40cf9e9ed43f..f2ed23425d8a 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1031,7 +1031,7 @@ void SvxRuler::SetDefTabDist(long inDefTabDist) // New distance for DefaultTabs UpdateTabs(); } -sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) +static sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) { /* Internal conversion routine between SV-Tab.-Enum and Svx */ switch(eAdj) { @@ -1045,7 +1045,7 @@ sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) return 0; } -SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj) +static SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj) { switch(eAdj) { case RULER_TAB_LEFT: return SvxTabAdjust::Left ; @@ -1354,7 +1354,7 @@ ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos)) return lDragPos - lNullPix; } -void ModifyTabs_Impl( sal_uInt16 nCount, // Number of Tabs +static void ModifyTabs_Impl( sal_uInt16 nCount, // Number of Tabs RulerTab* pTabs, // Tab buffer long lDiff) // difference to be added { diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 329d327b97de..5ffa15457fe4 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -55,7 +55,7 @@ public: }; -void getAllHit3DObjectWithRelativePoint( +static void getAllHit3DObjectWithRelativePoint( const basegfx::B3DPoint& rFront, const basegfx::B3DPoint& rBack, const E3dCompoundObject& rObject, diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 1fe0e022a59c..729d146c742d 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -71,7 +71,7 @@ void E3dView::ConvertMarkedToPolyObj() } } -void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) +static void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) { if(dynamic_cast< const E3dLatheObj* >(pObj) != nullptr) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 1731bb2a3503..7aa1a207bede 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -98,7 +98,7 @@ struct FmGridHeaderData Reference< XInterface > xDroppedResultSet; }; -void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode) +static void SetMenuItem(const OUString& rImgID, const OString &rID, Menu& rMenu, bool bDesignMode) { BitmapEx aBitmap(rImgID); Image aImage(aBitmap); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 09f76a800c74..30b2aa76cfa3 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -78,7 +78,7 @@ using ::com::sun::star::sdb::XRowSetSupplier; using ::com::sun::star::awt::XVclWindowPeer; -css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) +static css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) { css::awt::FontDescriptor aFD; aFD.Name = rFont.GetFamilyName(); @@ -101,7 +101,7 @@ css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) } -vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr ) +static vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr ) { vcl::Font aFont; aFont.SetFamilyName( rDescr.Name ); @@ -1021,7 +1021,7 @@ void FmXGridPeer::columnChanged() namespace fmgridif { - const OUString getDataModeIdentifier() + static const OUString getDataModeIdentifier() { return OUString("DataMode"); } diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index a944957881d6..732699ab8f8b 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star::uno; -const css::uno::Sequence<OUString>& getColumnTypes() +static const css::uno::Sequence<OUString>& getColumnTypes() { static css::uno::Sequence<OUString> aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) @@ -45,12 +45,16 @@ const css::uno::Sequence<OUString>& getColumnTypes() } +extern "C" { + // comparison of PropertyInfo -extern "C" int NameCompare(const void* pFirst, const void* pSecond) +static int NameCompare(const void* pFirst, const void* pSecond) { return static_cast<OUString const *>(pFirst)->compareTo(*static_cast<OUString const *>(pSecond)); } +} + namespace { diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 915ce52dd0f2..5d76624da921 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2403,7 +2403,7 @@ namespace svxform } } - void copyPropSet( const Reference< XPropertySet >& xFrom, Reference< XPropertySet > const & xTo ) + static void copyPropSet( const Reference< XPropertySet >& xFrom, Reference< XPropertySet > const & xTo ) { DBG_ASSERT( xFrom.is(), "copyPropSet(): no source" ); DBG_ASSERT( xTo.is(), "copyPropSet(): no target" ); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index b53e247e3f20..29d19f5358dc 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -103,7 +103,7 @@ const long STD_MIN_SIZE_X = 250; const long STD_MIN_SIZE_Y = 250; -OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) +static OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { const char* pClassNameResourceId = nullptr; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 3b46b5806320..ef234e200590 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -554,7 +554,7 @@ bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface> } -bool isControlList(const SdrMarkList& rMarkList) +static bool isControlList(const SdrMarkList& rMarkList) { // the list contains only controls and at least one control const size_t nMarkCount = rMarkList.GetMarkCount(); @@ -597,7 +597,7 @@ bool isControlList(const SdrMarkList& rMarkList) } -Reference< XForm > GetForm(const Reference< XInterface>& _rxElement) +static Reference< XForm > GetForm(const Reference< XInterface>& _rxElement) { Reference< XForm > xForm( _rxElement, UNO_QUERY ); if ( xForm.is() ) @@ -2986,7 +2986,7 @@ void FmXFormShell::startFiltering_Lock() } -void saveFilter(const Reference< runtime::XFormController >& _rxController) +static void saveFilter(const Reference< runtime::XFormController >& _rxController) { Reference< XPropertySet> xFormAsSet(_rxController->getModel(), UNO_QUERY); Reference< XPropertySet> xControllerAsSet(_rxController, UNO_QUERY); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 5132c9b3133d..491a9c548ad2 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -259,7 +259,7 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl } } -Reference< XFormController > getControllerSearchChildren( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel) +static Reference< XFormController > getControllerSearchChildren( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel) { if (xIndex.is() && xIndex->getCount()) { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 34e86a1fcc5e..63d8cdac73b2 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -88,7 +88,7 @@ namespace svxform MapModelToShape; - void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping ) + static void collectShapeModelMapping( SdrPage const * _pPage, MapModelToShape& _rMapping ) { OSL_ENSURE( _pPage, "collectShapeModelMapping: invalid arg!" ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index a41d820da345..5fd5b35762b1 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -250,7 +250,7 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL ) } } -void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize) +static void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize) { // draw checkered background diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 744c80ae58a8..73c6f649ddef 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -188,7 +188,7 @@ void GalApp::Init() } } -std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput) +static std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput) { osl::File file(rInput); osl::FileBase::RC rc = file.open(osl_File_OpenFlag_Read); @@ -243,7 +243,7 @@ std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput) return ret; } -void +static void ReadResponseFile(std::vector<INetURLObject> & rFiles, OUString const& rInput) { std::vector<OUString> files(ReadResponseFile_Impl(rInput)); diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 166eff735ffc..163d4876f5be 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -73,7 +73,7 @@ bool SvxPageItem::operator==( const SfxPoolItem& rAttr ) const eUse == rItem.eUse ); } -inline OUString GetUsageText( const SvxPageUsage eU ) +static inline OUString GetUsageText( const SvxPageUsage eU ) { switch( eU ) { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 037e8ace65d2..57b0bfaff55e 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -199,12 +199,12 @@ namespace sdr { namespace contact { }; - bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare ) + static bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare ) { return _rControl.getControl() == _rxCompare; } - bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) + static bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) { return _rControl == Reference< XInterface >( _rxCompare, UNO_QUERY ); } @@ -274,7 +274,7 @@ namespace sdr { namespace contact { /** positions a control, and sets its zoom mode, using a given transformation and output device */ - void adjustControlGeometry_throw( const ControlHolder& _rControl, const tools::Rectangle& _rLogicBoundingRect, + static void adjustControlGeometry_throw( const ControlHolder& _rControl, const tools::Rectangle& _rLogicBoundingRect, const basegfx::B2DHomMatrix& _rViewTransformation, const ::basegfx::B2DHomMatrix& _rZoomLevelNormalization ) { OSL_PRECOND( _rControl.is(), "UnoControlContactHelper::adjustControlGeometry_throw: illegal control!" ); @@ -310,7 +310,7 @@ namespace sdr { namespace contact { /** disposes the given control */ - void disposeAndClearControl_nothrow( ControlHolder& _rControl ) + static void disposeAndClearControl_nothrow( ControlHolder& _rControl ) { try { diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 13e8e4ad1e16..5d22203a4e4e 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -36,7 +36,7 @@ namespace sdr namespace overlay { // combine rages geometrically to a single, ORed polygon - basegfx::B2DPolyPolygon impCombineRangesToPolyPolygon(const std::vector< basegfx::B2DRange >& rRanges) + static basegfx::B2DPolyPolygon impCombineRangesToPolyPolygon(const std::vector< basegfx::B2DRange >& rRanges) { const sal_uInt32 nCount(rRanges.size()); basegfx::B2DPolyPolygon aRetval; @@ -60,7 +60,7 @@ namespace sdr // check if wanted type OverlayType::Transparent or OverlayType::Solid // is possible. If not, fallback to invert mode (classic mode) - OverlayType impCheckPossibleOverlayType(OverlayType aOverlayType) + static OverlayType impCheckPossibleOverlayType(OverlayType aOverlayType) { if(OverlayType::Invert != aOverlayType) { diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 30269bf5344b..a9c60d9d91c6 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -2796,7 +2796,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const #define DRAG_CROOK_RASTER_MAXIMUM (15) #define DRAG_CROOK_RASTER_DISTANCE (30) -basegfx::B2DPolyPolygon impCreateDragRaster(SdrPageView const & rPageView, const tools::Rectangle& rMarkRect) +static basegfx::B2DPolyPolygon impCreateDragRaster(SdrPageView const & rPageView, const tools::Rectangle& rMarkRect) { basegfx::B2DPolyPolygon aRetval; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 93d1d87850d4..0dd66b0f14e2 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1413,7 +1413,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const return aRetSet; } -Point ImpGetPoint(const tools::Rectangle& rRect, RectPoint eRP) +static Point ImpGetPoint(const tools::Rectangle& rRect, RectPoint eRP) { switch(eRP) { case RectPoint::LT: return rRect.TopLeft(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index d10805516869..510b58d23b9c 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1864,9 +1864,11 @@ struct ImplHdlAndIndex sal_uInt32 mnIndex; }; +extern "C" { + // Helper method for sorting handles taking care of OrdNums, keeping order in // single objects and re-sorting polygon handles intuitively -extern "C" int ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) +static int ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) { const ImplHdlAndIndex* p1 = static_cast<ImplHdlAndIndex const *>(pVoid1); const ImplHdlAndIndex* p2 = static_cast<ImplHdlAndIndex const *>(pVoid2); @@ -1940,6 +1942,7 @@ extern "C" int ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 ) } } +} void SdrHdlList::TravelFocusHdl(bool bForward) { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 61401a33262f..db64774aa686 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -559,7 +559,7 @@ void SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, std::size_ } } -bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) +static bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { SfxItemState eState=rSet.GetItemState(nWhich,true,&rpItem); if (eState==SfxItemState::DEFAULT) { @@ -568,7 +568,7 @@ bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& r return (eState==SfxItemState::DEFAULT || eState==SfxItemState::SET) && rpItem!=nullptr; } -bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) +static bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; if (pSet==nullptr) return false; @@ -828,7 +828,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI return false; } -sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) +static sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) { switch (nWhich) { // Line diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 696c7e6b7c53..c7f34d9dd3e3 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1916,7 +1916,7 @@ void SdrModel::ReadUserDataSequenceValue(const css::beans::PropertyValue* pValue } template <typename T> -inline void addPair(std::vector< std::pair< OUString, Any > >& aUserData, const OUString& name, const T val) +static inline void addPair(std::vector< std::pair< OUString, Any > >& aUserData, const OUString& name, const T val) { aUserData.push_back(std::pair< OUString, Any >(name, css::uno::makeAny(val))); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 317dd6daa40d..476d4de45a5c 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -204,7 +204,7 @@ static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape ) // #i37011# create a clone with all attributes changed to shadow attributes // and translation executed, too. -SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) +static SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) { SdrObject* pRetval = nullptr; const bool bShadow(rOriginalSet.Get(SDRATTR_SHADOW).GetValue()); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index cfafb5a7785e..5a705b998c77 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2310,7 +2310,7 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const } -void extractLineContourFromPrimitive2DSequence( +static void extractLineContourFromPrimitive2DSequence( const drawinglayer::primitive2d::Primitive2DContainer& rxSequence, basegfx::B2DPolygonVector& rExtractedHairlines, basegfx::B2DPolyPolygonVector& rExtractedLineFills) diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index cbe1ce864f68..5f80317af1f1 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -53,7 +53,7 @@ using namespace com::sun::star; -Point GetAnglePnt(const tools::Rectangle& rR, long nAngle) +static Point GetAnglePnt(const tools::Rectangle& rR, long nAngle) { Point aCenter(rR.Center()); long nWdt=rR.Right()-rR.Left(); @@ -962,7 +962,7 @@ void SdrCircObj::RestGeoData(const SdrObjGeoData& rGeo) ImpSetCircInfoToAttr(); } -void Union(tools::Rectangle& rR, const Point& rP) +static void Union(tools::Rectangle& rR, const Point& rP) { if (rP.X()<rR.Left ()) rR.SetLeft(rP.X() ); if (rP.X()>rR.Right ()) rR.SetRight(rP.X() ); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 24943f06d84a..c7add749df64 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -326,7 +326,7 @@ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const rRec.nTextAutoAngleView=static_cast<const SdrMeasureTextAutoAngleViewItem&>(rSet.Get(SDRATTR_MEASURETEXTAUTOANGLEVIEW)).GetValue(); } -long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, long nNewWidth, bool bCenter) +static long impGetLineStartEndDistance(const basegfx::B2DPolyPolygon& rPolyPolygon, long nNewWidth, bool bCenter) { const basegfx::B2DRange aPolygonRange(rPolyPolygon.getB2DRange()); const double fOldWidth(std::max(aPolygonRange.getWidth(), 1.0)); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 007cbba7d8d8..3dd12b6341af 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -57,7 +57,7 @@ using namespace sdr; -inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) +static inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { if (nPnt>0) { nPnt--; @@ -68,7 +68,7 @@ inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) return nPnt; } -inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) +static inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { nPnt++; if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 50202370ccd7..2a520936da66 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1896,7 +1896,7 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) /* Begin chaining code */ // XXX: Make it a method somewhere? -SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aObjName) +static SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aObjName) { // scan the whole list size_t nObjCount = pObjList->GetObjCount(); @@ -1912,7 +1912,7 @@ SdrObject *ImpGetObjByName(SdrObjList const *pObjList, OUString const& aObjName) } // XXX: Make it a (private) method of SdrTextObj -void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString const& aNextLinkName) +static void ImpUpdateChainLinks(SdrTextObj *pTextObj, OUString const& aNextLinkName) { // XXX: Current implementation constraints text boxes to be on the same page diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 5a79e8818b6d..d2993c240157 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1238,7 +1238,7 @@ void SdrTextObj::impGetBlinkTextTiming(drawinglayer::animation::AnimationEntryLi } } -void impCreateScrollTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, bool bForward, double fTimeFullPath, double fFrequency) +static void impCreateScrollTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, bool bForward, double fTimeFullPath, double fFrequency) { bool bVisibleWhenStopped(rSet.Get(SDRATTR_TEXT_ANISTOPINSIDE).GetValue()); bool bVisibleWhenStarted(rSet.Get(SDRATTR_TEXT_ANISTARTINSIDE).GetValue()); @@ -1269,7 +1269,7 @@ void impCreateScrollTiming(const SfxItemSet& rSet, drawinglayer::animation::Anim } } -void impCreateAlternateTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, double fRelativeTextLength, bool bForward, double fTimeFullPath, double fFrequency) +static void impCreateAlternateTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, double fRelativeTextLength, bool bForward, double fTimeFullPath, double fFrequency) { if(basegfx::fTools::more(fRelativeTextLength, 0.5)) { @@ -1337,7 +1337,7 @@ void impCreateAlternateTiming(const SfxItemSet& rSet, drawinglayer::animation::A } } -void impCreateSlideTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, bool bForward, double fTimeFullPath, double fFrequency) +static void impCreateSlideTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, bool bForward, double fTimeFullPath, double fFrequency) { // move in from outside, start outside const double fStartPosition(bForward ? 0.0 : 1.0); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 636d735efd64..9f931cafd945 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1041,7 +1041,7 @@ void SdrPageProperties::ImpAddStyleSheet(SfxStyleSheet& rNewStyleSheet) } } -void ImpPageChange(SdrPage& rSdrPage) +static void ImpPageChange(SdrPage& rSdrPage) { rSdrPage.ActionChanged(); rSdrPage.getSdrModelFromSdrPage().SetChanged(); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 34bb9396659b..b62aae338eae 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -572,7 +572,7 @@ long BigMulDiv(long nVal, long nMul, long nDiv) // How many eU units fit into a mm, respectively an inch? // Or: How many mm, respectively inches, are there in an eU (and then give me the inverse) -FrPair GetInchOrMM(MapUnit eU) +static FrPair GetInchOrMM(MapUnit eU) { switch (eU) { case MapUnit::Map1000thInch: return FrPair(1000,1); @@ -604,7 +604,7 @@ FrPair GetInchOrMM(MapUnit eU) return Fraction(1,1); } -FrPair GetInchOrMM(FieldUnit eU) +static FrPair GetInchOrMM(FieldUnit eU) { switch (eU) { case FUNIT_INCH : return FrPair( 1,1); @@ -660,7 +660,7 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD) // 1 yd = 3 ft = 36" = 914,4mm // 1 ft = 12 " = 1" = 304,8mm -void GetMeterOrInch(MapUnit eMU, short& rnComma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch) +static void GetMeterOrInch(MapUnit eMU, short& rnComma, long& rnMul, long& rnDiv, bool& rbMetr, bool& rbInch) { rnMul=1; rnDiv=1; short nComma=0; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 4abad96afbf4..36d71e008c7f 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2304,7 +2304,7 @@ static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine } -void ImplApplyBoxItem( CellPosFlag nCellPosFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame ) +static void ImplApplyBoxItem( CellPosFlag nCellPosFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame ) { if (nCellPosFlags & (CellPosFlag::Before|CellPosFlag::After|CellPosFlag::Upper|CellPosFlag::Lower)) { diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 76ef46d9ce7e..49eb7f2f9655 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -55,7 +55,7 @@ namespace sdr { namespace table { // removes the given range from a vector -template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) +template< class Vec, class Iter > static void remove_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) { const sal_Int32 nSize = static_cast<sal_Int32>(rVector.size()); if( nCount && (nIndex >= 0) && (nIndex < nSize) ) @@ -74,7 +74,7 @@ template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIn /** inserts a range into a vector */ -template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) +template< class Vec, class Iter, class Entry > static sal_Int32 insert_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount ) { if( nCount ) { diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index edd0ff610beb..7453ebab540b 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -77,7 +77,7 @@ SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj ) { } -long HundMMToTwips( long nIn ) +static long HundMMToTwips( long nIn ) { long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::Map100thMM, MapUnit::MapTwip ); return nRet; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 98a366dad788..62eb91b412d7 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -374,7 +374,7 @@ void SdrTableRTFParser::NextColumn() mpActDefault = nullptr; } -long TwipsToHundMM( long nIn ) +static long TwipsToHundMM( long nIn ) { long nRet = OutputDevice::LogicToLogic( nIn, MapUnit::MapTwip, MapUnit::Map100thMM ); return nRet; diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 63ea0085a690..27100545cf02 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -148,7 +148,7 @@ namespace sdr { namespace contact { - svx::frame::Style impGetLineStyle( + static svx::frame::Style impGetLineStyle( const sdr::table::TableLayouter& rLayouter, sal_Int32 nX, sal_Int32 nY, diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index c7fc165671bb..cf14a4a55448 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -78,7 +78,7 @@ ExtrusionBar::~ExtrusionBar() SetRepeatTarget(nullptr); } -void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const Direction3D **pLighting2Defaults ) +static void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const Direction3D **pLighting2Defaults ) { static const Direction3D aLighting1Defaults[9] = @@ -608,7 +608,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi } } -void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -755,7 +755,7 @@ void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_DIRECTION ); } -void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -810,7 +810,7 @@ void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_PROJECTION ); } -void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -895,7 +895,7 @@ void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet ) rSet.DisableItem( SID_EXTRUSION_SURFACE ); } -void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -974,7 +974,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 ) return false; } -void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -1053,7 +1053,7 @@ void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxItemSet& r rSet.DisableItem( SID_EXTRUSION_LIGHTING_DIRECTION ); } -void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -1120,7 +1120,7 @@ void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxItemSet& r rSet.DisableItem( SID_EXTRUSION_LIGHTING_INTENSITY ); } -void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index cdfc32236443..b4679ba0eff0 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -void SetAlignmentState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void SetAlignmentState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -95,7 +95,7 @@ void SetAlignmentState( SdrView const * pSdrView, SfxItemSet& rSet ) rSet.Put( SfxInt32Item( SID_FONTWORK_ALIGNMENT, nAlignment ) ); } -void SetCharacterSpacingState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void SetCharacterSpacingState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -120,7 +120,7 @@ void SetCharacterSpacingState( SdrView const * pSdrView, SfxItemSet& rSet ) } -void SetKernCharacterPairsState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void SetKernCharacterPairsState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -139,7 +139,7 @@ void SetKernCharacterPairsState( SdrView const * pSdrView, SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_FONTWORK_KERN_CHARACTER_PAIRS, bChecked ) ); } -void SetFontWorkShapeTypeState( SdrView const * pSdrView, SfxItemSet& rSet ) +static void SetFontWorkShapeTypeState( SdrView const * pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); const size_t nCount = rMarkList.GetMarkCount(); @@ -319,7 +319,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r } } -void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString& rCustomShape ) +static void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString& rCustomShape ) { const OUString sType( "Type" ); diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index aa905c7ea754..33e90b738627 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -73,14 +73,14 @@ namespace svx return static_cast<XWeak*>(new NamespaceMap( pWhichIds, pPool )); } - Sequence< OUString > NamespaceMap_getSupportedServiceNames() + static Sequence< OUString > NamespaceMap_getSupportedServiceNames() throw() { Sequence<OUString> aSupportedServiceNames { "com.sun.star.xml.NamespaceMap" }; return aSupportedServiceNames; } - OUString NamespaceMap_getImplementationName() + static OUString NamespaceMap_getImplementationName() throw() { return OUString( "com.sun.star.comp.Svx.NamespaceMap" ); diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx index 60f4c14cd52e..fe4d636a55a4 100644 --- a/svx/source/unodraw/unobrushitemhelper.cxx +++ b/svx/source/unodraw/unobrushitemhelper.cxx @@ -152,7 +152,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI } } -sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents) +static sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents) { sal_uInt16 nFillTransparence(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents).GetValue()); const SfxPoolItem* pGradientItem = nullptr; @@ -171,7 +171,7 @@ sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSe return nFillTransparence; } -SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents, sal_uInt16 nBackgroundID) +static SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents, sal_uInt16 nBackgroundID) { Color aFillColor(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents).GetColorValue()); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 0d6c32e8a0cf..492c92a5eeb3 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans::PropertyAttribute; using ::com::sun::star::drawing::TextVerticalAdjust; -SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() { static SfxItemPropertyMapEntry const aShapePropertyMap_Impl[] = { @@ -73,7 +73,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() return aShapePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() { static SfxItemPropertyMapEntry const aTextShapePropertyMap_Impl[] = { @@ -96,7 +96,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() return aTextShapePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() { static SfxItemPropertyMapEntry const aConnectorPropertyMap_Impl[] = { @@ -120,7 +120,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() return aConnectorPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() { static SfxItemPropertyMapEntry const aDimensioningPropertyMap_Impl[] = { @@ -144,7 +144,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() return aDimensioningPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() { static SfxItemPropertyMapEntry const aCirclePropertyMap_Impl[] = { @@ -168,7 +168,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() return aCirclePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] = { @@ -194,7 +194,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() return aPolyPolygonPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() { static SfxItemPropertyMapEntry const aGraphicObjectPropertyMap_Impl[] = { @@ -225,7 +225,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() return aGraphicObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSceneObjectPropertyMap_Impl[] = { @@ -243,7 +243,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap() return a3DSceneObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DCubeObjectPropertyMap_Impl[] = { @@ -264,7 +264,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() return a3DCubeObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DSphereObjectPropertyMap_Impl[] = { @@ -284,7 +284,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() return a3DSphereObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DLatheObjectPropertyMap_Impl[] = { @@ -310,7 +310,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() return a3DLatheObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DExtrudeObjectPropertyMap_Impl[] = { @@ -336,7 +336,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() return a3DExtrudeObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() { static SfxItemPropertyMapEntry const a3DPolygonObjectPropertyMap_Impl[] = { @@ -357,7 +357,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() return a3DPolygonObjectPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() { static SfxItemPropertyMapEntry const aAllPropertyMap_Impl[] = { @@ -399,7 +399,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() return aAllPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap() { static SfxItemPropertyMapEntry const aGroupPropertyMap_Impl[] = { @@ -412,7 +412,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap() return aGroupPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() { static SfxItemPropertyMapEntry const aOle2PropertyMap_Impl[] = { @@ -445,7 +445,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() return aOle2PropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() { static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] = { @@ -475,7 +475,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() return aPluginPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() { //TODO/LATER: new properties for ScrollingMode and DefaultBorder static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] = @@ -509,7 +509,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() return aFramePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() { static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] = { @@ -542,7 +542,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() return aAppletPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] = { @@ -599,7 +599,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() return aControlPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() { static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { @@ -622,7 +622,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() return aPageShapePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { @@ -656,7 +656,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() return aCaptionPropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] = { @@ -679,7 +679,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() return aCustomShapePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] = { @@ -711,7 +711,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() return aMediaShapePropertyMap_Impl; } -SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() +static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] = { @@ -742,7 +742,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() return aTableShapePropertyMap_Impl; } -comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap() +static comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap() { static comphelper::PropertyMapEntry const aSvxDrawingDefaultsPropertyMap_Impl[] = { @@ -762,7 +762,7 @@ comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap() return aSvxDrawingDefaultsPropertyMap_Impl; } -comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPropertyMap() +static comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPropertyMap() { static comphelper::PropertyMapEntry const aSvxAdditionalDefaultsPropertyMap_Impl[] = { @@ -1467,7 +1467,7 @@ static const char* RID_SVXSTR_TRASNGR[] = RID_SVXSTR_TRASNGR0 }; -bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw() +static bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw() { switch( nWhich ) { @@ -1514,7 +1514,7 @@ bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, } /// @throws std::exception -bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi) +static bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi) { // first, calculate the search string length without an optional number after the name sal_Int32 nLength = rString.getLength(); @@ -1749,7 +1749,7 @@ static const char* SvxUnoColorNameResId[] = }; /// @throws std::exception -bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi) +static bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 4873ff2dc0cb..0e487d0c7888 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -649,7 +649,7 @@ Svx3DLatheObject::~Svx3DLatheObject() throw() { } -bool PolyPolygonShape3D_to_B3dPolyPolygon( +static bool PolyPolygonShape3D_to_B3dPolyPolygon( const Any& rValue, basegfx::B3DPolyPolygon& rResultPolygon, bool bCorrectPolygon) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6f68c8611241..0bd7c77fb017 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -605,7 +605,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const } } -void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, +static void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet, SfxItemSet& rSet, const uno::Reference< beans::XPropertySet >& xSet, const SfxItemPropertyMap* pMap ) { if(rPropSet.AreThereOwnUsrAnys()) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 305c9fe410fd..d22b3d667f76 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -65,7 +65,7 @@ using namespace ::com::sun::star; -long ScaleMetricValue( long nVal, long nMul, long nDiv ) +static long ScaleMetricValue( long nVal, long nMul, long nDiv ) { BigInt aVal( nVal ); |