summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-26 10:18:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-27 09:36:53 +0100
commitaa753f01ba4631614bb88ee7d3a3e6b222208b3e (patch)
treec8b168e8e0619c387d30f206848ec30ca7238a00 /xmloff
parent2ea2860ba56231d989c5e1b8f87392921bc2a8db (diff)
-Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/unoatrcn.cxx2
-rw-r--r--xmloff/source/core/xmlexp.cxx4
-rw-r--r--xmloff/source/core/xmlimp.cxx8
-rw-r--r--xmloff/source/draw/XMLNumberStyles.cxx1
-rw-r--r--xmloff/source/style/chrhghdl.cxx5
-rw-r--r--xmloff/source/style/chrlohdl.cxx5
-rw-r--r--xmloff/source/style/lspachdl.cxx5
-rw-r--r--xmloff/source/text/txtimppr.cxx1
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx3
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx3
10 files changed, 4 insertions, 33 deletions
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 08357dbdf865..8cbebdd55778 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -36,8 +36,6 @@ using namespace ::com::sun::star;
// Interface implementation
// --------------------------------------------------------------------
-#define IMPL ((AttrContainerImpl*)mpData)
-
uno::Reference< uno::XInterface > SvUnoAttributeContainer_CreateInstance()
{
return *(new SvUnoAttributeContainer);
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index c578286c0b7a..c82a6809ff3d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -108,8 +108,6 @@ sal_Char const sXML_1_2[] = "1.2";
// #i115030#: the XSLT is not finished, and not available via HTTP
const sal_Char s_grddl_xsl[] = "http://FIXME";
-#define LOGFILE_AUTHOR "mb93740"
-
#define XML_MODEL_SERVICE_WRITER "com.sun.star.text.TextDocument"
#define XML_MODEL_SERVICE_CALC "com.sun.star.sheet.SpreadsheetDocument"
#define XML_MODEL_SERVICE_DRAW "com.sun.star.drawing.DrawingDocument"
@@ -803,7 +801,7 @@ void SAL_CALL SvXMLExport::initialize( const uno::Sequence< uno::Any >& aArgumen
// XFilter
sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw(uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", LOGFILE_AUTHOR,
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogContext, "xmloff", "mb93740",
"SvXMLExport::filter" );
// check for xHandler first... should have been supplied in initialize
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 04f7a51081af..07c1f4c8298b 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -60,8 +60,6 @@
#include <com/sun/star/rdf/XRepositorySupplier.hpp>
#include "RDFaImportHelper.hxx"
-#define LOGFILE_AUTHOR "unknown"
-
using ::com::sun::star::beans::XPropertySetInfo;
using ::rtl::OUString;
@@ -479,7 +477,7 @@ sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& r
void SAL_CALL SvXMLImport::startDocument( void )
throw( xml::sax::SAXException, uno::RuntimeException )
{
- RTL_LOGFILE_TRACE_AUTHOR( "xmloff", LOGFILE_AUTHOR, "{ SvXMLImport::startDocument" );
+ RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "{ SvXMLImport::startDocument" );
if( !mxGraphicResolver.is() || !mxEmbeddedResolver.is() )
{
@@ -516,7 +514,7 @@ void SAL_CALL SvXMLImport::startDocument( void )
void SAL_CALL SvXMLImport::endDocument( void )
throw( xml::sax::SAXException, uno::RuntimeException)
{
- RTL_LOGFILE_TRACE_AUTHOR( "xmloff", LOGFILE_AUTHOR, "} SvXMLImport::startDocument" );
+ RTL_LOGFILE_TRACE_AUTHOR( "xmloff", "unknown", "} SvXMLImport::startDocument" );
// #i9518# All the stuff that accesses the document has to be done here, not in the dtor,
// because the SvXMLImport dtor might not be called until after the document has been closed.
@@ -692,7 +690,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
// If we do profiling, we want a trace message for the first element
// in order to identify the stream.
rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
- RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", LOGFILE_AUTHOR,
+ RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", "unknown",
"SvXMLImport::StartElement( \"%s\", ... )",
aString.getStr() );
#endif
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 44d40d233011..b748383a158f 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -67,7 +67,6 @@ struct SdXMLDataStyleNumber
// date
-#define DATA_STYLE_NUMBER_END 0
#define DATA_STYLE_NUMBER_DAY 1 // <number:day/>
#define DATA_STYLE_NUMBER_DAY_LONG 2 // <number:day number:style="long"/>
#define DATA_STYLE_NUMBER_MONTH_LONG 3 // <number:month number:style="long"/>
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx
index b41ef3c4dc93..36bf6bb36609 100644
--- a/xmloff/source/style/chrhghdl.cxx
+++ b/xmloff/source/style/chrhghdl.cxx
@@ -33,11 +33,6 @@ using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
-// this is a copy of defines in svx/inc/escpitem.hxx
-#define DFLT_ESC_PROP 58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB -101
-
///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx
index 763f35f534a9..486fe1d85a78 100644
--- a/xmloff/source/style/chrlohdl.cxx
+++ b/xmloff/source/style/chrlohdl.cxx
@@ -30,11 +30,6 @@ using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-// this is a copy of defines in svx/inc/escpitem.hxx
-#define DFLT_ESC_PROP 58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB -101
-
///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx
index ed8a3f45ca3d..78373198f18d 100644
--- a/xmloff/source/style/lspachdl.cxx
+++ b/xmloff/source/style/lspachdl.cxx
@@ -33,11 +33,6 @@ using namespace ::com::sun::star;
using ::xmloff::token::IsXMLToken;
using ::xmloff::token::XML_CASEMAP_NORMAL;
-// this is a copy of defines in svx/inc/escpitem.hxx
-#define DFLT_ESC_PROP 58
-#define DFLT_ESC_AUTO_SUPER 101
-#define DFLT_ESC_AUTO_SUB -101
-
///////////////////////////////////////////////////////////////////////////////
//
// class XMLEscapementPropHdl
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index ef9758ae9147..871a2e2e2bb3 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -33,7 +33,6 @@
#define XML_LINE_RIGHT 1
#define XML_LINE_TOP 2
#define XML_LINE_BOTTOM 3
-#define MIN_BORDER_DIST 49
using ::rtl::OUString;
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 59a558d6ab40..fc351f51fdd6 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -74,9 +74,6 @@ enum XMLUserDefinedTransformerAction
#define ENTRY2( n, l, a, p1, p2 ) \
ENTRY3( n, l, a, p1, p2, 0 )
-#define ENTRY2QQ( n, l, a, n1, l1, n2, l2 ) \
- ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), \
- XMLTransformerActionInit::QNameParam( n2, l2 ) )
#define ENTRY2QN( n, l, a, n1, l1, p2 ) \
ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), p2 )
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index f1e2095df340..ea698e99588a 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -83,9 +83,6 @@ enum XMLUserDefinedTransformerAction
#define ENTRY2( n, l, a, p1, p2 ) \
ENTRY3( n, l, a, p1, p2, 0 )
-#define ENTRY2QQ( n, l, a, n1, l1, n2, l2 ) \
- ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), \
- XMLTransformerActionInit::QNameParam( n2, l2 ) )
#define ENTRY2QN( n, l, a, n1, l1, p2 ) \
ENTRY2( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), p2 )