mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String to OUString.

Browse Source 
Change-Id: I3a0eff8ca0c8b654a38ee2df1022ca162bcb67aa
This commit is contained in:
Kohei Yoshida 2013-02-04 19:14:23 -05:00
parent 66f8bbc1b2
commit 4deddf2084
7 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sc/source/ui/unoobj/scdetect.cxx
View File

@ -379,7 +379,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
{
try
{
String aFilterName;
OUString aFilterName;
if ( pFilter )
aFilterName = pFilter->GetName();
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : false, &aFilterName );

2
sd/source/ui/unoidl/sddetect.cxx
View File

@ -254,7 +254,7 @@ SdFilterDetect::~SdFilterDetect()
// the storage can be corrupted and it will be detected here
try
{
String sFilterName;
OUString sFilterName;
if ( pFilter )
sFilterName = pFilter->GetName();
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsOwnTemplateFormat() : sal_False, &sFilterName );

14
sfx2/inc/sfx2/docfilt.hxx
View File

@ -101,13 +101,13 @@ public:
static const SfxFilter* GetFilterByName( const String& rName );
static const SfxFilter* GetDefaultFilterFromFactory( const String& rServiceName );
static String GetTypeFromStorage( const SotStorage& rStg );
static String GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage,
sal_Bool bTemplate = sal_False,
String* pName=0 )
throw ( ::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException );
static OUString GetTypeFromStorage( const SotStorage& rStg );
static OUString GetTypeFromStorage(
const com::sun::star::uno::Reference<com::sun::star::embed::XStorage>& xStorage,
bool bTemplate = false, OUString* pName = NULL )
throw ( com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException );
};
#endif

2
sfx2/source/doc/docfile.cxx
View File

@ -2933,7 +2933,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b
SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const SfxItemSet* p ) :
pImp(new SfxMedium_Impl(this))
{
String aType = SfxFilter::GetTypeFromStorage( rStor );
OUString aType = SfxFilter::GetTypeFromStorage(rStor);
pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( aType );
DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );

24
sfx2/source/doc/docfilt.cxx
View File

@ -124,7 +124,7 @@ const SfxFilter* SfxFilter::GetFilterByName( const String& rName )
return aMatch.GetFilter4FilterName( rName, 0, 0 );
}
String SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
{
const char* pType=0;
if ( rStg.IsStream( rtl::OUString("WordDocument") ) )
@ -164,26 +164,24 @@ String SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
return pType ? rtl::OUString::createFromAscii(pType) : rtl::OUString();
}
String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xStorage, sal_Bool bTemplate,
String* pFilterName )
throw ( beans::UnknownPropertyException,
lang::WrappedTargetException,
uno::RuntimeException )
OUString SfxFilter::GetTypeFromStorage(
const uno::Reference<embed::XStorage>& xStorage, bool bTemplate, OUString* pFilterName )
throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
SfxFilterMatcher aMatcher;
const char* pType=0;
String aName;
OUString aName;
if ( pFilterName )
{
aName = *pFilterName;
pFilterName->Erase();
*pFilterName = OUString();
}
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xProps( xStorage, com::sun::star::uno::UNO_QUERY );
if ( xProps.is() )
{
::rtl::OUString aMediaType;
xProps->getPropertyValue( ::rtl::OUString("MediaType") ) >>= aMediaType;
OUString aMediaType;
xProps->getPropertyValue("MediaType") >>= aMediaType;
if ( !aMediaType.isEmpty() )
{
::com::sun::star::datatransfer::DataFlavor aDataFlavor;
@ -200,7 +198,7 @@ String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com:
nDont |= SFX_FILTER_TEMPLATEPATH;
const SfxFilter* pFilter = 0;
if ( aName.Len() )
if (!aName.isEmpty())
// get preselected Filter if it matches the desired filter flags
pFilter = aMatcher.GetFilter4FilterName( aName, nMust, nDont );
@ -226,10 +224,10 @@ String SfxFilter::GetTypeFromStorage( const com::sun::star::uno::Reference< com:
//TODO: do it without SfxFilter
//TODO/LATER: don't yield FilterName, should be done in FWK!
String aRet;
OUString aRet;
if ( pType )
{
aRet = rtl::OUString::createFromAscii(pType);
aRet = OUString::createFromAscii(pType);
if ( pFilterName )
*pFilterName = aMatcher.GetFilter4EA( aRet )->GetName();
}

2
starmath/source/smdetect.cxx
View File

@ -224,7 +224,7 @@ SmFilterDetect::~SmFilterDetect()
const SfxFilter* pFilter = aPreselectedFilterName.Len() ?
SfxFilterMatcher().GetFilter4FilterName( aPreselectedFilterName ) : aTypeName.Len() ?
SfxFilterMatcher(rtl::OUString("smath")).GetFilter4EA( aTypeName ) : 0;
String aTmpFilterName;
OUString aTmpFilterName;
if ( pFilter )
aTmpFilterName = pFilter->GetName();
aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pFilter ? pFilter->IsAllowedAsTemplate() : sal_False, &aTmpFilterName );

2
sw/source/ui/uno/swdetect.cxx
View File

@ -231,7 +231,7 @@ SwFilterDetect::~SwFilterDetect()
SfxFilterMatcher(rtl::OUString("swriter")).GetFilter4EA( aTypeName ) : 0;
if (!pPreFilter)
pPreFilter = SfxFilterMatcher(rtl::OUString("sweb")).GetFilter4EA( aTypeName );
String aFilterName;
OUString aFilterName;
if ( pPreFilter )
{
aFilterName = pPreFilter->GetName();