Skip to content

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

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

Change-Id: I0334a9544d25d35492764d0f5832f85604470cff
üst 6f5ffd49
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
include/svx/gallery.hxx
Dosyayı görüntüle @ ebdaa4d5
...@@ -55,35 +55,35 @@ public: ...@@ -55,35 +55,35 @@ public:
static bool FillThemeList( std::vector<String>& rThemeList ); static bool FillThemeList( std::vector<String>& rThemeList );
// FillObjList is filling rObjList with Strings of the internal Gallery Object URL // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
static sal_Bool FillObjList( const String& rThemeName, std::vector<String> &rObjList ); static sal_Bool FillObjList( const OUString& rThemeName, std::vector<String> &rObjList );
static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList ); static sal_Bool FillObjList( const sal_uInt32 nThemeId, std::vector<String> &rObjList );
static bool FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList ); static bool FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList );
// FillObjTitleList is filling the rList with the title for each gallery object // FillObjTitleList is filling the rList with the title for each gallery object
static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ); static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
static sal_Bool InsertURL( const String& rThemeName, const String& rURL ); static sal_Bool InsertURL( const OUString& rThemeName, const OUString& rURL );
static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL ); static sal_Bool InsertURL( sal_uIntPtr nThemeId, const OUString& rURL );
static sal_Bool GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos, static sal_Bool GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL, Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
sal_Bool bProgess = sal_False ); sal_Bool bProgess = sal_False );
static sal_Bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, static sal_Bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL, Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
sal_Bool bProgess = sal_False ); sal_Bool bProgess = sal_False );
static sal_uIntPtr GetSdrObjCount( const String& rThemeName ); static sal_uIntPtr GetSdrObjCount( const OUString& rThemeName );
static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId ); static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId );
static sal_Bool GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos, static sal_Bool GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, BitmapEx* pThumb = NULL ); SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos, static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, BitmapEx* pThumb = NULL ); SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
static sal_Bool BeginLocking( const String& rThemeName ); static sal_Bool BeginLocking( const OUString& rThemeName );
static sal_Bool BeginLocking( sal_uIntPtr nThemeId ); static sal_Bool BeginLocking( sal_uIntPtr nThemeId );
static sal_Bool EndLocking( const String& rThemeName ); static sal_Bool EndLocking( const OUString& rThemeName );
static sal_Bool EndLocking( sal_uIntPtr nThemeId ); static sal_Bool EndLocking( sal_uIntPtr nThemeId );
}; };
......
svx/source/gallery2/galexpl.cxx
Dosyayı görüntüle @ ebdaa4d5
...@@ -56,7 +56,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) ...@@ -56,7 +56,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList )
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, std::vector<String> &rObjList ) sal_Bool GalleryExplorer::FillObjList( const OUString& rThemeName, std::vector<String> &rObjList )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
...@@ -135,7 +135,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect ...@@ -135,7 +135,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL ) sal_Bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString& rURL )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
...@@ -159,7 +159,7 @@ sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rUR ...@@ -159,7 +159,7 @@ sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rUR
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL ) sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const OUString& rURL )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL ) : sal_False ); return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL ) : sal_False );
...@@ -167,7 +167,7 @@ sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL ) ...@@ -167,7 +167,7 @@ sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL )
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos, sal_Bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic, BitmapEx* pThumb, Graphic* pGraphic, BitmapEx* pThumb,
sal_Bool bProgress ) sal_Bool bProgress )
{ {
...@@ -206,7 +206,7 @@ sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, ...@@ -206,7 +206,7 @@ sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName ) sal_uIntPtr GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
sal_uIntPtr nRet = 0; sal_uIntPtr nRet = 0;
...@@ -239,7 +239,7 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId ) ...@@ -239,7 +239,7 @@ sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId )
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos, sal_Bool GalleryExplorer::GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, BitmapEx* pThumb ) SdrModel* pModel, BitmapEx* pThumb )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
...@@ -285,7 +285,7 @@ sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModel ...@@ -285,7 +285,7 @@ sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModel
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName ) sal_Bool GalleryExplorer::BeginLocking( const OUString& rThemeName )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
...@@ -314,7 +314,7 @@ sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId ) ...@@ -314,7 +314,7 @@ sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
sal_Bool GalleryExplorer::EndLocking( const String& rThemeName ) sal_Bool GalleryExplorer::EndLocking( const OUString& rThemeName )
{ {
Gallery* pGal = ::Gallery::GetGalleryInstance(); Gallery* pGal = ::Gallery::GetGalleryInstance();
sal_Bool bRet = sal_False; sal_Bool bRet = sal_False;
......
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