[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |6 -
writerfilter/inc/dmapper/resourcemodel.hxx |6 -
writerfilter/source/dmapper/DomainMapper.cxx |6 -
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 52 +-
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 28 ++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 24 ++--
writerfilter/source/dmapper/FFDataHandler.cxx|4
writerfilter/source/dmapper/GraphicHelpers.cxx |2
writerfilter/source/dmapper/GraphicImport.cxx|2
writerfilter/source/dmapper/LatentStyleHandler.cxx |2
writerfilter/source/dmapper/LoggedResources.cxx | 78 +++
writerfilter/source/dmapper/LoggedResources.hxx |8 -
writerfilter/source/dmapper/PropertyMap.cxx | 16 +--
writerfilter/source/dmapper/PropertyMap.hxx |4
writerfilter/source/dmapper/PropertyMapHelper.cxx|8 -
writerfilter/source/dmapper/PropertyMapHelper.hxx|4
writerfilter/source/dmapper/SettingsTable.cxx|6 -
writerfilter/source/dmapper/StyleSheetTable.cxx |4
writerfilter/source/dmapper/TableManager.cxx | 42
writerfilter/source/dmapper/TablePositionHandler.cxx |2
writerfilter/source/dmapper/TablePropertiesHandler.cxx |6 -
writerfilter/source/dmapper/TagLogger.cxx|8 -
writerfilter/source/dmapper/TagLogger.hxx|4
writerfilter/source/dmapper/TblStylePrHandler.cxx|4
writerfilter/source/dmapper/ThemeTable.cxx | 12 +-
writerfilter/source/dmapper/domainmapperfactory.cxx |2
writerfilter/source/dmapper/util.cxx |2
writerfilter/source/filter/WriterFilter.cxx |2
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 26 ++---
writerfilter/source/ooxml/OOXMLPropertySet.cxx | 30 ++---
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 28 ++---
writerfilter/source/ooxml/factoryimpl.py |2
writerfilter/source/ooxml/qnametostr.py |2
writerfilter/source/ooxml/qnametostrcore.cxx |2
writerfilter/source/rtftok/rtfsprm.cxx |4
writerfilter/source/rtftok/rtfsprm.hxx |2
writerfilter/source/rtftok/rtfvalue.cxx |2
writerfilter/source/rtftok/rtfvalue.hxx |2
38 files changed, 219 insertions(+), 225 deletions(-)
New commits:
commit 82463bdde75447d45e0cd6ed9ab579e0e51ea912
Author: Tor Lillqvist
AuthorDate: Fri Mar 22 18:15:39 2019 +0200
Commit: Miklos Vajna
CommitDate: Mon Mar 25 09:21:41 2019 +0100
We can simply use DBG_UTIL now after
efc29fbb6d458f5fd3660a36e2ff1592608fcbac
Change-Id: I74cce2d3fb4661ea9a44d0b166ca98dfade53056
Reviewed-on: https://gerrit.libreoffice.org/69604
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index d79bce50f763..bf1393e2778f 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -27,12 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter))
$(eval $(call
gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
-$(eval $(call gb_Library_add_defs,writerfilter,\
- $(if $(ENABLE_DBGUTIL), \
- -DDEBUG_WRITERFILTER \
- ) \
-))
-
$(eval $(call gb_Library_use_libraries,writerfilter,\
basegfx \
comphelper \
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx
b/writerfilter/inc/dmapper/resourcemodel.hxx
index 8e2ffc546682..cb6cae6cd4d5 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -352,7 +352,7 @@ public:
/**
Returns string representation of this value.
*/
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
virtual std::string toString() const = 0;
#endif
};
@@ -385,14 +385,14 @@ public:
/**
Returns name of sprm.
*/
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
virtual std::string getName() const = 0;
#endif
/**
Returns string representation of sprm.
*/
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
virtual std::string toString() const = 0;
#endif
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 020861e663d6..41cc8afdd6a7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -235,7 +235,7 @@ DomainMapper::~DomainMapper()
}
catch( const uno::Exception& ) {}
-#ifdef DEBUG_WRITERFILTER
+#ifdef DBG_UTIL
TagLogger::getInstance().endDocument();
#endif
}
@@ -2756,7 +2756,7 @@ void DomainMapper::sprmWithProps( Sprm&
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |2
writerfilter/inc/resourcemodel/util.hxx | 34
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |5 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx|1
writerfilter/source/dmapper/TableManager.cxx |7 -
writerfilter/source/dmapper/TableManager.hxx |1
writerfilter/source/dmapper/util.cxx | 58 +
writerfilter/source/dmapper/util.hxx | 36
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|1
writerfilter/source/resourcemodel/TagLogger.cxx |1
writerfilter/source/resourcemodel/util.cxx | 63 ---
11 files changed, 102 insertions(+), 107 deletions(-)
New commits:
commit 365116a45dd93372a382521747c6eca882306ef3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Sun Dec 7 17:53:41 2014 +0100
writerfilter: util.hxx is used only inside dmapper
Change-Id: Ia3736c32c460b466649f10f4790c30d0d25f8c5e
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index df2d1e1..8377e19 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -108,6 +108,7 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/dmapper/TblStylePrHandler \
writerfilter/source/dmapper/ThemeTable \
writerfilter/source/dmapper/WrapPolygonHandler \
+writerfilter/source/dmapper/util \
writerfilter/source/filter/ImportFilter \
writerfilter/source/filter/RtfFilter \
writerfilter/source/filter/WriterFilter \
@@ -125,7 +126,6 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
writerfilter/source/resourcemodel/ResourceModelHelper \
writerfilter/source/resourcemodel/TagLogger \
writerfilter/source/resourcemodel/qnametostrcore \
-writerfilter/source/resourcemodel/util \
))
$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c1487b4..035b076 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -35,6 +35,7 @@
#include dmapperLoggers.hxx
#include TablePositionHandler.hxx
#include ConversionHelper.hxx
+#include util.hxx
#include osl/diagnose.h
#ifdef DEBUG_WRITERFILTER
@@ -1174,7 +1175,7 @@ void DomainMapperTableHandler::startCell(const Handle_t
start,
#ifdef DEBUG_WRITERFILTER
dmapper_logger-startElement(table.cell);
dmapper_logger-startElement(table.cell.start);
-dmapper_logger-chars(toString(start));
+dmapper_logger-chars(XTextRangeToString(start));
dmapper_logger-endElement();
if (pProps.get())
pProps-printProperties();
@@ -1191,7 +1192,7 @@ void DomainMapperTableHandler::endCell(const Handle_t
end)
{
#ifdef DEBUG_WRITERFILTER
dmapper_logger-startElement(table.cell.end);
-dmapper_logger-chars(toString(end));
+dmapper_logger-chars(XTextRangeToString(end));
dmapper_logger-endElement();
dmapper_logger-endElement();
#endif
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1a1ccdc..ac7af0d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -70,7 +70,6 @@
#ifdef DEBUG_WRITERFILTER
#include resourcemodel/QNameToString.hxx
-#include resourcemodel/util.hxx
#include dmapperLoggers.hxx
#endif
#include oox/token/tokens.hxx
diff --git a/writerfilter/source/dmapper/TableManager.cxx
b/writerfilter/source/dmapper/TableManager.cxx
index dff29f8..920a07d 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -18,6 +18,7 @@
*/
#include TableManager.hxx
+#include util.hxx
namespace writerfilter
{
@@ -32,7 +33,7 @@ void TableManager::openCell(const
css::uno::Referencecss::text::XTextRange rH
{
#ifdef DEBUG_WRITERFILTER
mpTableLogger-startElement(tablemanager.openCell);
-mpTableLogger-chars(toString(rHandle));
+mpTableLogger-chars(XTextRangeToString(rHandle));
mpTableLogger-endElement();
#endif
@@ -205,7 +206,7 @@ void TableManager::closeCell(const
css::uno::Referencecss::text::XTextRange r
{
#ifdef DEBUG_WRITERFILTER
mpTableLogger-startElement(tablemanager.closeCell);
-mpTableLogger-chars(toString(rHandle));
+mpTableLogger-chars(XTextRangeToString(rHandle));
mpTableLogger-endElement();
#endif
@@ -425,7 +426,7 @@ void TableManager::handle(const
css::uno::Referencecss::text::XTextRange rHan
if (mpTableLogger)
{
mpTableLogger-startElement(tablemanager.handle);
-mpTableLogger-chars(toString(rHandle));
+
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |2
writerfilter/inc/resourcemodel/LoggedResources.hxx |8 -
writerfilter/inc/resourcemodel/TableManager.hxx | 50 ++--
writerfilter/inc/resourcemodel/TagLogger.hxx |6 -
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |6 -
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 54 ++---
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 30 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 26 +++---
writerfilter/source/dmapper/FFDataHandler.cxx|4
writerfilter/source/dmapper/GraphicHelpers.cxx |2
writerfilter/source/dmapper/GraphicImport.cxx|2
writerfilter/source/dmapper/LatentStyleHandler.cxx |2
writerfilter/source/dmapper/NumberingManager.cxx |4
writerfilter/source/dmapper/PropertyMap.cxx | 14 +--
writerfilter/source/dmapper/PropertyMap.hxx |2
writerfilter/source/dmapper/PropertyMapHelper.cxx|8 -
writerfilter/source/dmapper/PropertyMapHelper.hxx|4
writerfilter/source/dmapper/SettingsTable.cxx|4
writerfilter/source/dmapper/StyleSheetTable.cxx |4
writerfilter/source/dmapper/TablePositionHandler.cxx |2
writerfilter/source/dmapper/TablePropertiesHandler.cxx |6 -
writerfilter/source/dmapper/TblStylePrHandler.cxx|6 -
writerfilter/source/dmapper/ThemeTable.cxx | 18 ++--
writerfilter/source/filter/ImportFilter.cxx |6 -
writerfilter/source/filter/RtfFilter.cxx |4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|8 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx|4
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 30 +++
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |2
writerfilter/source/ooxml/OOXMLParserState.cxx |2
writerfilter/source/ooxml/OOXMLParserState.hxx |4
writerfilter/source/ooxml/OOXMLPropertySet.hxx |4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 28 +++---
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 26 +++---
writerfilter/source/ooxml/factoryimpl.py |2
writerfilter/source/ooxml/qnametostr.py |2
writerfilter/source/resourcemodel/LoggedResources.cxx| 62 +++
writerfilter/source/resourcemodel/TagLogger.cxx |6 -
writerfilter/source/resourcemodel/qnametostrcore.cxx |2
writerfilter/source/resourcemodel/util.cxx |2
writerfilter/source/rtftok/rtfsprm.cxx |4
writerfilter/source/rtftok/rtfsprm.hxx |2
writerfilter/source/rtftok/rtfvalue.cxx |2
writerfilter/source/rtftok/rtfvalue.hxx |2
45 files changed, 236 insertions(+), 236 deletions(-)
New commits:
commit 3beae0f05d1c8c976dfcebe02c8830752d708c74
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Oct 17 08:10:02 2014 +0200
DEBUG_DOMAINMAPPER - DEBUG_WRITERFILTER
As it's used in the tokenizers as well.
Change-Id: I7a78cad0414c724f33b50315a45a5ff2c941f4db
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index f4c2c9e..3ce1dd7 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -29,7 +29,7 @@ $(eval $(call
gb_Library_set_componentfile,writerfilter,writerfilter/util/writer
$(eval $(call gb_Library_add_defs,writerfilter,\
$(if $(filter-out 0,$(gb_DEBUGLEVEL)), \
- -DDEBUG_DOMAINMAPPER \
+ -DDEBUG_WRITERFILTER \
) \
))
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx
b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index a914ec3..ccb3363 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -27,7 +27,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
class LoggedResourcesHelper
{
public:
@@ -86,7 +86,7 @@ protected:
virtual void lcl_substream(Id name,
writerfilter::ReferenceStream::Pointer_t ref) = 0;
virtual void lcl_info(const std::string info) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -104,7 +104,7 @@ protected:
virtual void lcl_attribute(Id name, Value val) = 0;
virtual void lcl_sprm(Sprm sprm) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -120,7 +120,7 @@ public:
protected:
virtual void lcl_entry(int pos,
writerfilter::ReferenceProperties::Pointer_t ref) = 0;
-#ifdef
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
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
