diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-15 10:57:42 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-15 10:57:42 +0900 |
| commit | f7319622f63c9dae0eed9e60404d290580fce9fe (patch) | |
| tree | e2c4904908b3ab47053fdd6a1a1ca00eacab20df /sfx2/inc | |
| parent | 2bf110d691053353d6cb06ad2bbd1b78fef60f19 (diff) | |
Revert "replaced String in SfxPickList with rtl::OUString"
This reverts commit 12df49396e6bcb07bafc95255a8526caac96e60a.
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/docfilt.hxx | 4 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/fcontnr.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx index 1da1dea2d3dc..a951239d4a25 100644 --- a/sfx2/inc/sfx2/docfilt.hxx +++ b/sfx2/inc/sfx2/docfilt.hxx @@ -57,7 +57,7 @@ friend class SfxFilterContainer; SfxFilterFlags nFormatType; sal_uInt16 nDocIcon; String aServiceName; - ::rtl::OUString aMimeType; + String aMimeType; String aFilterName; String aPattern; sal_uIntPtr nVersion; @@ -85,7 +85,7 @@ public: bool IsInternal() const { return nFormatType & SFX_FILTER_INTERNAL; } SfxFilterFlags GetFilterFlags() const { return nFormatType; } const String& GetFilterName() const { return aFilterName; } - const ::rtl::OUString& GetMimeType() const { return aMimeType; } + const String& GetMimeType() const { return aMimeType; } const String& GetName() const { return aFilterName; } const WildCard& GetWildcard() const { return aWildCard; } const String& GetRealTypeName() const { return aTypeName; } diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index f6c1d01cb1a1..a6187a677741 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -140,7 +140,7 @@ public: sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const; sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const; - const SfxFilter* GetFilter4Mime( const ::rtl::OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; + const SfxFilter* GetFilter4Mime( const String& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const; const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4EA( const String& rEA, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; const SfxFilter* GetFilter4Extension( const String& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const; |