-Wunused-macros

Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed

6 files changed, 0 insertions, 52 deletions

diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 045f98df265f..12b9b1ed98b6 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -57,13 +57,6 @@ namespace frm
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::frame;
 
-#define FORWARD_TO_PEER_1( unoInterface, method, param1 )   \
-    Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
-    if ( xTypedPeer.is() )  \
-    {   \
-        xTypedPeer->method( param1 );  \
-    }
-
 #define FORWARD_TO_PEER_1_RET( returnType, unoInterface, method, param1 )   \
     returnType aReturn; \
     Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
@@ -73,13 +66,6 @@ namespace frm
     }   \
     return aReturn;
 
-#define FORWARD_TO_PEER_3( unoInterface, method, param1, param2, param3 )   \
-    Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
-    if ( xTypedPeer.is() )  \
-    {   \
-        xTypedPeer->method( param1, param2, param3 );  \
-    }
-
 #define FORWARD_TO_PEER_3_RET( returnType, unoInterface, method, param1, param2, param3 )   \
     returnType aReturn; \
     Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 347e6234d07d..2ea8f2c28810 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -21,11 +21,8 @@
 #include <svl/itempool.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/editobj.hxx>
-#define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
 #include <editeng/fhgtitem.hxx>
-#define ITEMID_FONT         EE_CHAR_FONTHEIGHT
 #include <editeng/fontitem.hxx>
-#define ITEMID_LANGUAGE     EE_CHAR_LANGUAGE
 #include <editeng/langitem.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/mapunit.hxx>
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 0f3aec1b8283..af14a307fe5f 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -27,17 +27,11 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
 
-#define ITEMID_ADJUST       EE_PARA_JUST
 #include <editeng/adjustitem.hxx>
-#define ITEMID_WEIGHT       EE_CHAR_WEIGHT
 #include <editeng/wghtitem.hxx>
-#define ITEMID_ESCAPEMENT   EE_CHAR_ESCAPEMENT
 #include <editeng/escapementitem.hxx>
-#define ITEMID_LINESPACING  EE_PARA_SBL
 #include <editeng/lspcitem.hxx>
-#define ITEMID_FONTHEIGHT   EE_CHAR_FONTHEIGHT
 #include <editeng/fhgtitem.hxx>
-#define ITEMID_FRAMEDIR     EE_PARA_WRITINGDIR
 #include <editeng/frmdiritem.hxx>
 #include <editeng/scripttypeitem.hxx>
 
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index ef1168c2a7a8..9f76f9973d8f 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -21,7 +21,6 @@
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <svx/svxids.hrc>
-#define ITEMID_SCRIPTSPACE          SID_ATTR_PARA_SCRIPTSPACE
 #include <editeng/scriptspaceitem.hxx>
 
 //........................................................................
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 56f54c19d202..16a26e7492dc 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -64,31 +64,6 @@ namespace frm
         xTypedPeer->method( param1 );  \
     }
 
-#define FORWARD_TO_PEER_1_RET( returnType, unoInterface, method, param1 )   \
-    returnType aReturn; \
-    Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
-    if ( xTypedPeer.is() )  \
-    {   \
-        aReturn = xTypedPeer->method( param1 );  \
-    }   \
-    return aReturn;
-
-#define FORWARD_TO_PEER_3( unoInterface, method, param1, param2, param3 )   \
-    Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
-    if ( xTypedPeer.is() )  \
-    {   \
-        xTypedPeer->method( param1, param2, param3 );  \
-    }
-
-#define FORWARD_TO_PEER_3_RET( returnType, unoInterface, method, param1, param2, param3 )   \
-    returnType aReturn; \
-    Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY );   \
-    if ( xTypedPeer.is() )  \
-    {   \
-        aReturn = xTypedPeer->method( param1, param2, param3 );  \
-    }   \
-    return aReturn;
-
     //==================================================================
     // ONavigationBarControl
     //==================================================================
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index 462d2268a99c..b36aac2d2e10 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -79,7 +79,6 @@ using namespace xforms;
 
 #define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model)
 #else
-#define DBG_INVARIANT_TYPE(TYPE)
 #define DBG_INVARIANT()
 #endif
 
@@ -660,8 +659,6 @@ Model::XSet_t Model::getSubmissions()
 //
 
 #define HANDLE_ID 0
-#define HANDLE_Instance 1
-#define HANDLE_InstanceURL 2
 #define HANDLE_ForeignSchema 3
 #define HANDLE_SchemaRef 4
 #define HANDLE_Namespaces 5