-Wunused-macros

Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed

7 files changed, 5 insertions, 15 deletions

diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 3a168a7445c8..b129ea16c764 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::uno;
 
 using ::rtl::OUString;
 
-#define PROPERTY_FRAME                      1
 #define ID_TOOLBAR                          1
 #define ID_GRIDWIN                          2
 
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index ceaf1c6e7eaf..123c146d51e0 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -76,7 +76,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 using namespace ::rtl;
 
-#define PROPERTY_FRAME                      1
 //split window size is a percent value
 #define WIN_MIN_HEIGHT 10
 #define WIN_STEP_SIZE 5
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 4a9f607eaec2..4330a1877923 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -72,8 +72,6 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
 
-#define PROPERTY_FRAME                      1
-
 class BibliographyLoader : public cppu::WeakImplHelper4
                             < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
 {
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index b1d3e199a975..dc0737806916 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -123,10 +123,11 @@ long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len)
 static pid_t nChildPID = 0;
 #endif
 
+#if defined WNT
+
 #define MY_LENGTH(s) (sizeof (s) / sizeof *(s) - 1)
 #define MY_STRING(s) (s), MY_LENGTH(s)
 
-#if defined WNT
 namespace {
 
 bool extendEnvironment(boost::scoped_array< WCHAR > * environment) {
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index 9dac2488fcb6..447102ac1d8b 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -26,6 +26,9 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include "nsp_func.hxx"
 
 #ifdef UNIX
 #include <sys/types.h>
@@ -34,9 +37,6 @@
 #include <dlfcn.h>
 #endif
 #include <stdarg.h>
-// For vsnprintf()
-#define NSP_vsnprintf vsnprintf
-#include "nsp_func.hxx"
 #endif // End UNIX
 
 #ifdef WNT
@@ -53,8 +53,6 @@
 #include <stdlib.h>
 #include <shlobj.h>
 #include <objidl.h>
-// For vsnprintf()
-#define NSP_vsnprintf _vsnprintf
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index a4812ea7f1ea..a150e3160fac 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -94,9 +94,6 @@ namespace pcr
 #define DEF_INFO_4( ident, uinameres, helpid, flag1, flag2, flag3, flag4 ) \
     DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 )
 
-#define DEF_INFO_5( ident, uinameres, helpid, flag1, flag2, flag3, flag4, flag5 ) \
-    DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 | PROP_FLAG_##flag2 | PROP_FLAG_##flag3 | PROP_FLAG_##flag4 | PROP_FLAG_##flag5 )
-
     sal_uInt16              OPropertyInfoService::s_nCount = 0;
     OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = NULL;
     //------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 6bb6024c0d45..61bcb4f020df 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -77,8 +77,6 @@ namespace pcr
     using namespace ::com::sun::star::ucb;
     using namespace ::comphelper;
 
-#define THISREF()   static_cast< XController* >(this)
-
     //========================================================================
     //= OPropertyBrowserController
     //========================================================================