sd/inc/sdundo.hxx | 6 +++---
sd/source/ui/animations/SlideTransitionPane.cxx | 2 +-
sd/source/ui/dlg/headerfooterdlg.cxx | 2 +-
sd/source/ui/func/fuoaprms.cxx | 2 +-
sd/source/ui/func/fupage.cxx | 2 +-
sd/source/ui/func/undoback.cxx | 2 +-
sd/source/ui/func/undolayer.cxx | 2 +-
sd/source/ui/view/ViewShellImplementation.cxx | 6 +++---
sd/source/ui/view/drviews3.cxx | 2 +-
sd/source/ui/view/sdview2.cxx | 2 +-
sd/source/ui/view/viewshe2.cxx | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit af079c886f9643d539a16065dc4e96d70fac422b
Author: MÃTÃ Gergely <sportem...@caesar.elte.hu>
Date: Sat Jul 27 00:53:45 2013 +0200
Converting to OUString in sd in sdundo.hxx and related files.
Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0
Reviewed-on: https://gerrit.libreoffice.org/5135
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 2035fa6..3167c41 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -33,13 +33,13 @@ public:
: mpDoc(pSdDrawDocument) {}
virtual ~SdUndoAction() {}
- void SetComment(String& rStr) { maComment = rStr; }
- virtual OUString GetComment() const { return maComment; }
+ void SetComment(OUString& rStr) { maComment = rStr; }
+ virtual OUString GetComment() const { return maComment; }
virtual SdUndoAction* Clone() const { return NULL; }
protected:
SdDrawDocument* mpDoc;
- String maComment;
+ OUString maComment;
};
#endif // _SD_SDUNDO_HXX
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx
b/sd/source/ui/animations/SlideTransitionPane.cxx
index eb638b7..0f8e7de 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -264,7 +264,7 @@ void lcl_CreateUndoForPages(
SdDrawDocument* pDoc = pDocSh->GetDoc();
if( pManager && pDocSh && pDoc )
{
- String aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
+ OUString aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
pManager->EnterListAction(aComment, aComment);
SdUndoGroup* pUndoGroup = new SdUndoGroup( pDoc );
pUndoGroup->SetComment( aComment );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6e5b5af..518dd26 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -325,7 +325,7 @@ void HeaderFooterDialog::Cancel( TabPage* )
void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
{
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
- String aComment( GetText() );
+ OUString aComment( GetText() );
pUndoGroup->SetComment( aComment );
HeaderFooterSettings aNewSettings;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 3efc8ae..ae0f6c5 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -619,7 +619,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
nSecondPlayFullSet == ATTR_SET)
{
// String for undo-group and list-action
- String aComment(SdResId(STR_UNDO_ANIMATION));
+ OUString aComment(SdResId(STR_UNDO_ANIMATION));
// with 'following curves', we have an additional UndoAction
// therefore cling? here
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ae49182..abae128 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -390,7 +390,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
}
else if( bSetToAllPages )
{
- String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+ OUString aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
pUndoMgr->EnterListAction(aComment, aComment);
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index 255ec11..8b821cb 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -36,7 +36,7 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
mrPage(rPage),
mpItemSet(new SfxItemSet(rItenSet))
{
- String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
+ OUString aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
SetComment( aString );
}
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 11bae9c..52868cc 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -47,7 +47,7 @@ SdLayerModifyUndoAction::SdLayerModifyUndoAction(
mbNewIsLocked( bNewIsLocked ),
mbNewIsPrintable( bNewIsPrintable )
{
- String aString(SdResId(STR_MODIFYLAYER));
+ OUString aString(SdResId(STR_MODIFYLAYER));
SetComment(aString);
}
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx
b/sd/source/ui/view/ViewShellImplementation.cxx
index 07048c0..1feabbc 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -195,14 +195,14 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
if( pUndoManager )
{
- String aComment( SdResId(STR_UNDO_MODIFY_PAGE) );
+ OUString aComment( SdResId(STR_UNDO_MODIFY_PAGE) );
pUndoManager->EnterListAction(aComment, aComment);
ModifyPageUndoAction* pAction = new ModifyPageUndoAction(
pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible,
bBObjsVisible);
pUndoManager->AddUndoAction(pAction);
- // Clear the selection because the selectec object may be removed
as
- // a result of the ssignment of the layout.
+ // Clear the selection because the selected object may be removed
as
+ // a result of the assignment of the layout.
mrViewShell.GetDrawView()->UnmarkAll();
if (!bHandoutMode)
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 04bd607..29364d2 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -482,7 +482,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
rReq.GetSlot() == SID_ATTR_LONG_ULSPACE )
{
pUndoGroup = new SdUndoGroup(GetDoc());
- String aString(SdResId(STR_UNDO_CHANGE_PAGEBORDER));
+ OUString aString(SdResId(STR_UNDO_CHANGE_PAGEBORDER));
pUndoGroup->SetComment(aString);
}
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index fa14fe1..7fd7d8f 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -811,7 +811,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
DropTargetHelper& rTar
pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, pInfo->mbSecondSoundOn);
pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull);
- String aString(SdResId(STR_UNDO_ANIMATION));
+ OUString aString(SdResId(STR_UNDO_ANIMATION));
pAction->SetComment(aString);
mpDocSh->GetUndoManager()->AddUndoAction(pAction);
pInfo->meClickAction = eClickAction;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index f658605..8f7a4b7 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -469,7 +469,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind,
const Size& rNewSize,
SdPage* pPage = 0;
SdUndoGroup* pUndoGroup = NULL;
pUndoGroup = new SdUndoGroup(GetDoc());
- String aString(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+ OUString aString(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
pUndoGroup->SetComment(aString);
SfxViewShell* pViewShell = GetViewShell();
OSL_ASSERT (pViewShell!=NULL);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
