mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String -> OUString

Browse Source 
Change-Id: I244de2137f6a7b26f21de24ff9273c5c3672d12e
This commit is contained in:
Ivan Timofeev
2013-07-26 18:59:27 +04:00
parent 3d1360baba
commit 4a1c808b95
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sw/source/ui/inc/workctrl.hxx
View File

@@ -151,7 +151,7 @@ class SwScrollNaviPopup : public SfxPopupWindow
FixedInfo aInfoField;
ImageList aIList;
String sQuickHelp[2 * NID_COUNT];
OUString sQuickHelp[2 * NID_COUNT];
void ApplyImageList();
@@ -179,7 +179,7 @@ class SwNaviImageButton : public ImageButton
{
SwScrollNaviPopup* pPopup;
Image aImage;
String sQuickText;
OUString sQuickText;
SfxPopupWindow* pPopupWindow;
SfxPopupWindow* pFloatingWindow;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;

21
sw/source/ui/ribbar/workctrl.cxx
View File

@@ -467,13 +467,13 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const Reference< XFrame >&
for( i = 0; i < NID_COUNT; i++)
{
sal_uInt16 nNaviId = aNavigationInsertIds[i];
String sText;
OUString sText;
ToolBoxItemBits nTbxBits = 0;
if((NID_PREV != nNaviId) && (NID_NEXT != nNaviId))
{
// -2, there's no string for Next/Prev
sal_uInt16 nResStr = ST_TBL - 2 + nNaviId - NID_START;
sText = String(SW_RES(nResStr));
sText = SW_RESSTR(nResStr);
nTbxBits = TIB_CHECKABLE;
}
aToolBox.InsertItem(nNaviId, sText, nTbxBits);
@@ -487,7 +487,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const Reference< XFrame >&
// these are global strings
for( i = 0; i < 2 * NID_COUNT; i++)
{
sQuickHelp[i] = String(SW_RES(STR_IMGBTN_START + i));
sQuickHelp[i] = SW_RESSTR(STR_IMGBTN_START + i);
}
Size aImgSize = aIList.GetImageSize();
@@ -595,7 +595,7 @@ String SwScrollNaviPopup::GetQuickHelpText(sal_Bool bNext)
nResId += SwView::GetMoveType() - NID_START;
if(!bNext)
nResId += NID_COUNT;
return String(SW_RES(nResId));
return SW_RESSTR(nResId);
}
void SwNaviImageButton::Click()
@@ -660,7 +660,7 @@ SwNaviImageButton::SwNaviImageButton(
ImageButton(pParent, SW_RES(BTN_NAVI)),
pPopup(0),
aImage(SW_RES(IMG_BTN)),
sQuickText(SW_RES(ST_QUICK)),
sQuickText(SW_RESSTR(ST_QUICK)),
pPopupWindow(0),
pFloatingWindow(0),
m_xFrame( rFrame )
@@ -715,8 +715,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
{ 25, 50, 75, 100, 150, 200 };
for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
{
String sEntry = OUString::number(aZoomValues[i]);
sEntry += '%';
OUString sEntry = OUString::number(aZoomValues[i]) + "%";
InsertEntry(sEntry);
}
}
@@ -728,8 +727,8 @@ void SwZoomBox_Impl::Select()
{
if ( !IsTravelSelect() )
{
String sEntry(comphelper::string::remove(GetText(), '%'));
sal_uInt16 nZoom = (sal_uInt16)sEntry.ToInt32();
OUString sEntry(comphelper::string::remove(GetText(), '%'));
sal_uInt16 nZoom = (sal_uInt16)sEntry.toInt32();
if(nZoom < MINZOOM)
nZoom = MINZOOM;
if(nZoom > MAXZOOM)
@@ -831,8 +830,8 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/,
SwZoomBox_Impl* pBox = (SwZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() );
if(SFX_ITEM_AVAILABLE <= eState)
{
String sZoom(OUString::number(((const SfxUInt16Item*)pState)->GetValue()));
sZoom += '%';
OUString sZoom(OUString::number(((const SfxUInt16Item*)pState)->GetValue()));
sZoom += "%";
pBox->SetText(sZoom);
pBox->SaveValue();
}

12
sw/source/ui/shells/textglos.cxx
View File

@@ -63,11 +63,11 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
case FN_NEW_GLOSSARY:
if(pItem && pArgs->Count() == 3 )
{
String aGroup = (( const SfxStringItem *)pItem)->GetValue();
String aName;
OUString aGroup = (( const SfxStringItem *)pItem)->GetValue();
OUString aName;
if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem ))
aName = (( const SfxStringItem *)pItem)->GetValue();
String aShortName;
OUString aShortName;
if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_2, sal_False, &pItem ))
aShortName = (( const SfxStringItem *)pItem)->GetValue();
@@ -86,7 +86,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
case FN_SET_ACT_GLOSSARY:
if(pItem)
{
String aGroup = (( const SfxStringItem *)pItem)->GetValue();
OUString aGroup = (( const SfxStringItem *)pItem)->GetValue();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::GlossarySetActGroup fnSetActGroup = pFact->SetGlossaryActGroupFunc();
@@ -99,8 +99,8 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
if(pItem && pArgs->Count() > 1)
{
String aGroup = (( const SfxStringItem *)pItem)->GetValue();
String aName;
OUString aGroup = (( const SfxStringItem *)pItem)->GetValue();
OUString aName;
if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, sal_False, &pItem ))
aName = (( const SfxStringItem *)pItem)->GetValue();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();