[Libreoffice-commits] core.git: sc/source sd/source sfx2/inc sfx2/source starmath/source sw/source
Kohei Yoshida
kohei.yoshida at gmail.com
Mon Feb 4 16:52:14 PST 2013
sc/source/ui/unoobj/scdetect.cxx | 2 +-
sd/source/ui/unoidl/sddetect.cxx | 2 +-
sfx2/inc/sfx2/docfilt.hxx | 14 +++++++-------
sfx2/source/doc/docfile.cxx | 2 +-
sfx2/source/doc/docfilt.cxx | 24 +++++++++++-------------
starmath/source/smdetect.cxx | 2 +-
sw/source/ui/uno/swdetect.cxx | 2 +-
7 files changed, 23 insertions(+), 25 deletions(-)
New commits:
commit 4deddf208436f4b76b228045c0c9dccaa44f0618
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Feb 4 19:14:23 2013 -0500
String to OUString.
Change-Id: I3a0eff8ca0c8b654a38ee2df1022ca162bcb67aa
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 782d221..45c4666 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -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 );
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index d140345..588982f 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -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 );
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index c4ecb97..c017f84 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -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
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 3ce8ab7..b6d1f85 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -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!" );
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 097074b..f7d47e8 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -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();
}
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index da11ce6..9686942 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -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 );
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index ba8fd2e..74cbcf0 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -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();
More information about the Libreoffice-commits
mailing list