diff options
32 files changed, 46 insertions, 74 deletions
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index b965e59a7d71..aabf48e0dc2e 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -39,8 +39,8 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, { public: - Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); - virtual ~Window(); + explicit Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); + virtual ~Window(); // XPlayerWindow virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index 294bcc5b3269..39f818518bed 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -207,7 +207,7 @@ GraphicObject getXBitmapFromName(css::uno::Reference<css::frame::XModel> xModel, class PreventUpdate { public: - PreventUpdate(bool& bUpdate): + explicit PreventUpdate(bool& bUpdate): mbUpdate(bUpdate) { mbUpdate = false; diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 55753bd6d027..ccde7947f281 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -93,7 +93,7 @@ css::uno::Any getLineDash( class PreventUpdate { public: - PreventUpdate(bool& bUpdate): + explicit PreventUpdate(bool& bUpdate): mbUpdate(bUpdate) { mbUpdate = false; diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx index 5db469e753f7..d1534f0014b1 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx @@ -30,7 +30,7 @@ class ChartSidebarModifyListener : public cppu::WeakImplHelper1<css::util::XModi { public: - ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); + explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); virtual ~ChartSidebarModifyListener(); virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 3c31644e4872..c4c78cec6af0 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -35,7 +35,7 @@ class ChartSidebarSelectionListener : public cppu::WeakImplHelper1<css::view::XS public: // listen to all chart selection changes - ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); + explicit ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); // only liste to the changes of eType ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType); virtual ~ChartSidebarSelectionListener(); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 31e71c5119b6..6876f32490bb 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -66,7 +66,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OPreviewWindow(vcl::Window* _pParent); + explicit OPreviewWindow(vcl::Window* _pParent); // Window overrides virtual void Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 193c35d844bd..e57be72feb8e 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -82,7 +82,7 @@ class AddTableDialogContext : public IAddTableDialogContext OJoinController& m_rController; public: - AddTableDialogContext( OJoinController& _rController ) + explicit AddTableDialogContext( OJoinController& _rController ) :m_rController( _rController ) { } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index aa6b89efb7e8..97e36962c34e 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -33,7 +33,7 @@ class ODBTypeWizDialogSetup bool m_bStartTableWizard; protected: - ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODBTypeWizDialogSetup(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 5901a8c6ef26..95a9594f0ccb 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -31,7 +31,7 @@ class OTableFilterDialog { protected: - OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit OTableFilterDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 6ecaa148edc0..f6003a71850d 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -31,7 +31,7 @@ class OUserSettingsDialog { protected: - OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit OUserSettingsDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index e511940e49fb..68b8b8f2c7fe 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -31,7 +31,7 @@ class ODataSourcePropertyDialog { protected: - ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODataSourcePropertyDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); public: // XTypeProvider diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index df98196cefce..ec437fdeae89 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -51,7 +51,7 @@ namespace dbaui // </properties> protected: - ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ComposerDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ComposerDialog(); public: @@ -77,7 +77,7 @@ namespace dbaui class RowsetFilterDialog : public ComposerDialog { public: - RowsetFilterDialog( + explicit RowsetFilterDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); @@ -102,7 +102,7 @@ namespace dbaui class RowsetOrderDialog : public ComposerDialog { public: - RowsetOrderDialog( + explicit RowsetOrderDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 05e5a2d75939..6428fbef135b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -189,7 +189,7 @@ namespace dbaui bool isInitialized() const { return m_xSourceConnection.is() && m_pSourceObject.get() && m_xDestConnection.is(); } protected: - CopyTableWizard( const Reference< XComponentContext >& _rxORB ); + explicit CopyTableWizard( const Reference< XComponentContext >& _rxORB ); virtual ~CopyTableWizard(); // OGenericUnoDialog overridables @@ -355,7 +355,7 @@ private: class CopyTableAccessGuard { public: - CopyTableAccessGuard( CopyTableWizard& _rWizard ) + explicit CopyTableAccessGuard( CopyTableWizard& _rWizard ) :m_rWizard( _rWizard ) { m_rWizard.getMutex().acquire(); diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 4c5e9c3ef64c..68485db39ea7 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -125,7 +125,7 @@ namespace dbaui class SQLExceptionInteractionHandler : public BasicInteractionHandler { public: - SQLExceptionInteractionHandler( + explicit SQLExceptionInteractionHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, false ) @@ -153,7 +153,7 @@ namespace dbaui class LegacyInteractionHandler : public BasicInteractionHandler { public: - LegacyInteractionHandler( + explicit LegacyInteractionHandler( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :BasicInteractionHandler( rxContext, true ) diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index f9c1c36b4cf7..cd1e722d2cf4 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -70,7 +70,7 @@ namespace dbaui PropertyValues m_aPropertyValues; protected: - OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext ); + explicit OTextConnectionSettingsDialog( const Reference<XComponentContext>& _rContext ); virtual ~OTextConnectionSettingsDialog(); public: diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 1c5ff4e2f400..f3b92fc304e1 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -44,7 +44,7 @@ namespace dbaui OUString m_sInitialSelection; css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; protected: - ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); + explicit ODirectSQLDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ODirectSQLDialog(); public: diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 0c31758d77a3..cc7e68d30d96 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -28,7 +28,7 @@ namespace desktop class DesktopContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext > { public: - DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); + explicit DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); // XCurrentContext virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index c329e7a4880e..add93768efa8 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -45,7 +45,7 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign // that was given by command line or by IPC pipe communication. struct ProcessDocumentsRequest { - ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): + explicit ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): aCwdUrl(cwdUrl), pcProcessed( NULL ), bTextCat( false ) {} boost::optional< OUString > aCwdUrl; diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 3d5fe22fa898..0d914facea4d 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.cxx @@ -44,7 +44,7 @@ namespace drawinglayer { } - ImpMaterialAttribute3D(const basegfx::BColor& rColor) + explicit ImpMaterialAttribute3D(const basegfx::BColor& rColor) : maColor(rColor), maSpecular(1.0, 1.0, 1.0), maEmission(), diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx index e47750ee9b5e..7d17c9a893ca 100644 --- a/drawinglayer/source/dumper/EnhancedShapeDumper.hxx +++ b/drawinglayer/source/dumper/EnhancedShapeDumper.hxx @@ -34,11 +34,9 @@ class EnhancedShapeDumper { public: - EnhancedShapeDumper(xmlTextWriterPtr writer) - : - xmlWriter(writer) + explicit EnhancedShapeDumper(xmlTextWriterPtr writer) + : xmlWriter(writer) { - } // auxiliary functions diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx index 843ba43ba1c8..f8484ef51b2e 100644 --- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx @@ -53,7 +53,7 @@ namespace sal_uInt32 generateStepTime(sal_uInt32 nIndex) const; public: - animatedBitmapExPreparator(const Graphic& rGraphic); + explicit animatedBitmapExPreparator(const Graphic& rGraphic); sal_uInt32 count() const { return maSteps.size(); } sal_uInt32 loopCount() const { return (sal_uInt32)maAnimation.GetLoopCount(); } diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 8d5fcf7056c9..bc128b538aa3 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -347,7 +347,7 @@ namespace { class UrlEditEngine : public EditEngine { public: - UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {} + explicit UrlEditEngine(SfxItemPool *pPool) : EditEngine(pPool) {} virtual OUString CalcFieldValue( const SvxFieldItem&, sal_Int32, sal_Int32, Color*&, Color*& ) SAL_OVERRIDE { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 87886f4d7e77..0dc65b211950 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -896,7 +896,7 @@ namespace accessibility struct IndexCompare { const PropertyValue* pValues; - IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {} + explicit IndexCompare( const PropertyValue* pVals ) : pValues(pVals) {} bool operator() ( const sal_Int32& a, const sal_Int32& b ) const { return pValues[a].Name < pValues[b].Name; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 3f1e34283164..43360140cd3f 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -470,7 +470,7 @@ class FindTextPortionByAddress : std::unary_function<TextPortion, bool> { const TextPortion* mp; public: - FindTextPortionByAddress(const TextPortion* p) : mp(p) {} + explicit FindTextPortionByAddress(const TextPortion* p) : mp(p) {} bool operator() (const TextPortion& v) const { return &v == mp; @@ -1991,7 +1991,7 @@ class RemoveEachItemFromPool : std::unary_function<ContentNode, void> { EditDoc& mrDoc; public: - RemoveEachItemFromPool(EditDoc& rDoc) : mrDoc(rDoc) {} + explicit RemoveEachItemFromPool(EditDoc& rDoc) : mrDoc(rDoc) {} void operator() (const ContentNode& rNode) { mrDoc.RemoveItemsFromPool(rNode); @@ -2896,7 +2896,7 @@ class FindByAddress : std::unary_function<EditCharAttrib, bool> { const EditCharAttrib* mpAttr; public: - FindByAddress(const EditCharAttrib* p) : mpAttr(p) {} + explicit FindByAddress(const EditCharAttrib* p) : mpAttr(p) {} bool operator() (const EditCharAttrib& r) const { return &r == mpAttr; @@ -2985,7 +2985,7 @@ class FindByStartPos : std::unary_function<EditCharAttrib, bool> { sal_Int32 mnPos; public: - FindByStartPos(sal_Int32 nPos) : mnPos(nPos) {} + explicit FindByStartPos(sal_Int32 nPos) : mnPos(nPos) {} bool operator() (const EditCharAttrib& r) const { return r.GetStart() >= mnPos; @@ -3015,7 +3015,7 @@ class RemoveEmptyAttrItem : std::unary_function<EditCharAttrib, void> { SfxItemPool& mrItemPool; public: - RemoveEmptyAttrItem(SfxItemPool& rPool) : mrItemPool(rPool) {} + explicit RemoveEmptyAttrItem(SfxItemPool& rPool) : mrItemPool(rPool) {} void operator() (const EditCharAttrib& r) { if (r.IsEmpty()) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index c9cce3d29bf9..d9645458610a 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -877,7 +877,7 @@ class FindByParagraph : std::unary_function<editeng::Section, bool> { sal_Int32 mnPara; public: - FindByParagraph(sal_Int32 nPara) : mnPara(nPara) {} + explicit FindByParagraph(sal_Int32 nPara) : mnPara(nPara) {} bool operator() (const editeng::Section& rAttr) const { return rAttr.mnParagraph == mnPara; diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx index 523f8c6cc175..597f60c135e1 100644 --- a/editeng/source/editeng/editundo.cxx +++ b/editeng/source/editeng/editundo.cxx @@ -505,7 +505,7 @@ struct RemoveAttribsFromPool : std::unary_function<ContentAttribsInfo, void> { SfxItemPool& mrPool; public: - RemoveAttribsFromPool(SfxItemPool& rPool) : mrPool(rPool) {} + explicit RemoveAttribsFromPool(SfxItemPool& rPool) : mrPool(rPool) {} void operator() (ContentAttribsInfo& rInfo) { rInfo.RemoveAllCharAttribsFromPool(mrPool); diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx index 1f90fc56bd33..80a35e950c6d 100644 --- a/editeng/source/editeng/fieldupdater.cxx +++ b/editeng/source/editeng/fieldupdater.cxx @@ -22,7 +22,7 @@ class FieldUpdaterImpl { EditTextObjectImpl& mrObj; public: - FieldUpdaterImpl(EditTextObject& rObj) : mrObj(*rObj.mpImpl) {} + explicit FieldUpdaterImpl(EditTextObject& rObj) : mrObj(*rObj.mpImpl) {} FieldUpdaterImpl(const FieldUpdaterImpl& r) : mrObj(r.mrObj) {} void updateTableFields(int nTab) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 8269dae61488..a78b6c526303 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -1731,8 +1731,10 @@ namespace { struct FindByPos { - FindByPos(sal_Int32 nPos): - mnPos(nPos) {} + explicit FindByPos(sal_Int32 nPos) + : mnPos(nPos) + { + } bool operator()(const ScriptTypePosInfos::value_type& rValue) { diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 20fee5de0fab..3ee4bb02fc67 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -3317,7 +3317,7 @@ public: //copied to the GraphicObject when necessary SvStream* pStream; - SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} + explicit SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {} }; diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx index 43e84b86080c..e148318146b5 100644 --- a/editeng/source/lookuptree/Trie.cxx +++ b/editeng/source/lookuptree/Trie.cxx @@ -26,7 +26,7 @@ struct TrieNode TrieNode* mLatinArray[LATIN_ARRAY_SIZE]; - TrieNode(sal_Unicode aCharacter = '\0'); + explicit TrieNode(sal_Unicode aCharacter = '\0'); virtual ~TrieNode(); void markWord(); diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index bc5f12f5abd3..259851f57915 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -28,7 +28,7 @@ class SvxEditEngineSourceImpl; class SvxEditEngineSource : public SvxEditSource { public: - SvxEditEngineSource( EditEngine* pEditEngine ); + explicit SvxEditEngineSource( EditEngine* pEditEngine ); virtual ~SvxEditEngineSource(); virtual SvxEditSource* Clone() const SAL_OVERRIDE; @@ -36,7 +36,7 @@ public: virtual void UpdateData() SAL_OVERRIDE; private: - SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); + explicit SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ); SvxEditEngineSourceImpl* mpImpl; }; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 5d575a1d7d60..4efcc4608c1f 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -57,12 +57,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; using namespace cppu; - - class SvxEditEngineSourceImpl; - - class SvxEditEngineSourceImpl { private: @@ -74,7 +70,7 @@ private: ~SvxEditEngineSourceImpl(); public: - SvxEditEngineSourceImpl( EditEngine* pEditEngine ); + explicit SvxEditEngineSourceImpl( EditEngine* pEditEngine ); void SAL_CALL acquire(); void SAL_CALL release(); @@ -82,11 +78,6 @@ public: SvxTextForwarder* GetTextForwarder(); }; - - - - - SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) : maRefCount(0), mpEditEngine( pEditEngine ), @@ -94,30 +85,22 @@ SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine ) { } - - SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl() { delete mpTextForwarder; } - - void SAL_CALL SvxEditEngineSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } - - void SAL_CALL SvxEditEngineSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) delete this; } - - SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() { if (!mpTextForwarder) @@ -126,40 +109,29 @@ SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder() return mpTextForwarder; } - // SvxTextEditSource - - SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine ) { mpImpl = new SvxEditEngineSourceImpl( pEditEngine ); mpImpl->acquire(); } - - SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl ) { mpImpl = pImpl; mpImpl->acquire(); } - - SvxEditEngineSource::~SvxEditEngineSource() { mpImpl->release(); } - - SvxEditSource* SvxEditEngineSource::Clone() const { return new SvxEditEngineSource( mpImpl ); } - - SvxTextForwarder* SvxEditEngineSource::GetTextForwarder() { return mpImpl->GetTextForwarder(); |