diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 12:16:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-23 13:48:37 +0200 |
| commit | 93449eee17d88532cb8679496a523ded9cd03b0a (patch) | |
| tree | 2cda72577449d17af20039bee928406d92b17fcf /sw/source/uibase/uno/unotxvw.cxx | |
| parent | f586c7ec352b3b7b23dba0e1e774d85b1c14e2b7 (diff) | |
merge comphelper::ChainablePropertySet with comphelper::ChainableHelperNoState
Change-Id: I8fb93665b2a2f46019306f473882a7f3d7aece87
Reviewed-on: https://gerrit.libreoffice.org/36787
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/uno/unotxvw.cxx')
| -rw-r--r-- | sw/source/uibase/uno/unotxvw.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index ef383b94c874..040e883ad877 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -85,7 +85,6 @@ using namespace ::com::sun::star::view; using namespace ::com::sun::star::frame; using ::com::sun::star::util::URL; -using comphelper::HelperBaseNoState; SwXTextView::SwXTextView(SwView* pSwView) : SfxBaseController(pSwView), @@ -107,7 +106,7 @@ void SwXTextView::Invalidate() { if(mxViewSettings.is()) { - HelperBaseNoState *pSettings = static_cast < HelperBaseNoState * > ( mxViewSettings.get() ); + comphelper::ChainablePropertySet *pSettings = static_cast < comphelper::ChainablePropertySet * > ( mxViewSettings.get() ); static_cast < SwXViewSettings* > ( pSettings )->Invalidate(); mxViewSettings.clear(); } @@ -504,7 +503,7 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings() { if(!mxViewSettings.is()) { - mxViewSettings = static_cast < HelperBaseNoState * > ( new SwXViewSettings( m_pView ) ); + mxViewSettings = new SwXViewSettings( m_pView ); } } else |