[Libreoffice-commits] .: connectivity/source fpicker/source idlc/source pyuno/source sal/rtl sc/source starmath/source sw/source uui/source vcl/unx vcl/win
Takeshi Abe
tabe at kemper.freedesktop.org
Tue May 22 09:07:14 PDT 2012
connectivity/source/drivers/dbase/DTables.cxx | 1 -
connectivity/source/drivers/flat/ETable.cxx | 1 -
connectivity/source/drivers/mozab/MResultSet.cxx | 2 +-
connectivity/source/drivers/mozab/MTables.cxx | 1 -
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx | 1 -
idlc/source/aststruct.cxx | 1 -
idlc/source/astunion.cxx | 1 -
pyuno/source/module/pyuno_runtime.cxx | 1 -
sal/rtl/source/bootstrap.cxx | 5 -----
sc/source/filter/excel/xecontent.cxx | 1 -
sc/source/filter/excel/xiname.cxx | 1 -
sc/source/filter/xml/xmlexprt.cxx | 2 --
starmath/source/ooxmlimport.cxx | 1 -
sw/source/core/unocore/unoparagraph.cxx | 1 -
sw/source/core/unocore/unoport.cxx | 1 -
sw/source/filter/html/htmlbas.cxx | 2 --
sw/source/filter/xml/xmlimpit.cxx | 1 -
sw/source/ui/uiview/viewling.cxx | 1 -
sw/source/ui/vba/vbaselection.cxx | 1 -
uui/source/iahndl-filter.cxx | 1 -
vcl/unx/generic/dtrans/X11_selection.cxx | 1 -
vcl/win/source/gdi/salgdi3.cxx | 1 -
22 files changed, 1 insertion(+), 28 deletions(-)
New commits:
commit 5394b379eba8f3522a80ee7e68708f8851a86d7d
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed May 23 01:06:30 2012 +0900
removed unused temporary rtl::OUString
Change-Id: I9d118a5fbe2306465d8bcdb9ddd0596588137e5e
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 6bcf351..96faa18 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -55,7 +55,6 @@ namespace starutil = ::com::sun::star::util;
sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName)
{
- ::rtl::OUString aName,aSchema;
ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
_rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE")));
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 9a0e97a..e70e4da 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -122,7 +122,6 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
const sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
const sal_Unicode cThousandDelimiter = pConnection->getThousandDelimiter();
String aColumnName;
- ::rtl::OUString aTypeName;
::comphelper::UStringMixEqual aCase(bCase);
::std::vector<String> aColumnNames,m_aTypeNames;
m_aTypeNames.resize(nFieldCount);
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 6e1cdbe..c64b5b8 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -766,7 +766,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
::rtl::Reference<OSQLColumns> xColumns = m_pSQLIterator->getParameters();
if(xColumns.is())
{
- ::rtl::OUString aTabName,aColName,aParameterName,aParameterValue;
+ ::rtl::OUString aColName, aParameterValue;
OSQLColumns::Vector::iterator aIter = xColumns->get().begin();
sal_Int32 i = 1;
for(;aIter != xColumns->get().end();++aIter)
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index 6672dca..7793605 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -67,7 +67,6 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%"));
// aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE"));
// aTypes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEMTABLE"));
- ::rtl::OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index b7337ab..b7f8670 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -920,7 +920,6 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
HRESULT hResult = iCustom->GetCheckButtonState( css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, &bValue);
if ( bValue )
{
- ::rtl::OUString aExt;
UINT nFileType;
hResult = iDialog->GetFileTypeIndex(&nFileType);
if ( SUCCEEDED(hResult) )
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index d54df4c..c8bcd6a 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -134,7 +134,6 @@ sal_Bool AstStruct::dump(RegistryKey& rKey)
DeclList::const_iterator end = getIteratorEnd();
AstDeclaration* pDecl = NULL;
AstMember* pMember = NULL;
- OUString docu;
sal_uInt16 index = 0;
while ( iter != end )
{
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index f55843b..1acc0ed 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -303,7 +303,6 @@ sal_Bool AstUnion::dump(RegistryKey& rKey)
AstUnionLabel* pLabel = NULL;
AstExprValue* pExprValue = NULL;
RTConstValue aConst;
- OUString docu;
sal_uInt16 index = 0;
if ( pDefault )
index = 1;
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 8194de9..e7023bc 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -560,7 +560,6 @@ PyRef Runtime::any2PyObject (const Any &a ) const
tc->convertTo (a, ::getCppuType (&s)) >>= s;
PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE);
int i=0;
- OUString errMsg;
try
{
for ( i = 0; i < s.getLength (); i++)
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 1d3f052..98c983b 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -195,11 +195,6 @@ CommandLineParameterMap::CommandLineParameterMap() {
static char const PREFIX[] = "-env:";
if (s.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(PREFIX))) {
sal_Int32 j = s.indexOf('=', RTL_CONSTASCII_LENGTH(PREFIX));
- rtl::OUString k(
- s.copy(
- RTL_CONSTASCII_LENGTH(PREFIX),
- ((j < 0 ? s.getLength() : j) -
- RTL_CONSTASCII_LENGTH(PREFIX))));
if (j < 0) {
map_.erase(s.copy(RTL_CONSTASCII_LENGTH(PREFIX)));
} else {
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 9f42dcb..87b1d25 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1043,7 +1043,6 @@ XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleF
void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm )
{
- rtl::OUString sSeqRef;
const ScRangeList& rRanges = mrFormat.GetRange();
sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 00f0d42..3906db5 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -136,7 +136,6 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
maScName = maXclName;
ScfTools::ConvertToScDefinedName( maScName );
}
- rtl::OUString aRealOrigName = maScName;
// add index for local names
if( mnXclTab != EXC_NAME_GLOBAL )
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d2f2b89..1fb9c0c 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -661,8 +661,6 @@ void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCo
if (!HasDrawPages(xSpreadDoc))
return;
- rtl::OUString sCaptionPoint(RTL_CONSTASCII_USTRINGPARAM("CaptionPoint"));
-
for (SCTAB nTable = 0; nTable < nTableCount; ++nTable)
{
nCurrentTable = sal::static_int_cast<sal_uInt16>(nTable);
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 78a75ab..1b28266 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -385,7 +385,6 @@ OUString SmOoxmlImport::handleF()
{
stream.ensureOpeningTag( M_TOKEN( f ));
enum operation_t { bar, lin, noBar } operation = bar;
- OUString oper = "over";
if( stream.checkOpeningTag( M_TOKEN( fPr )))
{
if( XmlStream::Tag type = stream.checkOpeningTag( M_TOKEN( type )))
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 6986555..5fa413c 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -567,7 +567,6 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
const SfxItemPropertyMap &rPropMap =
m_pImpl->m_rPropSet.getPropertyMap();
- OUString sTmp;
SwPosition aPos( rTxtNode );
SwCursor aCursor( aPos, 0, false );
SwParaSelection aParaSel( aCursor );
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 334dc04..b3bd357 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -543,7 +543,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
const SfxItemPropertyMap& rPropMap = m_pPropSet->getPropertyMap();
- OUString sTmp;
for (sal_Int32 i = 0; i < nProps; ++i)
{
try
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 182d9a2..1ee17bb 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -259,8 +259,6 @@ void SwHTMLParser::InsertBasicDocEvent( rtl::OUString aEvent, const String& rNam
if( EXTENDED_STYPE == eScrType )
sScriptType = rScrType;
- rtl::OUString aEventName;
-
SfxEventConfiguration::ConfigureEvent( aEvent, SvxMacro( sEvent, sScriptType, eScrType ),
pDocSh );
}
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 8260ba5..1867218 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -902,7 +902,6 @@ sal_Bool SvXMLImportItemMapper::PutXMLValue(
sal_Int32 nPos = rValue.indexOf( (sal_Unicode)'*' );
if( -1L != nPos )
{
- OUString sNum( rValue.copy( 0L, nPos ) );
sal_Int32 nValue = rValue.toInt32();
if( nValue < MINLAY )
nValue = MINLAY;
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 2025097..273c6a0 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -734,7 +734,6 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
//! 'custom made' menu... *sigh* (code copied from sfx2 and framework)
if ( pMenu )
{
- OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
sal_uInt16 nId = ((PopupMenu*)pMenu)->Execute(pEditWin, aPixPos);
OUString aCommand = ((PopupMenu*)pMenu)->GetItemCommand(nId);
if (aCommand.isEmpty() )
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index 13bc019..df31e14 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -821,7 +821,6 @@ SwVbaSelection::Tables( const uno::Any& aIndex ) throw (uno::RuntimeException)
if ( pTTCursor )
{
SwFrmFmt* pFmt = pTTCursor->GetFrmFmt();
- rtl::OUString sTableName;
if ( pFmt )
{
uno::Reference< text::XTextTable > xTbl = SwXTextTables::GetObject(*pFmt);
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 2255096..94d54ea 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -340,7 +340,6 @@ handleFilterOptionsRequest_(
sal_Int32 nPropCount = rRequest.rProperties.getLength();
for( sal_Int32 ind = 0; ind < nPropCount; ++ind )
{
- rtl::OUString tmp = rRequest.rProperties[ind].Name;
if( rRequest.rProperties[ind].Name.equals(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"))) )
{
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 1c4faae..ede6fa8 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -364,7 +364,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
arguments.getConstArray()[2] >>= m_xBitmapConverter;
}
- OUString aParam;
if( ! m_pDisplay )
{
OUString aUDisplay;
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index a22ab47..dfb3d3d 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2216,7 +2216,6 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
// only the font path of the user installation is needed
::rtl::OUString aPath;
osl_getExecutableFile( &aPath.pData );
- ::rtl::OUString aExecutableFile( aPath );
aPath = aPath.copy( 0, aPath.lastIndexOf('/') );
String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') );
aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/share/fonts/truetype") );
More information about the Libreoffice-commits
mailing list