diff options
Diffstat (limited to 'svx')
60 files changed, 375 insertions, 7 deletions
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index c39bbc26b6ac..a0a31d959183 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -38,6 +38,7 @@ namespace accessibility { + namespace { /** This class simply wraps a SvxTextEditSource, forwarding all methods except the GetBroadcaster() call @@ -163,6 +164,7 @@ namespace accessibility }; + } // Implementing AccessibleProxyEditSource_Impl diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 3e181647808b..4116589a4934 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1151,6 +1151,7 @@ sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() return nAccessibleRole; } +namespace { //sort the drawing objects from up to down, from left to right struct XShapePosCompareHelper @@ -1166,6 +1167,8 @@ struct XShapePosCompareHelper return false; } }; + +} //end of group position // XAccessibleGroupPosition diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 68a0e40cff9f..46b88a92f702 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -329,6 +329,8 @@ namespace accessibility return maEditSource; } + namespace { + // functor for sending child events (no stand-alone function, they are maybe not inlined) class AccessibleTextHelper_OffsetChildIndex { @@ -343,6 +345,8 @@ namespace accessibility const sal_Int32 mnDifference; }; + } + void AccessibleTextHelper_Impl::SetStartIndex( sal_Int32 nOffset ) { sal_Int32 nOldOffset( mnStartIndex ); @@ -796,6 +800,8 @@ namespace accessibility } } + namespace { + // functor for checking changes in paragraph bounding boxes (no stand-alone function, maybe not inlined) class AccessibleTextHelper_UpdateChildBounds { @@ -829,6 +835,8 @@ namespace accessibility } }; + } + void AccessibleTextHelper_Impl::UpdateBoundRect() { // send BOUNDRECT_CHANGED to affected children @@ -847,6 +855,8 @@ namespace accessibility } #endif + namespace { + // functor for sending child events (no stand-alone function, they are maybe not inlined) class AccessibleTextHelper_LostChildEvent { @@ -865,6 +875,8 @@ namespace accessibility AccessibleTextHelper_Impl& mrImpl; }; + } + void AccessibleTextHelper_Impl::ParagraphsMoved( sal_Int32 nFirst, sal_Int32 nMiddle, sal_Int32 nLast ) { const sal_Int32 nParas = GetTextForwarder().GetParagraphCount(); @@ -942,6 +954,8 @@ namespace accessibility } } + namespace { + // functor for sending child events (no stand-alone function, they are maybe not inlined) class AccessibleTextHelper_ChildrenTextChanged { @@ -1021,6 +1035,8 @@ namespace accessibility SfxHintId mnHintId; }; + } + void AccessibleTextHelper_Impl::ProcessQueue() { // inspect queue for paragraph insert/remove events. If there diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index e1d31771c06d..4135495cabb3 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -71,6 +71,8 @@ void ExternalToolEdit::StartListeningEvent() m_aFileName, [this] () { return HandleCloseEvent(this); })); } +namespace { + // self-destructing thread to make shell execute async class ExternalToolEditThread : public ::salhelper::Thread @@ -87,6 +89,8 @@ public: {} }; +} + void ExternalToolEditThread::execute() { try diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index e91751e0ed2c..cf0be984808f 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -61,6 +61,8 @@ using namespace com::sun::star; using namespace com::sun::star::uno; +namespace { + struct FWCharacterData // representing a single character { std::vector< tools::PolyPolygon > vOutlines; @@ -89,6 +91,7 @@ struct FWData // representing the whole text bool bScaleX; }; +} static bool InitializeFontWorkData( const SdrObjCustomShape& rSdrObjCustomShape, diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 197acb8db4ce..4b257d9ffb7e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -31,11 +31,16 @@ static ::osl::Mutex& getHashMapMutex() return s_aHashMapProtection; } +namespace { + struct NameTypeTable { const char* pS; MSO_SPT const pE; }; + +} + static const NameTypeTable pNameTypeTableArray[] = { { "non-primitive", mso_sptMin }, @@ -309,12 +314,17 @@ OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType ) typedef std::unordered_map< const char*, const char*, rtl::CStringHash, rtl::CStringEqual> TypeACCNameHashMap; static TypeACCNameHashMap* pACCHashMap = nullptr; + +namespace { + struct ACCNameTypeTable { const char* pS; const char* pE; }; +} + static const ACCNameTypeTable pACCNameTypeTableArray[] = { { "non-primitive", "Non Primitive Shape" }, diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 49bdb3aeacf6..d93e50e1c21c 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -33,6 +33,8 @@ namespace svx { namespace frame { +namespace { + class Cell { private: @@ -81,6 +83,8 @@ public: basegfx::B2DHomMatrix CreateCoordinateSystem(const Array& rArray, size_t nCol, size_t nRow, bool bExpandMerged) const; }; +} + typedef std::vector< Cell > CellVec; basegfx::B2DHomMatrix Cell::CreateCoordinateSystem(const Array& rArray, size_t nCol, size_t nRow, bool bExpandMerged) const @@ -365,6 +369,8 @@ bool ArrayImpl::HasCellRotation() const return false; } +namespace { + class MergedCellIterator { public: @@ -385,6 +391,7 @@ private: size_t mnRow; }; +} MergedCellIterator::MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow ) { diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index c7de008f28d2..0d0173fc0be5 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -178,6 +178,8 @@ bool WeldEditView::Command(const CommandEvent& rCEvt) class WeldEditAccessible; +namespace +{ class WeldViewForwarder : public SvxViewForwarder { WeldEditAccessible& m_rEditAcc; @@ -195,8 +197,12 @@ public: virtual Point LogicToPixel(const Point& rPoint, const MapMode& rMapMode) const override; virtual Point PixelToLogic(const Point& rPoint, const MapMode& rMapMode) const override; }; +} class WeldEditAccessible; + +namespace +{ class WeldEditSource; /* analog to SvxEditEngineForwarder */ @@ -349,6 +355,7 @@ public: return const_cast<WeldEditSource*>(this)->m_aBroadCaster; } }; +} typedef cppu::WeakImplHelper< css::accessibility::XAccessible, css::accessibility::XAccessibleComponent, diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 7d644192a3ae..ef4d3bad4743 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -31,6 +31,7 @@ using namespace com::sun::star; +namespace { class ImplPairDephAndObject { @@ -54,6 +55,7 @@ public: const E3dCompoundObject* getObject() const { return mpObject; } }; +} static void getAllHit3DObjectWithRelativePoint( const basegfx::B3DPoint& rFront, diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index bceb7df00f6b..298174047fbd 100644 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx @@ -34,6 +34,8 @@ namespace drawinglayer { namespace processor3d { + namespace { + class MinimalDephInViewExtractor : public BaseProcessor3D { private: @@ -54,6 +56,8 @@ namespace drawinglayer double getMinimalDepth() const { return mfMinimalDepth; } }; + } + void MinimalDephInViewExtractor::processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate) { // it is a BasePrimitive3D implementation, use getPrimitive3DID() call for switch diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index db818000f152..ad77779c02b1 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -47,6 +47,7 @@ #include <svx/e3dsceneupdater.hxx> #include <svx/svdmodel.hxx> +namespace { class ImpRemap3DDepth { @@ -67,6 +68,8 @@ public: bool IsScene() const { return mbIsScene; } }; +} + ImpRemap3DDepth::ImpRemap3DDepth(sal_uInt32 nOrdNum, double fMinimalDepth) : mnOrdNum(nOrdNum), mfMinimalDepth(fMinimalDepth), diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index e3a806fccb88..4fd79ce943fd 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1011,6 +1011,8 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, const basegfx::B2DPoint& rPnt1 //Arrange all created extrude objects by depth +namespace { + struct E3dDepthNeighbour { E3dExtrudeObj* mpObj; @@ -1034,6 +1036,8 @@ struct E3dDepthLayer } }; +} + void E3dView::DoDepthArrange(E3dScene const * pScene, double fDepth) { if(pScene && pScene->GetSubList() && pScene->GetSubList()->GetObjCount() > 1) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 1ba6f7ad6fb5..2020cb99f614 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -177,6 +177,8 @@ Image FmFilterItem::GetImage() const // Hints for communication between model and view +namespace { + class FmFilterHint : public SfxHint { FmFilterData* const m_pData; @@ -225,6 +227,8 @@ public: FmFilterCurrentChangedHint(){} }; +} + // class FmFilterAdapter, listener at the FilterControls class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener > { @@ -935,6 +939,8 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem ) } } +namespace { + class FmFilterItemsString : public SvLBoxString { public: @@ -948,6 +954,8 @@ public: virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; }; +} + const int nxDBmp = 12; void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, @@ -994,6 +1002,8 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE pViewData->mnHeight = aSize.Height(); } +namespace { + class FmFilterString : public SvLBoxString { OUString m_aName; @@ -1011,6 +1021,8 @@ public: virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData = nullptr) override; }; +} + const int nxD = 4; void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 5edf19daa490..f76f8e86f729 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -71,14 +71,19 @@ namespace svxform using ::com::sun::star::awt::XControl; using ::com::sun::star::beans::XPropertySet; + namespace { + class FormScriptingEnvironment; + } //= FormScriptListener typedef ::cppu::WeakImplHelper < XScriptListener > FormScriptListener_Base; + namespace { + /** implements the XScriptListener interface, is used by FormScriptingEnvironment */ class FormScriptListener :public FormScriptListener_Base @@ -169,6 +174,8 @@ namespace svxform void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister ); }; + } + FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor ) :m_pScriptExecutor( pScriptExecutor ) { @@ -770,6 +777,8 @@ namespace svxform m_pScriptExecutor = nullptr; } + namespace { + // tdf#88985 If LibreOffice tries to exit during the execution of a macro // then: detect the effort, stop basic execution, block until the macro // returns due to that stop, then restart the quit. This avoids the app @@ -869,6 +878,8 @@ namespace svxform } }; + } + IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) { ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p); diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 021d5b40b201..2a543178b571 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -74,12 +74,16 @@ namespace svxform // maps from ascii values to int values + namespace { + struct Ascii2Int16 { const sal_Char* pAscii; sal_Int16 const nValue; }; + } + static const Ascii2Int16* lcl_getSearchForTypeValueMap() { static const Ascii2Int16 s_aSearchForTypeMap[] = diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 7b632521b465..2552161a43f9 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -77,6 +77,8 @@ using namespace ::dbtools; #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> +namespace { + class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener > { public: @@ -164,6 +166,8 @@ struct PropertySetInfo // sal_False -> the set has _no_ such property or its value isn't empty }; +} + typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 0a1aa102d718..d5fde904fff6 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -206,6 +206,8 @@ namespace svxform namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction; namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; +namespace { + struct ColumnInfo { // information about the column itself @@ -241,6 +243,8 @@ struct ColumnInfo } }; +} + class ColumnInfoCache { public: @@ -415,6 +419,8 @@ const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos ) return m_aColumns[ _pos ]; } +namespace { + class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { Sequence< PropertyValue > m_aValues; @@ -428,6 +434,7 @@ public: virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) override; }; +} void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) { @@ -449,6 +456,8 @@ struct FmFieldInfo {xField->getPropertyValue(FM_PROP_NAME) >>= aFieldName;} }; +namespace { + class FmXAutoControl: public UnoControl { @@ -464,6 +473,7 @@ protected: virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) override; }; +} void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) { @@ -493,6 +503,7 @@ IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Timer*, void ) activateTabOrder(); } +namespace { struct UpdateAllListeners { @@ -504,6 +515,8 @@ struct UpdateAllListeners } }; +} + IMPL_LINK_NOARG( FormController, OnInvalidateFeatures, Timer*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 9e14d3758cd1..0c72859d0945 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -55,6 +55,9 @@ namespace svxform typedef ::cppu::WeakImplHelper < form::XFormController , XServiceInfo > LegacyFormController_Base; + + namespace { + /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the css.form.XFormController interface. @@ -100,6 +103,7 @@ namespace svxform const Reference< form::runtime::XFormController > m_xDelegator; }; + } Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl( ) { diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 99e7f4820860..907682089ea3 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -42,6 +42,8 @@ using namespace ::com::sun::star; +namespace { + class GalApp : public Application { bool mbInBuildTree; @@ -58,6 +60,8 @@ protected: void DeInit() override; }; +} + static void createTheme( const OUString& aThemeName, const OUString& aGalleryURL, const OUString& aDestDir, std::vector<INetURLObject> &rFiles, bool bRelativeURLs ) diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index dd55876b85ed..8701f669b842 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -26,6 +26,8 @@ const sal_uInt16 MN_ST_INSERT_START = 500; +namespace { + class SmartTagMenuController : public svt::PopupMenuControllerBase { public: @@ -54,6 +56,8 @@ private: std::unique_ptr< const SvxSmartTagItem > m_pSmartTagItem; }; +} + SmartTagMenuController::SmartTagMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : svt::PopupMenuControllerBase( rxContext ) { diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index ed5459388400..adedad499f22 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -131,6 +131,8 @@ namespace sdr { namespace contact { using ::com::sun::star::container::ContainerEvent; using ::com::sun::star::uno::Any; + namespace { + class ControlHolder { private: @@ -202,17 +204,18 @@ namespace sdr { namespace contact { const Reference< XControl >& getControl() const { return m_xControl; } }; - - static bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare ) + bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare ) { return _rControl.getControl() == _rxCompare; } - static bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) + bool operator==( const ControlHolder& _rControl, const Any& _rxCompare ) { return _rControl == Reference< XInterface >( _rxCompare, UNO_QUERY ); } + } + void ControlHolder::setPosSize( const tools::Rectangle& _rPosSize ) const { // no check whether we're valid, this is the responsibility of the caller @@ -334,6 +337,8 @@ namespace sdr { namespace contact { } + namespace { + /** interface encapsulating access to an SdrPageView, stripped down to the methods we really need */ class IPageViewAccess @@ -372,6 +377,7 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override; }; + } bool SdrPageViewAccess::isDesignMode() const { @@ -393,6 +399,8 @@ namespace sdr { namespace contact { return m_rPageView.GetVisibleLayers().IsSet( _nLayerID ); } + namespace { + /** is a ->IPageViewAccess implementation which can be used to create an invisible control for an arbitrary window */ @@ -414,6 +422,7 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override; }; + } bool InvisibleControlViewAccess::isDesignMode() const { @@ -439,6 +448,7 @@ namespace sdr { namespace contact { return false; } + namespace { //= DummyPageViewAccess @@ -464,6 +474,7 @@ namespace sdr { namespace contact { virtual bool isLayerVisible( SdrLayerID _nLayerID ) const override; }; + } bool DummyPageViewAccess::isDesignMode() const { @@ -771,6 +782,8 @@ namespace sdr { namespace contact { const OutputDevice& impl_getOutputDevice_throw() const; }; + namespace { + class LazyControlCreationPrimitive2D : public ::drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: @@ -824,6 +837,8 @@ namespace sdr { namespace contact { ::basegfx::B2DHomMatrix m_aTransformation; }; + } + ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ) :m_pAntiImpl( _pAntiImpl ) ,m_bCreatingControl( false ) diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 082bb29d81e7..0fe474c3784a 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -255,8 +255,12 @@ BulletsTypeMgr::BulletsTypeMgr() Init(); } +namespace { + class theBulletsTypeMgr : public rtl::Static<BulletsTypeMgr, theBulletsTypeMgr> {}; +} + BulletsTypeMgr& BulletsTypeMgr::GetInstance() { return theBulletsTypeMgr::get(); @@ -401,8 +405,12 @@ static const char* RID_SVXSTR_SINGLENUM_DESCRIPTIONS[] = RID_SVXSTR_SINGLENUM_DESCRIPTION_7 }; +namespace { + class theNumberingTypeMgr : public rtl::Static<NumberingTypeMgr, theNumberingTypeMgr> {}; +} + NumberingTypeMgr& NumberingTypeMgr::GetInstance() { return theNumberingTypeMgr::get(); @@ -574,8 +582,12 @@ OutlineTypeMgr::OutlineTypeMgr() ImplLoad("standard.syc"); } +namespace { + class theOutlineTypeMgr : public rtl::Static<OutlineTypeMgr, theOutlineTypeMgr> {}; +} + OutlineTypeMgr& OutlineTypeMgr::GetInstance() { return theOutlineTypeMgr::get(); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index c79a778459a2..d55b895af65c 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -94,6 +94,8 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal ) SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); +namespace { + class FunctionPopup_Impl { VclBuilder m_aBuilder; @@ -107,6 +109,8 @@ public: sal_uInt32 GetSelected() const; }; +} + sal_uInt16 FunctionPopup_Impl::id_to_function(const OString& rIdent) { if (rIdent == "avg") diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 1e97e160f289..6bb61c549c02 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -34,6 +34,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item); +namespace { + /// Popup menu to select the selection type class SelectionTypePopup { @@ -48,6 +50,8 @@ public: sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return m_xMenu->Execute(pWindow, rPopupPos); } }; +} + sal_uInt16 SelectionTypePopup::id_to_state(const OString& rIdent) { if (rIdent == "block") diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index ace1cc1ffea7..d5445b56faa5 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -43,6 +43,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); +namespace { + class ZoomPopup_Impl { public: @@ -62,6 +64,8 @@ private: sal_uInt16 nZoom; }; +} + ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, SvxZoomEnableFlags nValueSet ) : m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/zoommenu.ui", "") , m_xMenu(m_aBuilder.get_menu("menu")) diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 666a81c92312..f4b959ce435d 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -28,6 +28,8 @@ #include <set> #include <vector> +namespace { + //rhbz#1007697 do this in two loops, one to collect the candidates //and another to update them because updating a candidate can //trigger the candidate to be deleted, so asking for its @@ -42,6 +44,8 @@ public: ~CandidateMgr(); }; +} + IMPL_LINK(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index f0836ed14f69..286b74bb5a23 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -757,6 +757,8 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol } } +namespace { + // for distribution dialog function struct ImpDistributeEntry { @@ -765,6 +767,8 @@ struct ImpDistributeEntry sal_Int32 mnLength; }; +} + typedef vector<ImpDistributeEntry> ImpDistributeEntryList; void SdrEditView::DistributeMarkedObjects(weld::Window* pParent) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index e6fd42899721..fc1a6caf7d3a 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -70,6 +70,8 @@ #include <memory> #include <bitmaps.hlst> +namespace { + // #i15222# // Due to the resource problems in Win95/98 with bitmap resources I // will change this handle bitmap providing class. Old version was splitting @@ -95,6 +97,7 @@ public: const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd); }; +} #define KIND_COUNT (14) #define INDEX_COUNT (6) @@ -1912,6 +1915,7 @@ static bool ImpSdrHdlListSorter(std::unique_ptr<SdrHdl> const& lhs, std::unique_ } } +namespace { // Helper struct for re-sorting handles struct ImplHdlAndIndex @@ -1920,6 +1924,8 @@ struct ImplHdlAndIndex sal_uInt32 mnIndex; }; +} + extern "C" { // Helper method for sorting handles taking care of OrdNums, keeping order in diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index c104a33ae21a..7c5aa3bf9196 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -396,6 +396,8 @@ basegfx::B2DPolyPolygon SdrCircObj::TakeXorPoly() const return basegfx::B2DPolyPolygon(aCircPolygon); } +namespace { + struct ImpCircUser : public SdrDragStatUserData { tools::Rectangle aR; @@ -416,6 +418,8 @@ public: void SetCreateParams(SdrDragStat const & rStat); }; +} + sal_uInt32 SdrCircObj::GetHdlCount() const { if(SdrCircKind::Full != meCircleKind) diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index c992fadae228..ca047cde59af 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -270,12 +270,16 @@ struct ImpMeasureRec : public SdrDragStatUserData long nTextAutoAngleView; }; +namespace { + struct ImpLineRec { Point aP1; Point aP2; }; +} + struct ImpMeasurePoly { ImpLineRec aMainline1; // those with the 1st arrowhead diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 16617ecaf94f..6f4ed4edcb8e 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -108,6 +108,8 @@ static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Ob return xFrame; } +namespace { + class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper < embed::XStateChangeListener , document::XEventListener @@ -175,6 +177,8 @@ private: virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() override; }; +} + SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj ) : mpObj( pObj ) { diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 0ae3fe029ef7..b586d83b3079 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -74,6 +74,8 @@ static sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) return nPnt; } +namespace { + struct ImpSdrPathDragData : public SdrDragStatUserData { XPolygon aXP; // section of the original polygon @@ -112,6 +114,8 @@ public: bool IsMultiPointDrag() const { return mbMultiPointDrag; } }; +} + ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, bool bMuPoDr, const SdrDragStat& rDrag) : aXP(5) , bValid(false) @@ -224,6 +228,8 @@ void ImpSdrPathDragData::ResetPoly(const SdrPathObj& rPO) aXP[4]=aTmpXP[nNextNextPnt0]; aXP.SetFlags(4,aTmpXP.GetFlags(nNextNextPnt0)); } +namespace { + struct ImpPathCreateUser : public SdrDragStatUserData { Point aBezControl0; @@ -273,6 +279,8 @@ public: XPolygon GetRectPoly() const; }; +} + XPolygon ImpPathCreateUser::GetFormPoly() const { if (bBezier) return GetBezierPoly(); diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index b392e9523f79..dee1f97d0223 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -110,10 +110,13 @@ long lcl_ToLogic(double value) double sqrt2(double a, double b) { return sqrt(a * a + b * b); } } +namespace +{ struct FPDFBitmapDeleter { void operator()(FPDF_BITMAP bitmap) { FPDFBitmap_Destroy(bitmap); } }; +} using namespace com::sun::star; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index b6aede0dd926..68386971fb88 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -84,6 +84,8 @@ using namespace ::com::sun::star::style; namespace sdr { namespace table { +namespace { + class TableProperties : public TextProperties { protected: @@ -103,6 +105,8 @@ public: virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = nullptr) override; }; +} + TableProperties::TableProperties(SdrObject& rObj) : TextProperties(rObj) { @@ -143,12 +147,16 @@ std::unique_ptr<SfxItemSet> TableProperties::CreateObjectSpecificItemSet(SfxItem EE_ITEMS_START, EE_ITEMS_END>{}); } +namespace { + class TableObjectGeoData : public SdrTextObjGeoData { public: tools::Rectangle maLogicRect; }; +} + TableStyleSettings::TableStyleSettings() : mbUseFirstRow(true) , mbUseLastRow(false) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index d4c5ab1ad43b..2690e1d5062f 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -112,6 +112,8 @@ namespace o3tl namespace sdr { namespace table { +namespace { + class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< css::util::XModifyListener > { public: @@ -127,6 +129,7 @@ public: SvxTableController* mpController; }; +} // XModifyListener diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 0a4f81417f63..c80f4ace3f60 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -67,6 +67,8 @@ typedef std::map< OUString, sal_Int32 > CellStyleNameMap; typedef ::cppu::WeakComponentImplHelper< XStyle, XNameReplace, XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase; +namespace { + class TableDesignStyle : private ::cppu::BaseMutex, public TableDesignStyleBase { public: @@ -122,8 +124,12 @@ public: Reference< XStyle > maCellStyles[style_count]; }; +} + typedef std::vector< Reference< XStyle > > TableDesignStyleVector; +namespace { + class TableDesignFamily : public ::cppu::WeakImplHelper< XNameContainer, XNamed, XIndexAccess, XSingleServiceFactory, XServiceInfo, XComponent, XPropertySet > { public: @@ -177,6 +183,8 @@ public: TableDesignStyleVector maDesigns; }; +} + TableDesignStyle::TableDesignStyle() : TableDesignStyleBase(m_aMutex) { diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 776768affc53..abf7c55f85ba 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -41,6 +41,7 @@ namespace sdr { namespace table { +namespace { class OverlayTableEdge : public sdr::overlay::OverlayObject { @@ -55,6 +56,7 @@ public: OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ); }; +} TableEdgeHdl::TableEdgeHdl( const Point& rPnt, bool bHorizontal, sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nEdges ) : SdrHdl( rPnt, SdrHdlKind::User ) diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 43b7f44b2e78..267c6a9c6519 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -49,6 +49,8 @@ using namespace ::com::sun::star::beans; namespace sdr { namespace table { +namespace { + struct RTFCellDefault { SfxItemSet maItemSet; @@ -59,8 +61,12 @@ struct RTFCellDefault explicit RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnRowSpan(1), mnColSpan(1), mnCellX(0) {} }; +} + typedef std::vector< std::shared_ptr< RTFCellDefault > > RTFCellDefaultVector; +namespace { + struct RTFCellInfo { SfxItemSet const maItemSet; @@ -73,6 +79,8 @@ struct RTFCellInfo explicit RTFCellInfo( SfxItemPool& rPool ) : maItemSet( rPool ), mnStartPara(0), mnParaCount(0), mnCellX(0), mnRowSpan(1) {} }; +} + typedef std::shared_ptr< RTFCellInfo > RTFCellInfoPtr; typedef std::vector< RTFCellInfoPtr > RTFColumnVector; diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index 10a6173fab56..3687df3424e9 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -54,6 +54,8 @@ namespace drawinglayer { namespace primitive2d { + namespace { + class SdrCellPrimitive2D : public BufferedDecompositionPrimitive2D { private: @@ -85,6 +87,8 @@ namespace drawinglayer DeclPrimitive2DIDBlock() }; + } + void SdrCellPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*aViewInformation*/) const { // prepare unit polygon diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 443b29ebdc20..9ec03e787958 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -22,6 +22,8 @@ #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> +namespace { + class NumberingToolBoxControl; class NumberingPopup : public svtools::ToolbarMenu @@ -59,6 +61,8 @@ public: using svt::ToolboxController::createPopupWindow; }; +} + //class NumberingPopup NumberingPopup::NumberingPopup( NumberingToolBoxControl& rController, vcl::Window* pParent, NumberingPageType ePageType ) : diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 329931809c3a..65af6c136503 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -49,6 +49,7 @@ using namespace com::sun::star; +namespace { class SvxColorValueSetData : public TransferableHelper { @@ -68,6 +69,8 @@ public: {} }; +} + void SvxColorValueSetData::AddSupportedFormats() { AddFormat( SotClipboardFormatId::XFA ); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1b2483f11e4e..3d22213ca065 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -263,6 +263,8 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl, SvtValueSet*, voi m_xDialog->response(RET_OK); } +namespace { + class FontworkAlignmentWindow : public ToolbarMenu { public: @@ -278,6 +280,8 @@ private: void implSetAlignment( int nAlignmentMode, bool bEnabled ); }; +} + static const OUStringLiteral gsFontworkAlignment(".uno:FontworkAlignment"); FontworkAlignmentWindow::FontworkAlignmentWindow(svt::ToolboxController& rController, vcl::Window* pParentWindow) @@ -348,6 +352,8 @@ IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) } } +namespace { + class FontworkAlignmentControl : public svt::PopupWindowController { public: @@ -365,6 +371,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; +} FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkAlignment" ) @@ -412,6 +419,7 @@ com_sun_star_comp_svx_FontworkAlignmentControl_get_implementation( return cppu::acquire(new FontworkAlignmentControl(xContext)); } +namespace { class FontworkCharacterSpacingWindow : public ToolbarMenu { @@ -428,6 +436,9 @@ private: void implSetKernCharacterPairs( bool bEnabled ); }; + +} + static const OUStringLiteral gsFontworkCharacterSpacing(".uno:FontworkCharacterSpacing"); static const OUStringLiteral gsFontworkKernCharacterPairs(".uno:FontworkKernCharacterPairs"); @@ -561,6 +572,8 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) } } +namespace { + class FontworkCharacterSpacingControl : public svt::PopupWindowController { public: @@ -578,6 +591,7 @@ public: using svt::PopupWindowController::createPopupWindow; }; +} FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Reference< XComponentContext >& rxContext ) : svt::PopupWindowController( rxContext, Reference< css::frame::XFrame >(), ".uno:FontworkCharacterSpacingFloater" ) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index dee443327e08..a3095c8409c8 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -73,6 +73,8 @@ using namespace ::com::sun::star::lang; #define TOOLBOX_NAME "colorbar" #define RID_SVXSTR_UNDO_GRAFCROP RID_SVXSTR_GRAFCROP +namespace { + class ImplGrafMetricField : public MetricField { using Window::Update; @@ -94,6 +96,8 @@ public: void Update( const SfxPoolItem* pItem ); }; +} + ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), @@ -184,12 +188,16 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) SetText( OUString() ); } +namespace { + struct CommandToRID { const char* pCommand; const char* sResId; }; +} + static OUString ImplGetRID( const OUString& aCommand ) { static const CommandToRID aImplCommandToResMap[] = @@ -220,6 +228,8 @@ static OUString ImplGetRID( const OUString& aCommand ) return sRID; } +namespace { + class ImplGrafControl : public Control { using Window::Update; @@ -242,6 +252,8 @@ public: virtual void Resize() override; }; +} + ImplGrafControl::ImplGrafControl( vcl::Window* pParent, const OUString& rCmd, @@ -315,6 +327,8 @@ void ImplGrafControl::Resize() Control::Resize(); } +namespace { + class ImplGrafModeControl : public ListBox { using Window::Update; @@ -333,6 +347,8 @@ public: void Update( const SfxPoolItem* pItem ); }; +} + ImplGrafModeControl::ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ), mnCurPos( 0 ), diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 5e995a8f4833..14289e2fd704 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -47,6 +47,8 @@ using namespace ::com::sun::star::frame; SFX_IMPL_TOOLBOX_CONTROL(SvxTableToolBoxControl,SfxUInt16Item); SFX_IMPL_TOOLBOX_CONTROL(SvxColumnsToolBoxControl,SfxUInt16Item); +namespace { + class TableWindow : public SfxPopupWindow { private: @@ -93,6 +95,8 @@ private: void CloseAndShowTableDialog(); }; +} + const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; @@ -401,6 +405,8 @@ bool TableWindow::EventNotify( NotifyEvent& rNEvt ) return SfxPopupWindow::EventNotify( rNEvt ); } +namespace { + class ColumnsWindow : public SfxPopupWindow { private: @@ -431,6 +437,7 @@ public: virtual void PopupModeEnd() override; }; +} ColumnsWindow::ColumnsWindow( sal_uInt16 nId, vcl::Window* pParent, const OUString& rCmd, const OUString& rText, const Reference< XFrame >& rFrame ) : diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 0704b88006dc..545c58eda1d1 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -244,6 +244,8 @@ VclPtr<vcl::Window> SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *p return VclPtr<SvxMetricField>::Create( pParent, m_xFrame ).get(); } +namespace { + class SvxLineEndWindow : public svtools::ToolbarPopup { private: @@ -267,6 +269,8 @@ public: virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; +} + static constexpr sal_uInt16 gnCols = 2; SvxLineEndWindow::SvxLineEndWindow( svt::ToolboxController& rController, vcl::Window* pParentWindow ) @@ -458,6 +462,8 @@ void SvxLineEndWindow::GetFocus() } } +namespace { + class SvxLineEndToolBoxControl : public svt::PopupWindowController { public: @@ -475,6 +481,8 @@ private: using svt::ToolboxController::createPopupWindow; }; +} + SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( const css::uno::Reference<css::uno::XComponentContext>& rContext ) : svt::PopupWindowController( rContext, nullptr, OUString() ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index dfb3bbd13c7a..e864878bf6e1 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -191,6 +191,8 @@ private: DECL_STATIC_LINK(SvxStyleBox_Impl, ShowMoreHdl, void*, void); }; +namespace { + class SvxFontNameBox_Impl : public FontNameBox { using Window::Update; @@ -259,12 +261,16 @@ public: }; +} + void SvxFrmValueSet_Impl::MouseButtonUp( const MouseEvent& rMEvt ) { nModifier = rMEvt.GetModifier(); ValueSet::MouseButtonUp(rMEvt); } +namespace { + class SvxFrameWindow_Impl : public svtools::ToolbarPopup { private: @@ -290,8 +296,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; -namespace -{ class LineListBox final : public ListBox { public: @@ -606,6 +610,8 @@ namespace } } +namespace { + class SvxLineWindow_Impl : public svtools::ToolbarPopup { private: @@ -645,6 +651,8 @@ public: virtual void dispose() override; }; +} + class SvxStyleToolBoxControl; class SfxStyleControllerItem_Impl : public SfxStatusListener @@ -3303,6 +3311,8 @@ VclPtr<vcl::Window> SvxStyleToolBoxControl::CreateItemWindow( vcl::Window *pPare return pBox.get(); } +namespace { + class SvxFontNameToolBoxControl : public cppu::ImplInheritanceHelper< svt::ToolboxController, css::lang::XServiceInfo > { @@ -3327,6 +3337,8 @@ private: VclPtr<SvxFontNameBox_Impl> m_pBox; }; +} + SvxFontNameToolBoxControl::SvxFontNameToolBoxControl() { } @@ -3635,6 +3647,8 @@ com_sun_star_comp_svx_ColorToolBoxControl_get_implementation( // class SvxFrameToolBoxControl -------------------------------------------- +namespace { + class SvxFrameToolBoxControl : public svt::PopupWindowController { public: @@ -3652,6 +3666,8 @@ private: using svt::ToolboxController::createPopupWindow; }; +} + SvxFrameToolBoxControl::SvxFrameToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rContext ) : svt::PopupWindowController( rContext, nullptr, OUString() ) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 3bf56c17707f..d9c196a2dda3 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -41,6 +41,8 @@ using namespace ::com::sun::star::lang; namespace svx { + namespace { + /** implements a component to export namespaces of all SvXMLAttrContainerItem inside one or two pools with a variable count of which ids. */ @@ -68,6 +70,8 @@ namespace svx virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; + } + Reference< XInterface > NamespaceMap_createInstance( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { return static_cast<XWeak*>(new NamespaceMap( pWhichIds, pPool )); @@ -86,6 +90,7 @@ namespace svx return "com.sun.star.comp.Svx.NamespaceMap"; } + namespace { class NamespaceIteratorImpl { @@ -106,6 +111,8 @@ namespace svx bool next( OUString& rPrefix, OUString& rURL ); }; + + } } using namespace ::svx; diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index fc2ce754652f..68c1a27517fe 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -43,6 +43,8 @@ using namespace com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoXPropertyTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo > { private: @@ -79,6 +81,8 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; }; +} + SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw() : mpList( pList ), mnWhich( nWhich ) { @@ -230,6 +234,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) return getCount() != 0; } +namespace { class SvxUnoXColorTable : public SvxUnoXPropertyTable { @@ -248,6 +253,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() { return static_cast<OWeakObject*>(new SvxUnoXColorTable( pList )); @@ -285,6 +292,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( return { "com.sun.star.drawing.ColorTable" }; } +namespace { class SvxUnoXLineEndTable : public SvxUnoXPropertyTable { @@ -303,6 +311,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXLineEndTable( pTable )); @@ -350,6 +360,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceName return { "com.sun.star.drawing.LineEndTable" }; } +namespace { class SvxUnoXDashTable : public SvxUnoXPropertyTable { @@ -368,6 +379,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXDashTable( pTable )); @@ -425,6 +438,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( return { "com.sun.star.drawing.DashTable" }; } +namespace { class SvxUnoXHatchTable : public SvxUnoXPropertyTable { @@ -443,6 +457,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXHatchTable( pTable )); @@ -495,6 +511,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( return { "com.sun.star.drawing.HatchTable" }; } +namespace { class SvxUnoXGradientTable : public SvxUnoXPropertyTable { @@ -513,6 +530,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXGradientTable( pTable )); @@ -577,6 +596,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNam return { "com.sun.star.drawing.GradientTable" }; } +namespace { class SvxUnoXBitmapTable : public SvxUnoXPropertyTable { @@ -595,6 +615,8 @@ public: virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; +} + uno::Reference< uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() { return static_cast<OWeakObject*>(new SvxUnoXBitmapTable( pTable )); diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 2b1ba019292e..575c9ecc189a 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -37,6 +37,8 @@ using namespace ::cppu; const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4; +namespace { + class SvxUnoGluePointAccess : public WeakImplHelper< container::XIndexContainer, container::XIdentifierContainer > { private: @@ -75,6 +77,8 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; }; +} + static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) throw() { rUnoGlue.Position.X = rSdrGlue.GetPos().X(); diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index c80ffcb69f10..f94369907f73 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -36,6 +36,8 @@ using namespace ::com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoBitmapTable : public SvxUnoNameItemTable { public: @@ -52,6 +54,8 @@ public: virtual uno::Type SAL_CALL getElementType( ) override; }; +} + SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw() : SvxUnoNameItemTable( pModel, XATTR_FILLBITMAP, MID_BITMAP ) { diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index c827a288fafe..f285ac30c7d1 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -33,6 +33,8 @@ using namespace ::com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoDashTable : public SvxUnoNameItemTable { public: @@ -48,6 +50,8 @@ public: virtual uno::Type SAL_CALL getElementType( ) override; }; +} + SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() : SvxUnoNameItemTable( pModel, XATTR_LINEDASH, MID_LINEDASH ) { diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index f33d947fcd08..4b3842c9d026 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -32,6 +32,8 @@ using namespace ::com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoGradientTable : public SvxUnoNameItemTable { public: @@ -47,6 +49,8 @@ public: virtual uno::Type SAL_CALL getElementType( ) override; }; +} + SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() : SvxUnoNameItemTable( pModel, XATTR_FILLGRADIENT, MID_FILLGRADIENT ) { diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 8e21de8229bd..ec114ba91b10 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -32,6 +32,8 @@ using namespace ::com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoHatchTable : public SvxUnoNameItemTable { public: @@ -47,6 +49,8 @@ public: virtual uno::Type SAL_CALL getElementType( ) override; }; +} + SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() : SvxUnoNameItemTable( pModel, XATTR_FILLHATCH, MID_FILLHATCH ) { diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index a6d56f20d479..ec1d0d4cbfe1 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -51,6 +51,8 @@ using namespace ::cppu; typedef std::vector<std::unique_ptr<SfxItemSet>> ItemPoolVector; +namespace { + class SvxUnoMarkerTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo >, public SfxListener { @@ -93,6 +95,8 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; }; +} + SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw() : mpModel( pModel ), mpModelPool( pModel ? &pModel->GetItemPool() : nullptr ) diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 06bd11bda42e..891423952aff 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -861,11 +861,15 @@ sal_uInt32 UHashMap::getId( const OUString& rCompareString ) return it->second; } +namespace { + struct theSvxMapProvider : public rtl::Static<SvxUnoPropertyMapProvider, theSvxMapProvider> { }; +} + SvxUnoPropertyMapProvider& getSvxMapProvider() { return theSvxMapProvider::get(); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 10ab55650102..aaa66de99511 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -246,6 +246,7 @@ static void ConvertObjectToHomogenMatric( E3dObject const * pObject, Any& rValue rValue <<= aHomMat; } +namespace { struct ImpRememberTransAndRect { @@ -253,6 +254,8 @@ struct ImpRememberTransAndRect tools::Rectangle maRect; }; +} + bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 6ebb7a090f36..37283fa085f6 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -142,6 +142,8 @@ struct SvxShapeImpl } }; +namespace { + class ShapePositionProvider : public PropertyValueProvider { public: @@ -173,6 +175,8 @@ protected: } }; +} + SvxShape::SvxShape( SdrObject* pObject ) : maSize(100,100) , mpImpl( new SvxShapeImpl( *this, maMutex ) ) diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 2ad927a35716..9653f36360bb 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -32,6 +32,8 @@ using namespace ::com::sun::star; using namespace ::cppu; +namespace { + class SvxUnoTransGradientTable : public SvxUnoNameItemTable { public: @@ -47,6 +49,8 @@ public: virtual uno::Type SAL_CALL getElementType( ) override; }; +} + SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() : SvxUnoNameItemTable( pModel, XATTR_FILLFLOATTRANSPARENCE, MID_FILLGRADIENT ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 400146ce579b..4ec6f5aeb8db 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -65,6 +65,8 @@ using namespace cppu; using com::sun::star::embed::XTransactedObject; +namespace { + class SvxXMLTableEntryExporter { public: @@ -134,6 +136,7 @@ public: virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; }; +} SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const css::uno::Reference< css::uno::XComponentContext >& rContext, diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index bb2c67e39475..570ae8df777f 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -69,8 +69,6 @@ namespace { enum class SvxXMLTableImportContextEnum { Color, Marker, Dash, Hatch, Gradient, Bitmap }; -} - class SvxXMLTableImportContext : public SvXMLImportContext { public: @@ -93,6 +91,7 @@ private: bool const mbOOoFormat; }; +} SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), |