[Libreoffice-commits] core.git: sd/source
Ivan Timofeev
timofeev.i.s at gmail.com
Sat Aug 10 05:33:39 PDT 2013
sd/source/ui/func/undolayer.cxx | 4 +--
sd/source/ui/func/unprlout.cxx | 6 ++---
sd/source/ui/inc/undolayer.hxx | 16 ++++++-------
sd/source/ui/inc/unmodpg.hxx | 20 +++++++++--------
sd/source/ui/inc/unprlout.hxx | 10 ++++----
sd/source/ui/view/unmodpg.cxx | 46 ++++++++++++++++++----------------------
sd/source/ui/view/viewshe2.cxx | 2 -
sd/source/ui/view/viewshe3.cxx | 14 ++++++------
sd/source/ui/view/viewshel.cxx | 3 --
9 files changed, 59 insertions(+), 62 deletions(-)
New commits:
commit e1b8dfda24c75e91d8ebced7a4022b78ee7fca25
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sat Aug 10 16:30:45 2013 +0400
String->OUString
Change-Id: Ifda8c7453ecb40abdae8d63656b8742c80691b98
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 52868cc..5954a2c 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdLayerModifyUndoAction, SdUndoAction);
SdLayerModifyUndoAction::SdLayerModifyUndoAction(
SdDrawDocument* _pDoc, SdrLayer* pLayer,
- const String& rOldLayerName, const String& rOldLayerTitle, const String& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
- const String& rNewLayerName, const String& rNewLayerTitle, const String& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
+ const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
+ const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable )
: SdUndoAction( _pDoc ),
mpLayer( pLayer ),
maOldLayerName( rOldLayerName ),
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index 35cb13b..1100fc6 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -30,8 +30,8 @@ TYPEINIT1(SdPresentationLayoutUndoAction, SdUndoAction);
SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
SdDrawDocument* pTheDoc,
- String aTheOldLayoutName,
- String aTheNewLayoutName,
+ OUString aTheOldLayoutName,
+ OUString aTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_Bool bSet,
@@ -46,7 +46,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
DBG_ASSERT(pThePage, "No Page set!");
pPage = pThePage;
- aComment = String(SdResId(STR_UNDO_SET_PRESLAYOUT));
+ aComment = SD_RESSTR(STR_UNDO_SET_PRESLAYOUT);
}
void SdPresentationLayoutUndoAction::Undo()
diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx
index b5802da..9e9f93a 100644
--- a/sd/source/ui/inc/undolayer.hxx
+++ b/sd/source/ui/inc/undolayer.hxx
@@ -33,23 +33,23 @@ class SdLayerModifyUndoAction : public SdUndoAction
public:
TYPEINFO();
SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer,
- const String& rOldLayerName, const String& rOldLayerTitle, const String& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
- const String& rNewLayerName, const String& rNewLayerTitle, const String& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
+ const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable,
+ const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable );
virtual void Undo();
virtual void Redo();
private:
SdrLayer* mpLayer;
- String maOldLayerName;
- String maOldLayerTitle;
- String maOldLayerDesc;
+ OUString maOldLayerName;
+ OUString maOldLayerTitle;
+ OUString maOldLayerDesc;
bool mbOldIsVisible;
bool mbOldIsLocked;
bool mbOldIsPrintable;
- String maNewLayerName;
- String maNewLayerTitle;
- String maNewLayerDesc;
+ OUString maNewLayerName;
+ OUString maNewLayerTitle;
+ OUString maNewLayerDesc;
bool mbNewIsVisible;
bool mbNewIsLocked;
bool mbNewIsPrintable;
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 44b942e..bd48758 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -29,8 +29,8 @@ class SdPage;
class ModifyPageUndoAction : public SdUndoAction
{
SdPage* mpPage;
- String maOldName;
- String maNewName;
+ OUString maOldName;
+ OUString maNewName;
AutoLayout meOldAutoLayout;
AutoLayout meNewAutoLayout;
sal_Bool mbOldBckgrndVisible;
@@ -38,14 +38,14 @@ class ModifyPageUndoAction : public SdUndoAction
sal_Bool mbOldBckgrndObjsVisible;
sal_Bool mbNewBckgrndObjsVisible;
- String maComment;
+ OUString maComment;
public:
TYPEINFO();
ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
SdPage* pThePage,
- String aTheNewName,
+ OUString aTheNewName,
AutoLayout eTheNewAutoLayout,
sal_Bool bTheNewBckgrndVisible,
sal_Bool bTheNewBckgrndObjsVisible);
@@ -57,12 +57,14 @@ public:
virtual OUString GetComment() const;
};
-// --------------------------------------------------------------------
class RenameLayoutTemplateUndoAction : public SdUndoAction
{
public:
- RenameLayoutTemplateUndoAction( SdDrawDocument* pDocument, const String& rOldLayoutName, const String& rNewLayoutName );
+ RenameLayoutTemplateUndoAction(
+ SdDrawDocument* pDocument,
+ const OUString& rOldLayoutName,
+ const OUString& rNewLayoutName);
virtual void Undo();
virtual void Redo();
@@ -70,9 +72,9 @@ public:
virtual OUString GetComment() const;
private:
- String maOldName;
- String maNewName;
- const String maComment;
+ OUString maOldName;
+ OUString maNewName;
+ const OUString maComment;
};
#endif // _SD_UNMODPG_HXX
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 28ff9c7..43bb74b 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -28,19 +28,19 @@ class SdPage;
class SdPresentationLayoutUndoAction : public SdUndoAction
{
- String aOldLayoutName;
- String aNewLayoutName;
+ OUString aOldLayoutName;
+ OUString aNewLayoutName;
AutoLayout eOldAutoLayout;
AutoLayout eNewAutoLayout;
sal_Bool bSetAutoLayout; // sal_True: change AutoLayout
SdPage* pPage;
- String aComment;
+ OUString aComment;
public:
TYPEINFO();
SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc,
- String aTheOldLayoutName,
- String aTheNewLayoutName,
+ OUString aTheOldLayoutName,
+ OUString aTheNewLayoutName,
AutoLayout eTheOldAutoLayout,
AutoLayout eTheNewAutoLayout,
sal_Bool bSet,
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index f47ec21..7ff176a 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -43,7 +43,7 @@ TYPEINIT1(ModifyPageUndoAction, SdUndoAction);
ModifyPageUndoAction::ModifyPageUndoAction(
SdDrawDocument* pTheDoc,
SdPage* pThePage,
- String aTheNewName,
+ OUString aTheNewName,
AutoLayout eTheNewAutoLayout,
sal_Bool bTheNewBckgrndVisible,
sal_Bool bTheNewBckgrndObjsVisible)
@@ -63,15 +63,15 @@ ModifyPageUndoAction::ModifyPageUndoAction(
{
maOldName = mpPage->GetName();
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers();
mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd);
mbOldBckgrndObjsVisible = aVisibleLayers.IsSet(aBckgrndObj);
}
- maComment = String(SdResId(STR_UNDO_MODIFY_PAGE));
+ maComment = SD_RESSTR(STR_UNDO_MODIFY_PAGE);
}
#include <svx/svdviter.hxx>
@@ -106,8 +106,8 @@ void ModifyPageUndoAction::Undo()
}
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers;
aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible);
aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible);
@@ -150,8 +150,8 @@ void ModifyPageUndoAction::Redo()
}
SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers;
aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible);
aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible);
@@ -174,34 +174,30 @@ OUString ModifyPageUndoAction::GetComment() const
return maComment;
}
-// --------------------------------------------------------------------
-RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction( SdDrawDocument* pDocument, const String& rOldLayoutName, const String& rNewLayoutName )
-: SdUndoAction(pDocument)
-, maOldName( rOldLayoutName )
-, maNewName( rNewLayoutName )
-, maComment(SdResId(STR_TITLE_RENAMESLIDE))
+RenameLayoutTemplateUndoAction::RenameLayoutTemplateUndoAction(
+ SdDrawDocument* pDocument,
+ const OUString& rOldLayoutName,
+ const OUString& rNewLayoutName)
+ : SdUndoAction(pDocument)
+ , maOldName(rOldLayoutName)
+ , maNewName(rNewLayoutName)
+ , maComment(SD_RESSTR(STR_TITLE_RENAMESLIDE))
{
- sal_uInt16 nPos = maOldName.SearchAscii( SD_LT_SEPARATOR );
- if( nPos != (sal_uInt16)-1 )
- maOldName.Erase(nPos);
+ sal_Int32 nPos = maOldName.indexOf(SD_LT_SEPARATOR);
+ if (nPos != -1)
+ maOldName = maOldName.copy(0, nPos);
}
void RenameLayoutTemplateUndoAction::Undo()
{
- String aLayoutName( maNewName );
- aLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aLayoutName.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ;
-
+ OUString aLayoutName(maNewName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
mpDoc->RenameLayoutTemplate( aLayoutName, maOldName );
}
void RenameLayoutTemplateUndoAction::Redo()
{
- String aLayoutName( maOldName );
- aLayoutName.AppendAscii( SD_LT_SEPARATOR );
- aLayoutName.Append( String(SdResId(STR_LAYOUT_OUTLINE))) ;
-
+ OUString aLayoutName(maOldName + SD_LT_SEPARATOR + SD_RESSTR(STR_LAYOUT_OUTLINE));
mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 8f7a4b7..cf055d0 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -890,7 +890,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
if (aErrCode != 0 && !bAbort)
{
- ErrorHandler::HandleError(* new StringErrorInfo(aErrCode, String() ) );
+ ErrorHandler::HandleError(* new StringErrorInfo(aErrCode, OUString() ) );
}
return aErrCode == 0;
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 54d5fca..643550c 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -143,7 +143,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
// Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
- String aTmp( SvtResId( STR_UNDO ) );
+ OUString aTmp(SVT_RESSTR(STR_UNDO));
aTmp += pUndoManager->GetUndoActionComment(0);
rSet.Put(SfxStringItem(SID_UNDO, aTmp));
}
@@ -170,7 +170,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
// Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
- String aTmp(SvtResId(STR_REDO));
+ OUString aTmp(SVT_RESSTR(STR_REDO));
aTmp += pUndoManager->GetRedoActionComment(0);
rSet.Put(SfxStringItem(SID_REDO, aTmp));
}
@@ -198,8 +198,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
sal_uInt16 nSId = rRequest.GetSlot();
SdDrawDocument* pDocument = GetDoc();
SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin();
- sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False);
- sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
+ sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False);
+ sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False);
SetOfByte aVisibleLayers;
// Determine the page from which to copy some values, such as layers,
// size, master page, to the new page. This is usually the given page.
@@ -212,8 +212,8 @@ SdPage* ViewShell::CreateOrDuplicatePage (
else
aVisibleLayers.SetAll();
- String aStandardPageName;
- String aNotesPageName;
+ OUString aStandardPageName;
+ OUString aNotesPageName;
AutoLayout eStandardLayout (AUTOLAYOUT_NONE);
AutoLayout eNotesLayout (AUTOLAYOUT_NOTES);
sal_Bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd);
@@ -310,7 +310,7 @@ SdPage* ViewShell::CreateOrDuplicatePage (
View* pDrView = GetView();
const bool bUndo = pDrView && pDrView->IsUndoEnabled();
if( bUndo )
- pDrView->BegUndo( String( SdResId(STR_INSERTPAGE) ) );
+ pDrView->BegUndo(SD_RESSTR(STR_INSERTPAGE));
sal_uInt16 nNewPageIndex = 0xffff;
switch (nSId)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index f27195f..188c97c 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -787,8 +787,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16&
if(bOutliner)
{
SfxStyleSheetBasePool* pSSPool = mpView->GetDocSh()->GetStyleSheetPool();
- String aStyleName((SdResId(STR_LAYOUT_OUTLINE)));
- aStyleName.AppendAscii( " 1" );
+ OUString aStyleName(SD_RESSTR(STR_LAYOUT_OUTLINE) + " 1");
SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( aStyleName, SD_STYLE_FAMILY_PSEUDO);
if( pFirstStyleSheet )
pFirstStyleSheet->GetItemSet().GetItemState(EE_PARA_NUMBULLET, sal_False, (const SfxPoolItem**)&pItem);
More information about the Libreoffice-commits
mailing list