Skip to content

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

convert sd/.../SlsSlotManager.hxx from String to OUString 

Change-Id: I5d526ebb84606ee32feaedd9998bbf8155acd441
üst 5cbfbad7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
Dosyayı görüntüle @ 7100252d
...@@ -990,7 +990,7 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog) ...@@ -990,7 +990,7 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog)
&& mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) )); && mrSlideSorter.GetViewShell()->GetDocSh()->IsNewPageNameValid( aNewName ) ));
} }
bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String & rName ) bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString & rName )
{ {
sal_Bool bOutDummy; sal_Bool bOutDummy;
SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
...@@ -1049,7 +1049,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String ...@@ -1049,7 +1049,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String
} }
} }
bool bSuccess = pPageToRename!=NULL && ( sal_False != rName.Equals( pPageToRename->GetName())); bool bSuccess = pPageToRename!=NULL && ( rName == pPageToRename->GetName() );
if( bSuccess ) if( bSuccess )
{ {
......
sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
Dosyayı görüntüle @ 7100252d
...@@ -92,7 +92,7 @@ private: ...@@ -92,7 +92,7 @@ private:
*/ */
void RenameSlide (void); void RenameSlide (void);
DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*);
bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String& rName); bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName);
/** Handle SID_INSERTPAGE slot calls. /** Handle SID_INSERTPAGE slot calls.
*/ */
......
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