From 765f6211b1371c1e40de386e715de6b3d1a8df86 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 11 Mar 2015 16:14:47 +0100 Subject: utl::ConfigItem::Commit() should call ClearModified() Rename the virtual function, and add a new non-virtual Commit() to do that. Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022 --- svx/source/form/fmshimp.cxx | 2 +- svx/source/inc/fmshimp.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'svx') diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 10ff7106930f..f41cfacaed5f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3580,7 +3580,7 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPr } } -void FmXFormShell::Commit() +void FmXFormShell::ImplCommit() { } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index bf057cc2d835..b274ae4cce8f 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -490,7 +490,6 @@ private: // ConfigItem related stuff SAL_DLLPRIVATE virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual void Commit() SAL_OVERRIDE; SAL_DLLPRIVATE void implAdjustConfigCache(); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > @@ -517,6 +516,7 @@ private: */ SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + SAL_DLLPRIVATE virtual void ImplCommit() SAL_OVERRIDE; // asynchronous cursor actions/navigation slot handling -- cgit