diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:15:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 11:15:01 +0000 |
| commit | 55a8219a9597597974e2680c1595aa6b815a3c5c (patch) | |
| tree | f098139381c29e03135b4b6d0cd4d113ddf66103 /starmath | |
| parent | 9f9230c220520dc821bab47edd5a7483bf89b504 (diff) | |
INTEGRATION: CWS tl32 (1.9.20); FILE MERGED
2006/11/01 13:10:08 tl 1.9.20.2: #i69286# make starmath warning-free for unxlngi6(.pro)
2006/10/30 10:35:10 tl 1.9.20.1: #i69286# make starmath warning-free
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/smdetect.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 1f5bcf7d0630..defc3eb6ad68 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -4,9 +4,9 @@ * * $RCSfile: smdetect.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:54:54 $ + * last change: $Author: vg $ $Date: 2007-05-25 12:15:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -134,7 +134,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ucb; using namespace ::rtl; -SmFilterDetect::SmFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) +SmFilterDetect::SmFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& /*xFactory*/ ) { } @@ -296,10 +296,10 @@ SmFilterDetect::~SmFilterDetect() const SfxFilter* pFilter = aPreselectedFilterName.Len() ? SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ? SfxFilterMatcher(String::CreateFromAscii("smath")).GetFilter4EA( aTypeName ) : 0; - String aFilterName; + String aTmpFilterName; if ( pFilter ) - aFilterName = pFilter->GetName(); - aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsAllowedAsTemplate() : FALSE, &aFilterName ); + aTmpFilterName = pFilter->GetName(); + aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsAllowedAsTemplate() : FALSE, &aTmpFilterName ); } catch( lang::WrappedTargetException& aWrap ) { @@ -379,7 +379,7 @@ SmFilterDetect::~SmFilterDetect() } else { - const int nSize = 5; + const USHORT nSize = 5; sal_Char aBuffer[nSize+1]; aBuffer[nSize] = 0; pStrm->Seek( STREAM_SEEK_TO_BEGIN ); |