nuke unused defines

Change-Id: I7924da4bff73ca8f82c76eb8cb211401530acdeb

connectivity/source/drivers/file/FStatement.cxx

@@ -46,9 +46,6 @@
 #include <tools/debug.hxx>
 #include <rtl/logfile.hxx>
 
-#define THROW_SQL(x) \
-    OTools::ThrowException(x,m_aStatementHandle,SQL_HANDLE_STMT,*this)
-
 namespace connectivity
 {
     namespace file

connectivity/source/drivers/hsqldb/HStorageAccess.cxx

@@ -45,7 +45,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 #define ThrowException(env, type, msg) { \
     env->ThrowNew(env->FindClass(type), msg); }
 

connectivity/source/drivers/hsqldb/StorageFileAccess.cxx

@@ -44,7 +44,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 /*****************************************************************************/
 /* exception macros */
 

connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx

@@ -56,7 +56,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 /*****************************************************************************/
 /* exception macros */
 

connectivity/source/drivers/odbcbase/OStatement.cxx

@@ -54,18 +54,6 @@ using namespace ::comphelper;
 #define THROW_SQL(x) \
     OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this)
 
-#if OSL_DEBUG_LEVEL > 1
-#define DEBUG_THROW                 \
-    try                                 \
-    {                                   \
-        THROW_SQL(nRetCode);            \
-    }                                   \
-    catch(const SQLException&)              \
-    {                                   \
-        OSL_FAIL("Exception in odbc caught"); \
-    }
-#endif
-
 
 
 using namespace connectivity::odbc;

connectivity/source/drivers/postgresql/pq_baseresultset.cxx

@@ -110,8 +110,6 @@ using com::sun::star::beans::Property;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper()
 {
     static ::cppu::IPropertyArrayHelper *pArrayHelper;

connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx

@@ -97,8 +97,6 @@ using com::sun::star::beans::XPropertySet;
 using com::sun::star::container::XNameAccess;
 
 
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 namespace pq_sdbc_driver
 {
 

connectivity/source/drivers/postgresql/pq_xcolumn.cxx

@@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 Column::Column( const ::rtl::Reference< RefCountedMutex > & refMutex,
                 const Reference< com::sun::star::sdbc::XConnection > & connection,
                 ConnectionSettings *pSettings)

connectivity/source/drivers/postgresql/pq_xindex.cxx

@@ -109,8 +109,6 @@ using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 Index::Index( const ::rtl::Reference< RefCountedMutex > & refMutex,
           const Reference< com::sun::star::sdbc::XConnection > & connection,
           ConnectionSettings *pSettings,

connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx

@@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 IndexColumn::IndexColumn( const ::rtl::Reference< RefCountedMutex > & refMutex,
                       const Reference< com::sun::star::sdbc::XConnection > & connection,
                       ConnectionSettings *pSettings )

connectivity/source/drivers/postgresql/pq_xkey.cxx

@@ -109,8 +109,6 @@ using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 Key::Key( const ::rtl::Reference< RefCountedMutex > & refMutex,
           const Reference< com::sun::star::sdbc::XConnection > & connection,
           ConnectionSettings *pSettings,

connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx

@@ -69,8 +69,6 @@ using com::sun::star::beans::XPropertySet;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 KeyColumn::KeyColumn( const ::rtl::Reference< RefCountedMutex > & refMutex,
                       const Reference< com::sun::star::sdbc::XConnection > & connection,
                       ConnectionSettings *pSettings)

connectivity/source/drivers/postgresql/pq_xtable.cxx

@@ -114,8 +114,6 @@ using com::sun::star::sdbc::SQLException;
 
 namespace pq_sdbc_driver
 {
-#define ASCII_STR(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
-
 Table::Table( const ::rtl::Reference< RefCountedMutex > & refMutex,
               const Reference< com::sun::star::sdbc::XConnection > & connection,
               ConnectionSettings *pSettings)

fpicker/source/office/iodlgimp.cxx

@@ -71,24 +71,6 @@ static inline String GetViewOptUserItem( const SvtViewOptions& rOpt )
     return String( aUserData );
 }
 
-
-// defines for the style of the BrowseBox
-
-#define STYLE_MULTI_SELECTION   \
-    CNTVIEWSTYLE_NODE_BUTTONS | \
-    CNTVIEWSTYLE_NODE_BUTTONS_AT_ROOT | \
-    CNTVIEWSTYLE_SHOW_MESSAGES | \
-    CNTVIEWSTYLE_SHOW_FOLDERS | \
-    CNTVIEWSTYLE_NO_SMARTHIGHLIGHT | \
-    CNTVIEWSTYLE_HIDE_OPENMENU | \
-    CNTVIEWSTYLE_DEFAULT_APPEARANCE | \
-    CNTVIEWSTYLE_SORT_BY_FOLDER
-
-#define STYLE_SINGLE_SELECTION  \
-    STYLE_MULTI_SELECTION | CNTVIEWSTYLE_SINGLE_SELECTION
-
-#define BOOL_NOT_INITIALIZE     ((sal_Bool)2)
-
 //*****************************************************************************
 // ResMgrHolder / SvtSimpleResId
 //*****************************************************************************

jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx

@@ -40,7 +40,6 @@
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 using ::rtl::OString;
-#define OUSTR(x) OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
 
 static sal_Bool hasOption(char const * szOption, int argc, char** argv);
 static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);

pyuno/source/module/pyuno.cxx

@@ -38,8 +38,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 
-#define TO_ASCII(x) OUStringToOString( x , RTL_TEXTENCODING_ASCII_US).getStr()
-
 using rtl::OStringBuffer;
 using rtl::OUStringBuffer;
 using rtl::OUStringToOString;

pyuno/source/module/pyuno_util.cxx

@@ -60,7 +60,6 @@ using com::sun::star::lang::XSingleServiceFactory;
 using com::sun::star::script::XTypeConverter;
 using com::sun::star::beans::XMaterialHolder;
 
-#define USTR_ASCII(x) OUString( RTL_CONSTASCII_USTRINGPARAM( x ) )
 namespace pyuno
 {
 PyRef ustring2PyUnicode( const OUString & str )

sw/source/ui/dbui/dbinsdlg.cxx

@@ -175,10 +175,6 @@ struct _DB_Column
 SV_IMPL_OP_PTRARR_SORT( SwInsDBColumns, SwInsDBColumnPtr )
 
 
-#define DBCOLUMN_CONFIG_VERSION1    1
-#define DBCOLUMN_CONFIG_VERSION     DBCOLUMN_CONFIG_VERSION1
-#define DBCOLUMN_MAXDATA            5
-
 struct _DB_ColumnConfigData
 {
     SwInsDBColumns aDBColumns;

vcl/unx/gtk/a11y/atklistener.cxx

@@ -49,8 +49,6 @@
 using namespace com::sun::star;
 
 
-#define CSTRING_FROM_ANY(i) rtl::OUStringToOString( i.get< rtl::OUString >(), RTL_TEXTENCODING_UTF8 ).getStr()
-
 AtkListener::AtkListener( AtkObjectWrapper* pWrapper ) : mpWrapper( pWrapper )
 {
     if( mpWrapper )

xml2cmp/source/xcd/parse.cxx

@@ -46,12 +46,6 @@
 // NOT FULLY DEFINED SERVICES
 
 
-
-#define AssertionOf(x)  \
-    {if (!(x)) {std::cerr << "Assertion failed: " << #x << __FILE__ << __LINE__ << std::endl; exit(3); }}
-
-
-
 X2CParser::X2CParser( XmlElement & o_rDocumentData )
     :   // sFileName,
         nFileLine(0),

xmloff/source/text/txtprhdl.cxx

@@ -63,9 +63,6 @@ using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::text;
 using namespace ::xmloff::token;
 
-
-#define CONSTASCII_USTRINGPARAM_CMP(s) s, sizeof(s)-1
-
 // ---------------------------------------------------------------------------
 
 SvXMLEnumMapEntry const pXML_HoriPos_Enum[] =