diff options
Diffstat (limited to 'svx/source/inc')
| -rw-r--r-- | svx/source/inc/datanavi.hxx | 4 | ||||
| -rw-r--r-- | svx/source/inc/delayedevent.hxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/fmcontrollayout.hxx | 22 | ||||
| -rw-r--r-- | svx/source/inc/fmobj.hxx | 2 | ||||
| -rw-r--r-- | svx/source/inc/fmpgeimp.hxx | 5 | ||||
| -rw-r--r-- | svx/source/inc/formcontrolling.hxx | 5 |
6 files changed, 15 insertions, 28 deletions
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index a3459b8329d2..7a351b9e1fa9 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -156,7 +156,7 @@ namespace svxform OUString m_sInstance_API; OUString m_sNone_API; - ReplaceString( const ReplaceString& ); + ReplaceString( const ReplaceString& ) SAL_DELETED_FUNCTION; public: ReplaceString() : @@ -204,7 +204,7 @@ namespace svxform OUString m_sPut_API; OUString m_sGet_API; - MethodString( const MethodString& ); + MethodString( const MethodString& ) SAL_DELETED_FUNCTION; public: diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 9f4a12a1b533..5f078aa9d3c7 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -69,9 +69,8 @@ namespace svxform DECL_LINK( OnCall, void* ); private: - DelayedEvent(); // never implemented - DelayedEvent( const DelayedEvent& ); // never implemented - DelayedEvent& operator=( const DelayedEvent& ); // never implemented + DelayedEvent( const DelayedEvent& ) SAL_DELETED_FUNCTION; + DelayedEvent& operator=( const DelayedEvent& ) SAL_DELETED_FUNCTION; }; diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 422763c957fd..b717c8f6cb37 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -29,24 +29,23 @@ namespace svxform { - class ControlLayouter + namespace ControlLayouter { - public: /** initializes the layout of a newly created form control (model) */ - static void initializeControlLayout( + void initializeControlLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, DocumentType _eDocType ); /** determines whether for the given document type, dynamic control border coloring is enabled */ - static bool useDynamicBorderColor( DocumentType _eDocType ); + bool useDynamicBorderColor( DocumentType _eDocType ); /** determines whether for the given document type, form controls should use the document's reference device for text rendering */ - static bool useDocumentReferenceDevice( DocumentType _eDocType ); + bool useDocumentReferenceDevice( DocumentType _eDocType ); /** gets the "default" style in a document which can be used if some default text format is needed @@ -56,18 +55,9 @@ namespace svxform @param _rxModel a form component. */ - static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefaultDocumentTextStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); - - private: - ControlLayouter(); // never implemented - - private: - static ::utl::OConfigurationNode - getLayoutSettings( - DocumentType _eDocType - ); - }; + } } // namespace svxform diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 8663bc9e1b5d..01ff874296c6 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj { - FmFormObj( const FmFormObj& ); // disabled + FmFormObj( const FmFormObj& ) SAL_DELETED_FUNCTION; ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > aEvts; // events des Objects ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor> m_aEventsHistory; diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index fee4a834dfb0..17b5644ee484 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -146,9 +146,8 @@ private: impl_createControlShapeMap_nothrow(); private: - FmFormPageImpl(); // never implemented - FmFormPageImpl( const FmFormPageImpl& ); // never implemented - FmFormPageImpl& operator=( const FmFormPageImpl& ); // never implemented + FmFormPageImpl( const FmFormPageImpl& ) SAL_DELETED_FUNCTION; + FmFormPageImpl& operator=( const FmFormPageImpl& ) SAL_DELETED_FUNCTION; }; diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 5822a6ec1934..5927e4a505dc 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -215,9 +215,8 @@ namespace svx } private: - FormControllerHelper(); // never implemented - FormControllerHelper( const FormControllerHelper& ); // never implemented - FormControllerHelper& operator=( const FormControllerHelper& ); // never implemented + FormControllerHelper( const FormControllerHelper& ) SAL_DELETED_FUNCTION; + FormControllerHelper& operator=( const FormControllerHelper& ) SAL_DELETED_FUNCTION; }; |