diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-15 23:53:00 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-16 00:43:11 +0900 |
| commit | dfd08cdf16e5b46b05dadb5fb3a2b32349ec5df5 (patch) | |
| tree | 3e72cd620b9c5175853c0f587a330afd66b38d2b /sd | |
| parent | a8b0407fef14cd89e3eb571c88ce3cb9edf70149 (diff) | |
replaced String in SfxPickList with rtl::OUString
this consists of 12df49396e6bcb07bafc95255a8526caac96e60a and related changes
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/inc/fuinsfil.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 5a976b8b2a73..b98f14fe73c8 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -111,7 +111,7 @@ FunctionReference FuInsertFile::Create( ViewShell* pViewSh, ::sd::Window* pWin, void FuInsertFile::DoExecute( SfxRequest& rReq ) { SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher(); - ::std::vector< String > aFilterVector; + ::std::vector< OUString > aFilterVector; const SfxItemSet* pArgs = rReq.GetArgs (); FuInsertFile::GetSupportedFilterVector( aFilterVector ); @@ -229,7 +229,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() ); // add additional supported filters - ::std::vector< String >::const_iterator aIter( aFilterVector.begin() ); + ::std::vector< OUString >::const_iterator aIter( aFilterVector.begin() ); while( aIter != aFilterVector.end() ) { @@ -796,7 +796,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) // ----------------------------------------------------------------------------- -void FuInsertFile::GetSupportedFilterVector( ::std::vector< String >& rFilterVector ) +void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector ) { SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher(); const SfxFilter* pSearchFilter = NULL; diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index bad7d3a24f03..fba3dc831d90 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -46,7 +46,7 @@ public: static FunctionReference Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); - static void GetSupportedFilterVector( ::std::vector< String >& rFilterVector ); + static void GetSupportedFilterVector( ::std::vector< ::rtl::OUString >& rFilterVector ); private: FuInsertFile ( diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 0874071b9c85..92d0b709df94 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -412,7 +412,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( pFoundFilter && !nErr ) { - ::std::vector< String > aFilterVector; + ::std::vector< ::rtl::OUString > aFilterVector; const String aFilterName( pFoundFilter->GetFilterName() ); String aLowerAsciiFileName( aCurrentDropFile ); aLowerAsciiFileName.ToLowerAscii(); |