summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:10:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:10:05 +0000
commitfd1512d6f20c8a3d4a4cba51524d0855d5e9799f (patch)
treec2103a49426adf71d226a2021bb2d7d4b226b5ef /unotools
parentb128283cf17ce0b73cf68faa456b960b4bbcc25b (diff)
INTEGRATION: CWS warnings01 (1.19.16); FILE MERGED
2005/10/27 10:51:18 pl 1.19.16.2: #i55991# removed warnings for solaris platform 2005/10/21 09:49:02 dbo 1.19.16.1: #i53898# warning free code
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/ucbhelper/ucbhelper.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index b7ed0f6fba0f..555b0f3a1ee7 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ucbhelper.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 09:51:39 $
+ * last change: $Author: hr $ $Date: 2006-06-19 14:10:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -128,7 +128,7 @@ using namespace rtl;
using namespace comphelper;
using namespace osl;
-DECLARE_LIST( StringList_Impl, OUString* );
+DECLARE_LIST( StringList_Impl, OUString* )
#define CONVERT_DATETIME( aUnoDT, aToolsDT ) \
aToolsDT = DateTime( Date( aUnoDT.Day, aUnoDT.Month, aUnoDT.Year ), \
@@ -221,7 +221,6 @@ sal_Bool UCBContentHelper::IsDocument( const String& rContent )
Any UCBContentHelper::GetProperty( const String& rContent, const ::rtl::OUString& rName )
{
- sal_Bool bRet = sal_False;
INetURLObject aObj( rContent );
DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
try
@@ -378,7 +377,6 @@ Sequence < OUString > UCBContentHelper::GetFolderContents( const String& rFolder
xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xFactory );
if ( xDynamicResultSet.is() )
{
- sal_Int16 nCaps = xDynamicResultSet->getCapabilities();
xResultSet = xDynamicResultSet->getStaticResultSet();
}
}
@@ -448,6 +446,7 @@ Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL )
OUString* pProps = aProps.getArray();
pProps[0] = OUString::createFromAscii( "Title" );
pProps[1] = OUString::createFromAscii( "ContentType" );
+ // TODO: can be optimized, property never used:
pProps[2] = OUString::createFromAscii( "IsFolder" );
try
@@ -475,7 +474,6 @@ Sequence < OUString > UCBContentHelper::GetResultSet( const String& rURL )
{
String aTitle( xRow->getString(1) );
String aType( xRow->getString(2) );
- sal_Bool bFolder = xRow->getBoolean(3);
String aRow = aTitle;
aRow += '\t';
aRow += aType;
@@ -823,7 +821,6 @@ sal_Bool UCBContentHelper::FindInPath( const String& rPath, const String& rName,
{
// extract the single folder names from the path variable and try to find the file in one of these folders
USHORT nTokenCount = rPath.GetTokenCount( cDelim );
- USHORT nIndex = 0;
for ( USHORT nToken = 0; nToken < nTokenCount; ++nToken )
{
String aPath = rPath.GetToken( nToken, cDelim );
@@ -834,5 +831,5 @@ sal_Bool UCBContentHelper::FindInPath( const String& rPath, const String& rName,
return FALSE;
}
-};
+}