strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "fix for fod#37367 ( docx import of hyperlinks )"

Browse source 
This reverts commit ac80fce47404c0843c372336ab700d62297f1647.

contains stray debug commits
This commit is contained in:
Noel Power 2011-05-19 17:21:59 +01:00
parent 3cc072ce7a
commit 170b20ed0c
2 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
View file

@ -33,7 +33,6 @@
#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/HoriOrientation.hpp>
#include <dmapperLoggers.hxx> #include <dmapperLoggers.hxx>
#include <comphelper/anytostring.hxx>
#ifdef DEBUG_DMAPPER_TABLE_HANDLER #ifdef DEBUG_DMAPPER_TABLE_HANDLER
#include <PropertyMapHelper.hxx> #include <PropertyMapHelper.hxx>
@ -52,33 +51,6 @@ using namespace ::std;
#define DEF_BORDER_DIST 190 //0,19cm #define DEF_BORDER_DIST 190 //0,19cm
#define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented #define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
void dumpSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< beans::PropertyValue > >& seqOfSeq )
{
if ( msg )
osl_trace("%s", msg);
for ( int row=0; row < seqOfSeq.getLength(); ++row )
{
const uno::Sequence< beans::PropertyValue >& props = seqOfSeq[ row ];
for ( int index=0; index < props.getLength(); ++index )
{
rtl::OUString sVal( ::comphelper::anyToString( props[ index ].Value ) );
osl_trace( "seq[%d][%d] prop name %s, value %s", row,index,
rtl::OUStringToOString( props[ index ].Name, RTL_TEXTENCODING_UTF8 ).getStr() ,
rtl::OUStringToOString( sVal, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
}
void dumpSequenceOfSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& seqOfSeqOfSeq )
{
for ( int index=0; index < seqOfSeqOfSeq.getLength(); ++index )
{
osl_trace("dumping seqOfseq[ %d ]", index );
uno::Sequence< uno::Sequence< beans::PropertyValue > > seqOfSeq = seqOfSeqOfSeq[ index ];
dumpSequenceOfSequence( msg, seqOfSeq );
}
}
#ifdef DEBUG_DMAPPER_TABLE_HANDLER #ifdef DEBUG_DMAPPER_TABLE_HANDLER
static void lcl_printProperties( PropertyMapPtr pProps ) static void lcl_printProperties( PropertyMapPtr pProps )
{ {
@ -736,9 +708,6 @@ void DomainMapperTableHandler::endTable()
{ {
try try
{ {
osl_trace("about to convert the table");
dumpSequenceOfSequenceOfSequence( "dumping the cell properties", aCellProperties );
dumpSequenceOfSequence( "dumping the row properties", aRowProperties );
uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq, uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq,
aCellProperties, aCellProperties,
aRowProperties, aRowProperties,

2
writerfilter/source/ooxml/Handler.cxx
View file

@ -309,7 +309,7 @@ OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()
sReturn += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); sReturn += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
sReturn += mFieldCode; sReturn += mFieldCode;
mpFastContext->text(sReturn); mpFastContext->characters(sReturn);
} }
void OOXMLHyperlinkHandler::attribute(Id name, Value & val) void OOXMLHyperlinkHandler::attribute(Id name, Value & val)