summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/source/core/access/accmap.cxx1
-rw-r--r--sw/source/core/tox/toxhlp.cxx1
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--writerfilter/debug_setup.mk2
-rw-r--r--writerfilter/inc/resourcemodel/TableManager.hxx64
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx4
6 files changed, 40 insertions, 34 deletions
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 4c03c4c147a9..0b1916c01e3e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -31,6 +31,7 @@
#include <rtl/ref.hxx>
+#include <rtl/strbuf.hxx>
#include <cppuhelper/weakref.hxx>
#include <vcl/window.hxx>
#include <svx/svdmodel.hxx>
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index e28323292a4f..9e9b261ad04e 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
+#include <rtl/strbuf.hxx>
#include <tools/string.hxx>
#include <toxwrap.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8c352243fdd3..77e89aff49b1 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1775,7 +1775,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10));
lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10));
- aTestFL.SetText(rtl::OUString(RTL_CONSTASCII_STRINGPARAM("Settings only for testpurposes", RTL_TEXTENCODING_ASCII_US));
+ aTestFL.SetText(rtl::OUString::createFromAscii("Settings only for testpurposes"));
aTest1CBox .SetText( C2S("unused"));
aTest2CBox .SetText( C2S("dynamic"));
aTest3CBox .SetText( C2S("No calm" ));
diff --git a/writerfilter/debug_setup.mk b/writerfilter/debug_setup.mk
index e1d0a084740f..a618171fa4d5 100644
--- a/writerfilter/debug_setup.mk
+++ b/writerfilter/debug_setup.mk
@@ -10,5 +10,7 @@ $(if $(filter-out 0 1,$(strip $(gb_DEBUGLEVEL))),\
-DDEBUG_IMPORT \
-DDEBUG_LOGGING \
-DDEBUG_DMAPPER_PROPERTY_MAP \
+ -DDEBUG_DMAPPER_TABLE_HANDLER \
+ -DDEBUG_TABLE \
)
endef
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx
index 36a9b86803bb..04084d73a0a9 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -625,11 +625,11 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::cellDepth(sal_uInt32 nDepth)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
{
mpTableLogger->startElement("tablemanager.cellDepth");
mpTableLogger->attribute("depth", nDepth);
- mpTableLogger->endElement("tablemanager.cellDepth");
+ mpTableLogger->endElement();
}
#endif
@@ -640,7 +640,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::inCell()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.inCell");
#endif
setInCell(true);
@@ -653,7 +653,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::endCell()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.endCell");
#endif
@@ -664,7 +664,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::endRow()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->element("tablemanager.endRow");
#endif
@@ -682,11 +682,11 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::handle(const T & rHandle)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get())
+ if (mpTableLogger)
{
mpTableLogger->startElement("tablemanager.handle");
mpTableLogger->chars(toString(rHandle));
- mpTableLogger->endElement("tablemanager.handle");
+ mpTableLogger->endElement();
}
#endif
@@ -697,7 +697,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::startLevel()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
{
typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -711,7 +711,7 @@ void TableManager<T, PropertiesPointer>::startLevel()
mpTableLogger->attribute("openCell",
pTableData->isCellOpen() ? "yes" : "no");
- mpTableLogger->endElement("tablemanager.startLevel");
+ mpTableLogger->endElement();
}
#endif
@@ -732,7 +732,7 @@ void TableManager<T, PropertiesPointer>::endLevel()
mTableDataStack.pop();
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
{
typename TableData<T, PropertiesPointer>::Pointer_t pTableData;
@@ -746,7 +746,7 @@ void TableManager<T, PropertiesPointer>::endLevel()
mpTableLogger->attribute("openCell",
pTableData->isCellOpen() ? "yes" : "no");
- mpTableLogger->endElement("tablemanager.endLevel");
+ mpTableLogger->endElement();
}
#endif
}
@@ -845,7 +845,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::handle0x7()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.handle0x7");
#endif
@@ -858,8 +858,8 @@ void TableManager<T, PropertiesPointer>::handle0x7()
endRow();
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.handle0x7");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -891,7 +891,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.cellProps");
#endif
@@ -901,8 +901,8 @@ void TableManager<T, PropertiesPointer>::cellProps(PropertiesPointer pProps)
setCellProps(pProps);
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.cellProps");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -911,15 +911,15 @@ void TableManager<T, PropertiesPointer>::cellPropsByCell
(unsigned int i, PropertiesPointer pProps)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.cellPropsByCell");
#endif
mTableDataStack.top()->insertCellProperties(i, pProps);
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.cellPropsByCell");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -927,7 +927,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.insertRowProps");
#endif
@@ -937,8 +937,8 @@ void TableManager<T, PropertiesPointer>::insertRowProps(PropertiesPointer pProps
setRowProps(pProps);
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.insertRowProps");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -946,7 +946,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pProps)
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.insertTableProps");
#endif
@@ -956,8 +956,8 @@ void TableManager<T, PropertiesPointer>::insertTableProps(PropertiesPointer pPro
setTableProps(pProps);
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.insertTableProps");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -965,7 +965,7 @@ template <typename T, typename PropertiesPointer>
void TableManager<T, PropertiesPointer>::resolveCurrentTable()
{
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
+ if (mpTableLogger != NULL)
mpTableLogger->startElement("tablemanager.resolveCurrentTable");
#endif
@@ -1016,8 +1016,8 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
clearData();
#ifdef DEBUG_TABLE
- if (mpTableLogger.get() != NULL)
- mpTableLogger->endElement("tablemanager.resolveCurrentTable");
+ if (mpTableLogger != NULL)
+ mpTableLogger->endElement();
#endif
}
@@ -1049,7 +1049,7 @@ void TableManager<T, PropertiesPointer>::openCell
#ifdef DEBUG_TABLE
mpTableLogger->startElement("tablemanager.openCell");
mpTableLogger->chars(toString(rHandle));
- mpTableLogger->endElement("tablemanager.openCell");
+ mpTableLogger->endElement();
#endif
if (mTableDataStack.size() > 0)
@@ -1068,7 +1068,7 @@ void TableManager<T, PropertiesPointer>::closeCell
#ifdef DEBUG_TABLE
mpTableLogger->startElement("tablemanager.closeCell");
mpTableLogger->chars(toString(rHandle));
- mpTableLogger->endElement("tablemanager.closeCell");
+ mpTableLogger->endElement();
#endif
if (mTableDataStack.size() > 0)
@@ -1101,7 +1101,7 @@ void TableManager<T, PropertiesPointer>::ensureOpenCell(PropertiesPointer pProp
}
}
#ifdef DEBUG_TABLE
- mpTableLogger->endElement("tablemanager.ensureOpenCell");
+ mpTableLogger->endElement();
#endif
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 31f8c20899bf..55ae0167d228 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -719,9 +719,11 @@ void DomainMapperTableHandler::endTable()
m_xTableRange = xTable->getAnchor( );
}
}
- catch (lang::IllegalArgumentException)
+ catch ( lang::IllegalArgumentException &e )
{
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
+ fprintf( stderr, "Conversion to table error: %s\n",
+ rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
dmapper_logger->chars("failed to import table!");
#endif
}
generated by cgit (git 2.34.1) at 2024-08-12 19:02:30 +0000