[Libreoffice-commits] core.git: 2 commits - comphelper/source connectivity/source cui/source filter/source framework/source lotuswordpro/source sfx2/source svtools/source svx/source unodevtools/source writerperfect/source
Thomas Arnhold
thomas at arnhold.org
Sun Mar 3 02:52:51 PST 2013
comphelper/source/misc/accessiblewrapper.cxx | 7 ++---
connectivity/source/commontools/TColumnsHelper.cxx | 1
connectivity/source/commontools/TTableHelper.cxx | 1
connectivity/source/commontools/dbtools2.cxx | 2 -
connectivity/source/drivers/file/fcomp.cxx | 1
connectivity/source/drivers/hsqldb/HTable.cxx | 3 --
connectivity/source/drivers/hsqldb/HViews.cxx | 1
connectivity/source/drivers/mysql/YTable.cxx | 1
connectivity/source/drivers/mysql/YViews.cxx | 1
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 8 ++---
cui/source/tabpages/tpline.cxx | 1
filter/source/xsltdialog/typedetectionexport.cxx | 2 -
filter/source/xsltdialog/xmlfilterjar.cxx | 2 -
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 6 ++--
framework/source/uielement/fontsizemenucontroller.cxx | 1
lotuswordpro/source/filter/lwpsdwrect.cxx | 2 -
sfx2/source/appl/appserv.cxx | 1
svtools/source/control/stdmenu.cxx | 1
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 6 ----
svx/source/dialog/imapwnd.cxx | 1
svx/source/form/fmexpl.cxx | 3 --
svx/source/form/formcontroller.cxx | 2 -
unodevtools/source/skeletonmaker/cpptypemaker.cxx | 1
unodevtools/source/skeletonmaker/javatypemaker.cxx | 14 ----------
unodevtools/source/unodevtools/typeblob.cxx | 1
writerperfect/source/draw/CDRImportFilter.cxx | 1
writerperfect/source/draw/CMXImportFilter.cxx | 1
writerperfect/source/draw/MSPUBImportFilter.cxx | 1
writerperfect/source/draw/VisioImportFilter.cxx | 1
writerperfect/source/writer/MSWorksImportFilter.cxx | 2 -
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2 -
31 files changed, 13 insertions(+), 65 deletions(-)
New commits:
commit 763e94b584411fd856253a06c869a82702f8c89d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Mar 3 11:52:14 2013 +0100
protocol shttp is not defined yet
Change-Id: I67678f8a16d051427a7c36f3a46d46f296109e3b
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index bcc5475..ac71184 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -46,7 +46,7 @@ static OUString createRelativeURL( const OUString& rFilterName, const OUString&
{
if( !rURL.isEmpty() &&
(rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("http:") ) != 0) &&
- (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("shttp:") ) != 0) &&
+ (rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("https:") ) != 0) &&
(rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("jar:") ) != 0) &&
(rURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM("ftp:") ) != 0))
{
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 1defb2e..8bf0f71 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -129,7 +129,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
{
if( !rSourceFile.isEmpty() &&
(rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("http:") ) != 0) &&
- (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("shttp:") ) != 0) &&
+ (rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("https:") ) != 0) &&
(rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("jar:") ) != 0) &&
(rSourceFile.compareToAscii( RTL_CONSTASCII_STRINGPARAM("ftp:") ) != 0))
{
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 25d19be..f07c497 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -57,7 +57,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co
maCBNeedsXSLT2( this, ResId (CB_XML_NEEDS_XSLT2, rResMgr ) ),
sHTTPSchema( "http://" ),
- sSHTTPSchema( "shttp://" ),
+ sSHTTPSchema( "https://" ),
sFILESchema( "file://" ),
sFTPSchema( "ftp://" ),
sInstPath( "$(prog)/" )
@@ -128,7 +128,7 @@ void XMLFilterTabPageXSLT::SetURL( SvtURLBox& rURLBox, const OUString& rURL )
rURLBox.SetText( aPath );
}
else if( rURL.matchIgnoreAsciiCase( "http://" ) ||
- rURL.matchIgnoreAsciiCase( "shttp://" ) ||
+ rURL.matchIgnoreAsciiCase( "https://" ) ||
rURL.matchIgnoreAsciiCase( "ftp://" ) )
{
rURLBox.SetBaseURL( rURL );
@@ -156,7 +156,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox& rURLBox )
OUString aURL;
OUString aStrPath ( rURLBox.GetText() );
if( aStrPath.matchIgnoreAsciiCase( "http://" ) ||
- aStrPath.matchIgnoreAsciiCase( "shttp://" ) ||
+ aStrPath.matchIgnoreAsciiCase( "https://" ) ||
aStrPath.matchIgnoreAsciiCase( "ftp://" ) )
{
return aStrPath;
commit 919e27746650f223699a97f8f3d4922101d6d739
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Mar 3 06:01:17 2013 +0100
loplugin: unused variables and commented code
Change-Id: I01f1f1d112767b576d7cfc6e25fe95385de2c0cf
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index f7ac738..897f0fd 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -277,9 +277,10 @@ namespace comphelper
xContext = xOwningAccessible->getAccessibleContext();
if ( xContext.is() )
{
- ::rtl::OUString sName = xContext->getAccessibleName();
- ::rtl::OUString sDescription = xContext->getAccessibleDescription();
-// sal_Int32 nPlaceYourBreakpointHere = 0;
+ //TODO: do something
+ //::rtl::OUString sName = xContext->getAccessibleName();
+ //::rtl::OUString sDescription = xContext->getAccessibleDescription();
+ //sal_Int32 nPlaceYourBreakpointHere = 0;
}
}
catch( const Exception& /*e*/ )
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index ad725c4..1f2a30a 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -178,7 +178,6 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
- ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( );
aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ADD "));
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index bf4efb0..7a85113a 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -505,7 +505,6 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
else
{
::rtl::OUString sSql = getRenameStart();
- ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 1b6124a..f671e6b 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -280,7 +280,6 @@ namespace
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString();
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" PRIMARY KEY ")));
aSql.append(generateColumnNames(xColumns,xMetaData));
}
@@ -291,7 +290,6 @@ namespace
if(!xColumns.is() || !xColumns->getCount())
::dbtools::throwFunctionSequenceException(_xConnection);
- const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString();
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" UNIQUE ")));
aSql.append(generateColumnNames(xColumns,xMetaData));
}
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index e63969a..5419402 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -435,7 +435,6 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
}
else if (pPredicateNode->count() == 3)
{
- ::rtl::OUString aTableName = pPredicateNode->getChild(0)->getTokenValue();
if(SQL_ISRULE(pPredicateNode->getChild(2),column_val))
aColumnName = pPredicateNode->getChild(2)->getChild(0)->getTokenValue();
else
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 586922d..5bb03562 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -318,7 +318,6 @@ void OHSQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
::rtl::OUString OHSQLTable::getAlterTableColumnPart()
{
::rtl::OUString sSql( "ALTER TABLE " );
- const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) );
sSql += sComposedName;
@@ -387,8 +386,6 @@ void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLExce
else
sSql += ::rtl::OUString(" TABLE ");
- ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
-
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index fde4452..1da4d9a 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -132,7 +132,6 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
::rtl::OUString aSql( "CREATE VIEW " );
- ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sCommand;
aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index 14c2334..9b8f38d 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -343,7 +343,6 @@ void OMySQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
::rtl::OUString OMySQLTable::getAlterTableColumnPart()
{
::rtl::OUString sSql( "ALTER TABLE " );
- const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sComposedName(
::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) );
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index eb1a8d7..765b6d7 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -126,7 +126,6 @@ void OViews::createView( const Reference< XPropertySet >& descriptor )
Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
::rtl::OUString aSql( "CREATE VIEW " );
- ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( );
::rtl::OUString sCommand;
aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 642aba6..9de0b04 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -1088,7 +1088,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const ::rtl:
else
pSchemaPat = NULL;
- ::rtl::OString aPKQ,aPKO,aPKN,aCOL;
+ ::rtl::OString aPKQ,aPKO,aPKN;
if ( catalog.hasValue() )
aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
@@ -1132,7 +1132,7 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any&
else
pSchemaPat = NULL;
- ::rtl::OString aPKQ,aPKO,aPKN,aCOL;
+ ::rtl::OString aPKQ,aPKO,aPKN;
if ( catalog.hasValue() )
aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
aPKO = ::rtl::OUStringToOString(schema,m_nTextEncoding);
@@ -1170,7 +1170,7 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const ::rt
const Any& catalog2, const ::rtl::OUString* schema2,
const ::rtl::OUString* table2) throw(SQLException, RuntimeException)
{
- ::rtl::OString aPKQ,aPKO,aPKN, aFKQ, aFKO, aFKN;
+ ::rtl::OString aPKQ, aPKN, aFKQ, aFKO, aFKN;
if ( catalog.hasValue() )
aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
if ( catalog2.hasValue() )
@@ -1219,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const ::rtl
else
pSchemaPat = NULL;
- ::rtl::OString aPKQ,aPKO,aPKN,aCOL;
+ ::rtl::OString aPKQ,aPKO,aPKN;
if ( catalog.hasValue() )
aPKQ = ::rtl::OUStringToOString(comphelper::getString(catalog),m_nTextEncoding);
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f79505e..66eff0c 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1133,7 +1133,6 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl()
void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
{
- String aString;
XLineStyle eXLS; // XLINE_NONE, XLINE_SOLID, XLINE_DASH
// Line style
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 87e1823..9bde9fb 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -104,7 +104,6 @@ rtl::OUString FontSizeMenuController::retrievePrinterName( com::sun::star::uno::
void FontSizeMenuController::setCurHeight( long nHeight, Reference< css::awt::XPopupMenu >& rPopupMenu )
{
// check menu item
- rtl::OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, sal_True, sal_False );
sal_uInt16 nChecked = 0;
sal_uInt16 nItemCount = rPopupMenu->getItemCount();
for( sal_uInt16 i = 0; i < nItemCount; i++ )
diff --git a/lotuswordpro/source/filter/lwpsdwrect.cxx b/lotuswordpro/source/filter/lwpsdwrect.cxx
index 0fb1851..221b4ed 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.cxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.cxx
@@ -178,8 +178,6 @@ Rectangle SdwRectangle::GetOriginalRect() const
Point aLT(aCenter.X()-(long)((double)nWidth/2+0.5),
aCenter.Y()-(long)((double)nHeight/2+0.5));
- Point aRT(aLT.X()+nWidth, aLT.Y());
- Point aLB(aLT.X(), aLT.Y()-nHeight);
Point aRB(aLT.X()+nWidth, aLT.Y()+nHeight);
return Rectangle(aLT, aRB);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d7aeafa..e5e4834 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1337,7 +1337,6 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
if ( pStringItem )
{
- String aPLZ = pStringItem->GetValue();
bRet = sal_True /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
}
#ifndef DISABLE_SCRIPTING
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index c8bf274..f5f0cf7 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -232,7 +232,6 @@ void FontSizeMenu::SetCurHeight( long nHeight )
mnCurHeight = nHeight;
// check menu item
- OUString aHeight = Application::GetSettings().GetUILocaleI18nHelper().GetNum( nHeight, 1, sal_True, sal_False );
sal_uInt16 nChecked = 0;
sal_uInt16 nItemCount = GetItemCount();
for( sal_uInt16 i = 0; i < nItemCount; i++ )
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 8bbf160..b22c704 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -811,12 +811,6 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd
pRet = new SdrPathObj( OBJ_POLY, aPolyPoly );
- Point aP( pCustomShape->GetSnapRect().Center() );
- Size aS( pCustomShape->GetLogicRect().GetSize() );
- aP.X() -= aS.Width() / 2;
- aP.Y() -= aS.Height() / 2;
- Rectangle aLogicRect( aP, aS );
-
SfxItemSet aSet( pCustomShape->GetMergedItemSet() );
aSet.ClearItem( SDRATTR_TEXTDIRECTION ); //SJ: vertical writing is not required, by removing this item no outliner is created
aSet.Put(SdrShadowItem(sal_False)); // #i37011# NO shadow for FontWork geometry
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index af7a206..f95c768 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -560,7 +560,6 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
if ( pIMapObj && ( aStr = pIMapObj->GetURL() ).Len() )
{
- String aDescr( pIMapObj->GetAltText() );
Rectangle aLogicPix( LogicToPixel( Rectangle( Point(), GetGraphicSize() ) ) );
Rectangle aScreenRect( OutputToScreenPixel( aLogicPix.TopLeft() ),
OutputToScreenPixel( aLogicPix.BottomRight() ) );
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 4610d7a..b2979cc 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -419,9 +419,6 @@ FmControlData::FmControlData(
Reference< XPropertySet > xSet(m_xFormComponent, UNO_QUERY);
if( xSet.is() )
{
-#ifdef DBG_UTIL
- ::rtl::OUString aEntryName = ::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME ));
-#endif
SetText( ::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME )));
}
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index c6f7626..8dbd5ff 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -840,8 +840,6 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
Reference< XColumnsSupplier> xSupplyCols(m_xModelAsIndex, UNO_QUERY);
Reference< XNameAccess> xFields(xSupplyCols->getColumns(), UNO_QUERY);
- ::rtl::OUString aQuote( xMetaData->getIdentifierQuoteString() );
-
// now add the filter rows
try
{
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 7bac1f7..689b517 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -466,7 +466,6 @@ void printMethods(std::ostream & o,
reader.getSuperTypeName(i)));
}
- OString stype(codemaker::convertString(super.getTypeName()));
printMethods(o, options, manager, super, generated, delegate,
classname, indentation, defaultvalue, propertyhelper);
}
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index 88e961d..e2e4a6d 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -404,16 +404,6 @@ void printMethods(std::ostream & o,
}
sal_uInt16 method = 0;
for ( sal_uInt16 i = 0; i < reader.getFieldCount(); ++i ) {
-// OString fieldName(
-// codemaker::convertString(reader.getFieldName(i)).
-// replace('/', '.'));
-// OString fieldType(
-// codemaker::convertString(reader.getFieldTypeName(i)).
-// replace('/', '.'));
-// attributes.insert(StringPairHashMap::value_type(fieldName,
-// std::pair<OString, sal_Int16>(
-// fieldType, reader.getFieldFlags(i))));
-
o << indentation << "public ";
printType(o,
options, manager,
@@ -422,9 +412,6 @@ void printMethods(std::ostream & o,
<< codemaker::convertString(reader.getFieldName(i)).getStr()
<< "()";
- OUString mn = reader.getMethodName(method);
- OUString fn = reader.getFieldName(i);
-
if ( method < reader.getMethodCount()
&& reader.getMethodFlags(method) == RT_MODE_ATTRIBUTE_GET
&& reader.getMethodName(method) == reader.getFieldName(i) )
@@ -459,7 +446,6 @@ void printMethods(std::ostream & o,
}
// REMOVE next line
- OUString tmp = reader.getFieldName(i);
if ( (reader.getFieldFlags(i) & RT_ACCESS_READONLY) == 0 ) {
bool setAttrMethod = false;
o << indentation << "public void set"
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index d877e44..b2d1ab6 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -176,7 +176,6 @@ void writeMethodData( typereg::Writer& rWriter, sal_uInt32 calculatedMemberOffse
Sequence< Reference< XMethodParameter > > parameters(xMethod->getParameters());
Sequence< Reference< XTypeDescription > > exceptions(xMethod->getExceptions());
- OUString name(xMethod->getMemberName());
sal_uInt16 methodIndex = (sal_uInt16)(xMethod->getPosition()
- calculatedMemberOffset);
sal_uInt16 paramCount = (sal_uInt16)parameters.getLength();
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 216e1fd..d0204b3 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -68,7 +68,6 @@ throw (RuntimeException)
#endif
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 8854490..8dec748 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -67,7 +67,6 @@ throw (RuntimeException)
#endif
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index b80b6d6..a892308 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -63,7 +63,6 @@ throw (RuntimeException)
#endif
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 9b39b64..a566947 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -63,7 +63,6 @@ throw (RuntimeException)
#endif
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 4ef2b0e..f441539d 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -64,7 +64,6 @@ throw (RuntimeException)
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
@@ -127,7 +126,6 @@ throw( com::sun::star::uno::RuntimeException )
OUString sTypeName;
sal_Int32 nLength = Descriptor.getLength();
sal_Int32 location = nLength;
- OUString sURL;
const PropertyValue *pValue = Descriptor.getConstArray();
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index b4adfba..ec476c2 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -93,7 +93,6 @@ throw (RuntimeException)
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
- OUString sURL;
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
{
@@ -182,7 +181,6 @@ throw( RuntimeException )
OUString sTypeName;
sal_Int32 nLength = Descriptor.getLength();
sal_Int32 location = nLength;
- OUString sURL;
const PropertyValue *pValue = Descriptor.getConstArray();
Reference < XInputStream > xInputStream;
for ( sal_Int32 i = 0 ; i < nLength; i++)
More information about the Libreoffice-commits
mailing list