Skip to content

C
core
Kaydet (Commit) 6f5ffd49 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert include/svx/gallery1.hxx from String to OUString 

Change-Id: Ic1ea4f661b4975cb215ae6b4e6e6e068a85d4a07
üst 892acc2c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
include/svx/gallery1.hxx
Dosyayı görüntüle @ 6f5ffd49
......@@ -53,7 +53,7 @@ private:
public:
GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
GalleryThemeEntry( const INetURLObject& rBaseURL, const OUString& rName,
sal_Bool bReadOnly, sal_Bool bNewFile,
sal_uInt32 nId, sal_Bool bThemeNameFromResource );
~GalleryThemeEntry() {};
......@@ -128,16 +128,16 @@ public:
size_t GetThemeCount() const { return aThemeList.size(); }
const GalleryThemeEntry* GetThemeInfo( size_t nPos )
{ return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; }
const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
const GalleryThemeEntry* GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName );
SVX_DLLPUBLIC sal_Bool HasTheme( const OUString& rThemeName );
OUString GetThemeName( sal_uIntPtr nThemeId ) const;
SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName );
sal_Bool RenameTheme( const String& rOldName, const String& rNewName );
SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName );
SVX_DLLPUBLIC sal_Bool CreateTheme( const OUString& rThemeName );
sal_Bool RenameTheme( const OUString& rOldName, const OUString& rNewName );
SVX_DLLPUBLIC sal_Bool RemoveTheme( const OUString& rThemeName );
SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener );
SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const OUString& rThemeName, SfxListener& rListener );
SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
public:
......
svx/source/gallery2/gallery1.cxx
Dosyayı görüntüle @ 6f5ffd49
......@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
// - GalleryThemeEntry -
// ---------------------
GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const OUString& rName,
sal_Bool _bReadOnly, sal_Bool _bNewFile,
sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) :
nId ( _nId ),
......@@ -505,14 +505,14 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
// ------------------------------------------------------------------------
sal_Bool Gallery::HasTheme( const String& rThemeName )
sal_Bool Gallery::HasTheme( const OUString& rThemeName )
{
return( ImplGetThemeEntry( rThemeName ) != NULL );
}
// ------------------------------------------------------------------------
sal_Bool Gallery::CreateTheme( const String& rThemeName )
sal_Bool Gallery::CreateTheme( const OUString& rThemeName )
{
sal_Bool bRet = sal_False;
......@@ -534,7 +534,7 @@ sal_Bool Gallery::CreateTheme( const String& rThemeName )
// ------------------------------------------------------------------------
sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName )
sal_Bool Gallery::RenameTheme( const OUString& rOldName, const OUString& rNewName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rOldName );
sal_Bool bRet = sal_False;
......@@ -563,7 +563,7 @@ sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName )
// ------------------------------------------------------------------------
sal_Bool Gallery::RemoveTheme( const String& rThemeName )
sal_Bool Gallery::RemoveTheme( const OUString& rThemeName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName );
sal_Bool bRet = sal_False;
......@@ -673,7 +673,7 @@ void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme )
// ------------------------------------------------------------------------
GalleryTheme* Gallery::AcquireTheme( const String& rThemeName, SfxListener& rListener )
GalleryTheme* Gallery::AcquireTheme( const OUString& rThemeName, SfxListener& rListener )
{
GalleryTheme* pTheme = NULL;
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment