connectivity/source/commontools/TKeys.cxx | 1 -
connectivity/source/commontools/dbtools.cxx | 4 ----
connectivity/source/drivers/ado/ADriver.cxx | 2 --
connectivity/source/drivers/flat/EConnection.cxx | 1 -
connectivity/source/drivers/hsqldb/HViews.cxx | 2 +-
connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx | 7 -------
connectivity/source/parse/sqlnode.cxx | 2 --
dbaccess/source/ui/dlg/queryorder.cxx | 5 -----
filter/source/msfilter/svdfppt.cxx | 6 ------
sd/source/filter/eppt/epptso.cxx | 5 -----
stoc/source/javavm/jvmargs.cxx | 2 --
svx/source/dialog/docrecovery.cxx | 4 ----
svx/source/engine3d/float3d.cxx | 6 ++----
toolkit/source/helper/formpdfexport.cxx | 1 -
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 1 -
15 files changed, 3 insertions(+), 46 deletions(-)
New commits:
commit e08e630110b6bf367766f2e47dc4988404a692d8
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon May 21 21:46:11 2012 +0900
deleting NULL is safe
Change-Id: Iad17d77d61eccf0973fff0da91089e7a59fc9df0
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 0670380..b6cfd4b 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -453,8 +453,7 @@ Svx3DWin::~Svx3DWin()
delete pConvertTo3DItem;
delete pConvertTo3DLatheItem;
- if(mpRemember2DAttributes)
- delete mpRemember2DAttributes;
+ delete mpRemember2DAttributes;
delete mpImpl;
}
@@ -3116,8 +3115,7 @@ void Svx3DWin::UpdatePreview()
// document is to be reloaded, destroy remembered ItemSet
void Svx3DWin::DocumentReload()
{
- if(mpRemember2DAttributes)
- delete mpRemember2DAttributes;
+ delete mpRemember2DAttributes;
mpRemember2DAttributes = 0L;
}
commit 5f2ef2b270a70f3ad486012976e95d1192e04c2d
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon May 21 21:43:58 2012 +0900
removed unused #defines
Change-Id: I2aeba0342e46c3a4bd50f49b8a43ebb125269dfa
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index e27ab34..320bca0 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -60,13 +60,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 */
-
-#define ThrowException(env, type, msg) { \
- env->ThrowNew(env->FindClass(type), msg); }
-
//
-----------------------------------------------------------------------------
/*
* Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx
b/dbaccess/source/ui/dlg/queryorder.cxx
index 0f8a89c..95a35a4 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -153,11 +153,6 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
}
//------------------------------------------------------------------------------
-
-#define LbText(x) ((x).GetSelectEntry())
-#define LbPos(x) ((x).GetSelectEntryPos())
-
-//------------------------------------------------------------------------------
DlgOrderCrit::~DlgOrderCrit()
{
DBG_DTOR(DlgOrderCrit,NULL);
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 0501d4a..8e24fcf 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -139,15 +139,9 @@
#define PPT_COLSCHEME_A_H_GESICHERT (0x08000007)
#define ANSI_CHARSET 0
-#define DEFAULT_CHARSET 1
#define SYMBOL_CHARSET 2
-#define SHIFTJIS_CHARSET 128
-#define HANGEUL_CHARSET 129
-#define CHINESEBIG5_CHARSET 136
-#define OEM_CHARSET 255
/* Font Families */
-#define FF_DONTCARE 0x00
#define FF_ROMAN 0x10
#define FF_SWISS 0x20
#define FF_MODERN 0x30
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 36dda36..70cf9a4 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -94,12 +94,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
#define ANSI_CHARSET 0
-#define DEFAULT_CHARSET 1
#define SYMBOL_CHARSET 2
-#define SHIFTJIS_CHARSET 128
-#define HANGEUL_CHARSET 129
-#define CHINESEBIG5_CHARSET 136
-#define OEM_CHARSET 255
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 0855cff..60bb0bd 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -31,8 +31,6 @@
#include <rtl/ustring.hxx>
-#define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
-
using ::rtl::OUString;
namespace stoc_javavm {
diff --git a/svx/source/dialog/docrecovery.cxx
b/svx/source/dialog/docrecovery.cxx
index 7bae88b..0ead6fa 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -2010,12 +2010,8 @@ void BrokenRecoveryDialog::impl_askForSavePath()
}
#if defined(WNT)
-#define CHKFILE "crashdat.chk"
-#define STKFILE "crashdat.stk"
#define PRVFILE "crashdat.prv"
#else
-#define CHKFILE ".crash_report_checksum"
-#define STKFILE ".crash_report_frames"
#define PRVFILE ".crash_report_preview"
#endif
commit 01dc468f3d153b218762be392990b888186c444e
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Mon May 21 21:43:07 2012 +0900
removed unused temporary rtl::OUString
Change-Id: I81e04b1b71b8ee5a903185b6857e8cf91b67eed1
diff --git a/connectivity/source/commontools/TKeys.cxx
b/connectivity/source/commontools/TKeys.cxx
index 7e6734c..7cf1a96 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -169,7 +169,6 @@ sdbcx::ObjectType OKeysHelper::appendObject( const
::rtl::OUString& _rForName, c
::rtl::OUStringBuffer aSql;
aSql.appendAscii("ALTER TABLE ");
::rtl::OUString aQuote =
m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString( );
- ::rtl::OUString aDot =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
aSql.append(composeTableName(
m_pTable->getConnection()->getMetaData(), m_pTable,
::dbtools::eInTableDefinitions, false, false, true ));
aSql.appendAscii(" ADD ");
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 91baa42..8fcb439 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1412,10 +1412,6 @@ namespace
if ( xInfo.is()
&&
xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_NAME)) )
{
-
- ::rtl::OUString aCatalog;
- ::rtl::OUString aSchema;
- ::rtl::OUString aTable;
if (
xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME))
&&
xInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) )
{
diff --git a/connectivity/source/drivers/ado/ADriver.cxx
b/connectivity/source/drivers/ado/ADriver.cxx
index 0b845ec..4761b96 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -273,8 +273,6 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const
Reference< XInterface >&
pErrors->get_Count(&nLen);
if (nLen)
{
- ::rtl::OUString sError;
- ::rtl::OUString aSQLState;
SQLException aException;
aException.ErrorCode = 1000;
for (sal_Int32 i = nLen-1; i>=0; --i)
diff --git a/connectivity/source/drivers/flat/EConnection.cxx
b/connectivity/source/drivers/flat/EConnection.cxx
index f83fd4a..c84e768 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -72,7 +72,6 @@ void OFlatConnection::construct(const ::rtl::OUString&
url,const Sequence< Prope
{
osl_incrementInterlockedCount( &m_refCount );
- ::rtl::OUString aExt;
const PropertyValue *pBegin = info.getConstArray();
const PropertyValue *pEnd = pBegin + info.getLength();
for(;pBegin != pEnd;++pBegin)
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx
b/connectivity/source/drivers/hsqldb/HViews.cxx
index e3a7ed0..5cf9b20 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -142,7 +142,7 @@ void HViews::createView( const Reference< XPropertySet >&
descriptor )
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "CREATE VIEW " ));
::rtl::OUString aQuote =
xConnection->getMetaData()->getIdentifierQuoteString( );
- ::rtl::OUString sSchema,sCommand;
+ ::rtl::OUString sCommand;
aSql += ::dbtools::composeTableName( m_xMetaData, descriptor,
::dbtools::eInTableDefinitions, false, false, true );
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index d69f8c8..68ca5ba 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -574,7 +574,6 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw(
::rtl::OUStringBuffer
// avoid recursion (e.g. "foo" defined as "SELECT * FROM bar" and
"bar" defined as "SELECT * FROM foo".
if ( rParam.pSubQueryHistory->find( sTableOrQueryName ) !=
rParam.pSubQueryHistory->end() )
{
- ::rtl::OUString sMessage( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "cyclic sub queries" ) ) );
OSL_ENSURE( rParam.pParser,
"OSQLParseNode::impl_parseTableNameNodeToString_throw: no parser?" );
if ( rParam.pParser )
{
@@ -1057,7 +1056,6 @@ OSQLParseNode*
OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
if (m_nFormatKey)
{
sal_Int16 nScale = 0;
- ::rtl::OUString aDec;
try
{
Any aValue = getNumberFormatProperty( m_xFormatter,
m_nFormatKey, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Decimals")) );
diff --git a/toolkit/source/helper/formpdfexport.cxx
b/toolkit/source/helper/formpdfexport.cxx
index 08b9f70..c281563 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -498,7 +498,6 @@ namespace toolkitform
const bool bDocumentLocalTarget = !sURL.isEmpty() && (
sURL.getStr()[0] == '#' );
if ( bDocumentLocalTarget )
{
- const ::rtl::OUString sDestinationName( sURL.copy(1) );
// Register the destination for for future handling ...
pButtonWidget->Dest = i_pdfExportData.RegisterDest();
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 6b75e9a..72c28eb 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -128,7 +128,6 @@ Reference< xml::input::XElement >
MultiPage::startChildElement(
throw (xml::sax::SAXException, RuntimeException)
{
// event
-rtl::OUString _label(RTL_CONSTASCII_USTRINGPARAM("foo"));
if (_pImport->isEventElement( nUid, rLocalName ))
{
return new EventElement(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
