connectivity/source/drivers/file/FStatement.cxx | 3 -
connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 1
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 1
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 1
connectivity/source/drivers/odbcbase/OStatement.cxx | 12 ------
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 2 -
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xcolumn.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xindex.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xkey.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx | 2 -
connectivity/source/drivers/postgresql/pq_xtable.cxx | 2 -
fpicker/source/office/iodlgimp.cxx | 18
----------
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 1
pyuno/source/module/pyuno.cxx | 2 -
pyuno/source/module/pyuno_util.cxx | 1
sw/source/ui/dbui/dbinsdlg.cxx | 4 --
vcl/unx/gtk/a11y/atklistener.cxx | 2 -
xml2cmp/source/xcd/parse.cxx | 6 ---
xmloff/source/text/txtprhdl.cxx | 3 -
21 files changed, 71 deletions(-)
New commits:
commit 54a908a003db858874d85ca528983882e85e5c2e
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon Jun 4 23:25:40 2012 +0900
nuke unused defines
Change-Id: I7924da4bff73ca8f82c76eb8cb211401530acdeb
diff --git a/connectivity/source/drivers/file/FStatement.cxx
b/connectivity/source/drivers/file/FStatement.cxx
index b6878f0..754630e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/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
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index b80deeb..7877c58 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/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); }
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index ce87529..2a276d9 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/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 */
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index a222d52..84cf3de 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/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 */
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index a143433..396facf 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/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;
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 180c3c6..0401c55 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/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;
diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 8fde1d1..f6089cc 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/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
{
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
index f16e925..3a46800 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx
+++ b/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)
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx
b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 5c529e4..11d7b42 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/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,
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
index b51a795..ea9c196 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx
+++ b/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 )
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx
b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index db9f240..a89dc11 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/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,
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
index 9ae9333..8d48711 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx
+++ b/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)
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx
b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 606299e..e0eb97b 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/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)
diff --git a/fpicker/source/office/iodlgimp.cxx
b/fpicker/source/office/iodlgimp.cxx
index c815840..84a7148 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/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
//*****************************************************************************
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 0432c11..f72caeb 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/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);
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 827c0a3..f9bcc61 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/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;
diff --git a/pyuno/source/module/pyuno_util.cxx
b/pyuno/source/module/pyuno_util.cxx
index ae645a7..06a2298 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/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 )
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index d4e547b..8d2cf87 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/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;
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 23b9b64..4f5a0c5 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/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 )
diff --git a/xml2cmp/source/xcd/parse.cxx b/xml2cmp/source/xcd/parse.cxx
index 454abb4..b05e48b 100644
--- a/xml2cmp/source/xcd/parse.cxx
+++ b/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),
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 240afef..3dab77f 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/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[] =
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
