writerfilter/Library_writerfilter.mk | 1 +
writerfilter/inc/pch/precompiled_writerfilter.hxx | 1 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 21 ++-------------------
3 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 4231190ad3a4ee7e459f7e1a5e9fd85ca3dca124
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Jul 23 09:30:57 2013 +0200
fdo#46037: no more comphelper/configurationhelper.hxx in writerfilter
Change-Id: If2500bf09f8bb23f70d46d8dbef5d8bbf9fc3fb3
Reviewed-on: https://gerrit.libreoffice.org/5041
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 4fab4aa..aaa2969 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_Library_Library,writerfilter))
$(eval $(call gb_Library_use_custom_headers,writerfilter,\
+ officecfg/registry \
oox/generated \
writerfilter/source \
))
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx
b/writerfilter/inc/pch/precompiled_writerfilter.hxx
index 641211a..899ca0e 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx
@@ -152,7 +152,6 @@
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <comphelper/classids.hxx>
-#include <comphelper/configurationhelper.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7086c75..9427e60 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -67,33 +67,16 @@
#include <map>
-#include <comphelper/configurationhelper.hxx>
#include <comphelper/stlunosequence.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
+#include <officecfg/Office/Common.hxx>
using namespace ::com::sun::star;
using namespace ::rtl;
namespace writerfilter {
namespace dmapper{
-sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference<
uno::XComponentContext >& rxContext )
-{
- bool bResult(sal_False);
- try
- {
- OUString writerConfig = "org.openoffice.Office.Common";
-
- uno::Reference< uno::XInterface > xCfgAccess =
::comphelper::ConfigurationHelper::openConfig( rxContext, writerConfig,
::comphelper::ConfigurationHelper::E_READONLY );
- ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess,
OUString( "Filter/Microsoft/Import" ), OUString(
"ImportWWFieldsAsEnhancedFields" ) ) >>= bResult;
-
- }
- catch( const uno::Exception& )
- {
- }
- return bResult;
-}
-
// Populate Dropdown Field properties from FFData structure
void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet >&
rxFieldProps, FFDataHandler::Pointer_t pFFDataHandler )
{
@@ -206,7 +189,7 @@ DomainMapper_Impl::DomainMapper_Impl(
getTableManager( ).setHandler(m_pTableHandler);
getTableManager( ).startLevel();
- m_bUsingEnhancedFields = lcl_IsUsingEnhancedFields( m_xComponentContext );
+ m_bUsingEnhancedFields =
officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get();
m_pSdtHelper = new SdtHelper(*this);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
