diff options
| -rw-r--r-- | include/sfx2/docinsert.hxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/docinsert.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index cefcf034f48e..beee0aff0138 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -38,8 +38,8 @@ namespace sfx2 { class SFX2_DLLPUBLIC DocumentInserter { private: - String m_sDocFactory; - String m_sFilter; + OUString m_sDocFactory; + OUString m_sFilter; Link m_aDialogClosedLink; sal_Int64 const m_nDlgFlags; @@ -52,7 +52,7 @@ private: DECL_LINK(DialogClosedHdl, void *); public: - DocumentInserter(const String& rFactory, + DocumentInserter(const OUString& rFactory, bool const bEnableMultiSelection = false); ~DocumentInserter(); @@ -61,7 +61,7 @@ public: SfxMediumList* CreateMediumList(); inline ErrCode GetError() const { return m_nError; } - inline String GetFilter() const { return m_sFilter; } + inline OUString GetFilter() const { return m_sFilter; } }; } // namespace sfx2 diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index a59b43506823..7ebf2b56a593 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -50,7 +50,7 @@ extern sal_uInt32 CheckPasswd_Impl( SfxObjectShell* pDoc, SfxItemPool &rPool, Sf namespace sfx2 { DocumentInserter::DocumentInserter( - const String& rFactory, bool const bEnableMultiSelection) : + const OUString& rFactory, bool const bEnableMultiSelection) : m_sDocFactory ( rFactory ) , m_nDlgFlags ( (bEnableMultiSelection) @@ -92,7 +92,7 @@ SfxMedium* DocumentInserter::CreateMedium() SFX_APP()->GetFilterMatcher().GetFilter4FilterName( m_sFilter ), m_pItemSet ); pMedium->UseInteractionHandler( sal_True ); SfxFilterMatcher* pMatcher = NULL; - if ( m_sDocFactory.Len() ) + if ( !m_sDocFactory.isEmpty() ) pMatcher = new SfxFilterMatcher( m_sDocFactory ); else pMatcher = new SfxFilterMatcher(); |