svx/source/form/formcontrolfactory.cxx | 16 +++-------------
svx/source/inc/formcontrolfactory.hxx | 4 +---
2 files changed, 4 insertions(+), 16 deletions(-)
New commits:
commit df157d5291ba3531d2c79539addfd0dbff48ac67
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 21 14:28:22 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Jul 21 20:07:46 2021 +0200
no need for FormControlFactory to have a pimpl
Change-Id: Ia5dcccafffe69eac3369a0f2923b9aa526d68cbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119332
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/svx/source/form/formcontrolfactory.cxx
b/svx/source/form/formcontrolfactory.cxx
index 780171aa5cf9..009bafb85b5d 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -90,23 +90,13 @@ namespace svxform
namespace ColumnValue = ::com::sun::star::sdbc::ColumnValue;
namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
- struct FormControlFactory_Data
- {
- Reference<XComponentContext> m_xContext;
-
- explicit FormControlFactory_Data( const Reference<XComponentContext>&
_rContext )
- :m_xContext( _rContext )
- {
- }
- };
-
FormControlFactory::FormControlFactory( const
Reference<XComponentContext>& _rContext )
- :m_pData( new FormControlFactory_Data( _rContext ) )
+ :m_xContext( _rContext )
{
}
FormControlFactory::FormControlFactory( )
- :m_pData( new FormControlFactory_Data(
comphelper::getProcessComponentContext() ) )
+ :m_xContext( comphelper::getProcessComponentContext() )
{
}
@@ -524,7 +514,7 @@ namespace svxform
// let's see if the data source which the form belongs to (if any)
// has a setting for the preferred line end format
bool bDosLineEnds = false;
- Sequence< PropertyValue > aInfo =
lcl_getDataSourceIndirectProperties( _rxModel, m_pData->m_xContext );
+ Sequence< PropertyValue > aInfo =
lcl_getDataSourceIndirectProperties( _rxModel, m_xContext );
const PropertyValue* pInfo = std::find_if(aInfo.begin(),
aInfo.end(),
[](const PropertyValue& rInfo) { return rInfo.Name ==
"PreferDosLikeLineEnds"; });
if (pInfo != aInfo.end())
diff --git a/svx/source/inc/formcontrolfactory.hxx
b/svx/source/inc/formcontrolfactory.hxx
index 51dcb78fe0c5..2ca1d6d066c0 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -42,8 +42,6 @@ namespace comphelper {
namespace svxform
{
- struct FormControlFactory_Data;
-
class FormControlFactory
{
public:
@@ -97,7 +95,7 @@ namespace svxform
);
private:
- ::std::unique_ptr< FormControlFactory_Data > m_pData;
+ css::uno::Reference<css::uno::XComponentContext> m_xContext;
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
