diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-14 14:21:50 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-14 14:21:50 +0200 |
commit | a640be7e2d30462e7115fe6d897b6d5ed3fef9f8 (patch) | |
tree | 6bae79549b48f4db834e792be819ea6d5c57a504 /reportdesign/source | |
parent | e13022a825917ad9bf1d2b16af6b88a4fa97b1cd (diff) |
Clean up function declarations and some unused functions
Change-Id: I367acc372d6b5996430a2c560e776a469b7e0007
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/UndoEnv.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFixedContent.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 7 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportControllerObserver.cxx | 5 |
9 files changed, 23 insertions, 39 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 35260d4d0a84..300ea9a8396f 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -121,6 +121,7 @@ #include <boost/bind.hpp> #include <boost/mem_fn.hpp> +#include <boost/noncopyable.hpp> #include <boost/utility.hpp> // page styles @@ -2409,15 +2410,14 @@ OUString SAL_CALL OReportDefinition::getShapeType( ) throw (uno::RuntimeExcepti typedef ::cppu::WeakImplHelper2< container::XNameContainer, container::XIndexAccess > TStylesBASE; -class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE +class OStylesHelper: + public cppu::BaseMutex, public TStylesBASE, private boost::noncopyable { typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess> TStyleElements; TStyleElements m_aElements; ::std::vector<TStyleElements::iterator> m_aElementsPos; uno::Type m_aType; - OStylesHelper(const OStylesHelper&); - void operator =(const OStylesHelper&); protected: virtual ~OStylesHelper(){} public: diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 4ce78a9a56e1..e39bd243d607 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -29,6 +29,7 @@ #include "RptResId.hrc" #include "RptModel.hxx" +#include <boost/noncopyable.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -65,11 +66,6 @@ struct PropertyInfo { bool bIsReadonlyOrTransient; - PropertyInfo() - :bIsReadonlyOrTransient( false ) - { - } - PropertyInfo( const bool i_bIsTransientOrReadOnly ) :bIsReadonlyOrTransient( i_bIsTransientOrReadOnly ) { @@ -94,10 +90,8 @@ typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterf -class OXUndoEnvironmentImpl +class OXUndoEnvironmentImpl: private boost::noncopyable { - OXUndoEnvironmentImpl(OXUndoEnvironmentImpl&); - void operator =(OXUndoEnvironmentImpl&); public: OReportModel& m_rModel; PropertySetInfoCache m_aPropertySetCache; diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 7fa7397bede9..8f77b44563d8 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -18,6 +18,7 @@ */ #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" +#include <boost/noncopyable.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> @@ -37,11 +38,10 @@ namespace rptxml { using namespace ::com::sun::star; -class OXMLCharContent : public XMLCharContext +class OXMLCharContent: public XMLCharContext, private boost::noncopyable { OXMLFixedContent* m_pFixedContent; - OXMLCharContent(const OXMLCharContent&); - OXMLCharContent operator =(const OXMLCharContent&); + public: OXMLCharContent( SvXMLImport& rImport, diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 4690abce0ed4..908fd7efeef7 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -16,6 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#include <sal/config.h> + +#include <boost/noncopyable.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> @@ -77,11 +81,11 @@ using namespace xmloff; using namespace ::com::sun::star::util; -class RptMLMasterStylesContext_Impl : public XMLTextMasterStylesContext +class RptMLMasterStylesContext_Impl: + public XMLTextMasterStylesContext, private boost::noncopyable { ORptFilter& m_rImport; - RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&); - void operator =(const RptMLMasterStylesContext_Impl&); + public: TYPEINFO_OVERRIDE(); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index c6b10fcdc28b..7031fcc9e43f 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -18,6 +18,7 @@ */ #include "AddField.hxx" #include "UITools.hxx" +#include <boost/noncopyable.hpp> #include <svx/dbaexchange.hxx> #include <svx/svdpagv.hxx> #include <com/sun/star/sdb/CommandType.hpp> @@ -59,13 +60,10 @@ using namespace lang; using namespace container; using namespace ::svx; -class OAddFieldWindowListBox : public SvTreeListBox +class OAddFieldWindowListBox: public SvTreeListBox, private boost::noncopyable { OAddFieldWindow* m_pTabWin; - OAddFieldWindowListBox(const OAddFieldWindowListBox&); - void operator =(const OAddFieldWindowListBox&); - public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); virtual ~OAddFieldWindowListBox(); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 9843c30c7382..c39ac44ab14a 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -82,6 +82,7 @@ typedef ::svt::EditBrowseBox OFieldExpressionControl_Base; typedef ::cppu::WeakImplHelper1< container::XContainerListener > TContainerListenerBase; class OFieldExpressionControl : public TContainerListenerBase ,public OFieldExpressionControl_Base + ,private boost::noncopyable { ::osl::Mutex m_aMutex; ::std::vector<sal_Int32> m_aGroupPositions; @@ -94,11 +95,8 @@ class OFieldExpressionControl : public TContainerListenerBase OGroupsSortingDialog* m_pParent; bool m_bIgnoreEvent; - void fillListBox(const uno::Reference< beans::XPropertySet>& _xDest,long nRow,sal_uInt16 nColumnId); sal_Bool SaveModified(bool _bAppend); - OFieldExpressionControl(const OFieldExpressionControl&); // NO COPY - void operator =(const OFieldExpressionControl&); // NO ASSIGN public: OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId); virtual ~OFieldExpressionControl(); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index c897cd6f5e5a..359c0109d7ef 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -24,6 +24,7 @@ #include "UITools.hxx" #include "RptUndo.hxx" #include "reportformula.hxx" +#include <boost/noncopyable.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XFixedText.hpp> @@ -110,6 +111,7 @@ class NavigatorTree : public ::cppu::BaseMutex , public reportdesign::ITraverseReport , public comphelper::OSelectionChangeListener , public ::comphelper::OPropertyChangeListener + , private boost::noncopyable { class UserData; friend class UserData; @@ -157,8 +159,6 @@ class NavigatorTree : public ::cppu::BaseMutex void traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition = TREELIST_APPEND); void traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent); - NavigatorTree(const NavigatorTree&); - void operator =(const NavigatorTree&); protected: virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; // DragSourceHelper overridables @@ -864,10 +864,8 @@ void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) // class ONavigatorImpl -class ONavigatorImpl +class ONavigatorImpl: private boost::noncopyable { - ONavigatorImpl(const ONavigatorImpl&); - void operator =(const ONavigatorImpl&); public: ONavigatorImpl(OReportController& _rController,ONavigator* _pParent); virtual ~ONavigatorImpl(); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index af429ce8c977..17f87778d60e 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -74,13 +74,6 @@ public: if ( m_pPropWin && aSize.Height() && aSize.Width() ) m_pPropWin->SetSizePixel(aSize); } - long getMinimumWidth() const - { - long nRet = 0; - if ( m_pPropWin ) - nRet = m_pPropWin->getMinimumSize().Width(); - return nRet; - } }; diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 9594ac18dbe1..2f0629f26788 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -23,6 +23,7 @@ #include <ReportControllerObserver.hxx> #include <ReportController.hxx> +#include <boost/noncopyable.hpp> #include <svl/smplhint.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -47,10 +48,8 @@ namespace rptui typedef std::map<OUString, bool> AllProperties; typedef std::map<uno::Reference< beans::XPropertySet >, AllProperties> PropertySetInfoCache; -class OXReportControllerObserverImpl +class OXReportControllerObserverImpl: private boost::noncopyable { - OXReportControllerObserverImpl(OXReportControllerObserverImpl&); - void operator =(OXReportControllerObserverImpl&); public: const OReportController& m_rReportController; ::std::vector< uno::Reference< container::XChild> > m_aSections; |