diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:08:59 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-03-18 17:15:57 +0100 |
| commit | 1af22c05c6b1bb2cee534146d9049da0c7e0f9bc (patch) | |
| tree | 2981c1e63399b9d69b418eb28ee7783d18885ca6 | |
| parent | 2c17beb796a29e7d160522a800e647ddd7a8b2b3 (diff) | |
fix other problems found by Wundef
Change-Id: Ib4aba95436f82d2a20b07a092f0fd07e0620fdcf
| -rw-r--r-- | sfx2/source/doc/sfxacldetect.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/popup.hrc | 2 | ||||
| -rw-r--r-- | test/source/diff/diff.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/ThemeTable.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/secerror.cxx | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx index 2cfabed7b0f3..c829c1d763f5 100644 --- a/sfx2/source/doc/sfxacldetect.cxx +++ b/sfx2/source/doc/sfxacldetect.cxx @@ -18,7 +18,7 @@ */ - +#include "sfxacldetect.hxx" #if EXTRA_ACL_CHECK diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/ui/inc/popup.hrc index dc032382fab5..b263d2ef0811 100644 --- a/sw/source/ui/inc/popup.hrc +++ b/sw/source/ui/inc/popup.hrc @@ -39,7 +39,7 @@ #define MN_HEADERFOOTER_BUTTON (RC_POPUPS_BEGIN + 18) #define MN_PAGEBREAK_BUTTON (RC_POPUPS_BEGIN + 19) -#if MN_PAGEBREAK_POPUPMENU > RC_POPUPS_END +#if MN_PAGEBREAK_BUTTON > RC_POPUPS_END #error Resource-Id Ueberlauf in #file, #line #endif diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx index 8757104bf43e..361d6f3d562d 100644 --- a/test/source/diff/diff.cxx +++ b/test/source/diff/diff.cxx @@ -354,7 +354,7 @@ bool XMLDiff::compareAttributes(xmlNodePtr node1, xmlNodePtr node2) } // unequal number of attributes -#if CPPUNIT_ASSERT +#ifdef CPPUNIT_ASSERT CPPUNIT_ASSERT(!attr1); CPPUNIT_ASSERT(!attr2); #else diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 1f9853b7afef..be4e05fc5ae9 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -239,7 +239,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) break; case NS_ooxml::LN_CT_TcPrBase_gridSpan: //number of grid positions spanned by this cell { -#if DEBUG_DOMAINMAPPER +#ifdef DEBUG_DOMAINMAPPER dmapper_logger->startElement("tablemanager.GridSpan"); dmapper_logger->attribute("gridSpan", nIntValue); dmapper_logger->endElement(); diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx index 4e7088809620..bd89130ca5a7 100644 --- a/writerfilter/source/dmapper/ThemeTable.cxx +++ b/writerfilter/source/dmapper/ThemeTable.cxx @@ -22,7 +22,7 @@ #include <ooxml/resourceids.hxx> #include "dmapperLoggers.hxx" -#if DEBUG_DOMAINMAPPER +#ifdef DEBUG_DOMAINMAPPER #include <resourcemodel/QNameToString.hxx> #endif diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx b/xmlsecurity/source/xmlsec/nss/secerror.cxx index 5b827363257f..98aecbe2ed40 100644 --- a/xmlsecurity/source/xmlsec/nss/secerror.cxx +++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx @@ -21,6 +21,7 @@ #include "secerr.h" #include "sslerr.h" #include "nspr.h" +#include "nss.h" #include "certt.h" #include <sal/macros.h> |