Skip to content

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

convert svx/source/sidebar/*.cxx from String to OUString 

Change-Id: I57bd0ade23a17cd2c8edfd2549ae131d80ab7592
üst a4da41c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 65 deletions
include/svx/sidebar/ColorControl.hxx
Dosyayı görüntüle @ 71622632
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
const ResId& rControlResId, const ResId& rControlResId,
const ResId& rValueSetResId, const ResId& rValueSetResId,
const ::boost::function<Color(void)>& rNoColorGetter, const ::boost::function<Color(void)>& rNoColorGetter,
const ::boost::function<void(String&,Color)>& rColorSetter, const ::boost::function<void(OUString&,Color)>& rColorSetter,
FloatingWindow* pFloatingWindow, FloatingWindow* pFloatingWindow,
const ResId* pNoColorStringResId); const ResId* pNoColorStringResId);
virtual ~ColorControl (void); virtual ~ColorControl (void);
...@@ -73,7 +73,7 @@ private: ...@@ -73,7 +73,7 @@ private:
FloatingWindow* mpFloatingWindow; FloatingWindow* mpFloatingWindow;
const OUString msNoColorString; const OUString msNoColorString;
::boost::function<Color(void)> maNoColorGetter; ::boost::function<Color(void)> maNoColorGetter;
::boost::function<void(String&,Color)> maColorSetter; ::boost::function<void(OUString&,Color)> maColorSetter;
void FillColors (void); void FillColors (void);
DECL_LINK(VSSelectHdl, void *); DECL_LINK(VSSelectHdl, void *);
......
svx/source/sidebar/area/AreaPropertyPanel.cxx
Dosyayı görüntüle @ 71622632
...@@ -236,7 +236,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox ) ...@@ -236,7 +236,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
{ {
mpLbFillAttr->Hide(); mpLbFillAttr->Hide();
mpToolBoxColor->Show(); mpToolBoxColor->Show();
const String aTmpStr; const OUString aTmpStr;
const Color aColor = maLastColor; const Color aColor = maLastColor;
const XFillColorItem aXFillColorItem( aTmpStr, aColor ); const XFillColorItem aXFillColorItem( aTmpStr, aColor );
...@@ -998,7 +998,7 @@ void AreaPropertyPanel::NotifyItemUpdate( ...@@ -998,7 +998,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpFillGradientItem) if(mpFillGradientItem)
{ {
const String aString( mpFillGradientItem->GetName() ); const OUString aString( mpFillGradientItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxGradientListItem aItem( *(const SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST))); const SvxGradientListItem aItem( *(const SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
...@@ -1023,7 +1023,7 @@ void AreaPropertyPanel::NotifyItemUpdate( ...@@ -1023,7 +1023,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpHatchItem) if(mpHatchItem)
{ {
const String aString( mpHatchItem->GetName() ); const OUString aString( mpHatchItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxHatchListItem aItem(*(const SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST))); const SvxHatchListItem aItem(*(const SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
...@@ -1048,7 +1048,7 @@ void AreaPropertyPanel::NotifyItemUpdate( ...@@ -1048,7 +1048,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpBitmapItem) if(mpBitmapItem)
{ {
const String aString( mpBitmapItem->GetName() ); const OUString aString( mpBitmapItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxBitmapListItem aItem(*(const SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST))); const SvxBitmapListItem aItem(*(const SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
...@@ -1120,7 +1120,7 @@ void AreaPropertyPanel::Update() ...@@ -1120,7 +1120,7 @@ void AreaPropertyPanel::Update()
if(mpFillGradientItem) if(mpFillGradientItem)
{ {
const String aString(mpFillGradientItem->GetName()); const OUString aString(mpFillGradientItem->GetName());
mpLbFillAttr->SelectEntry(aString); mpLbFillAttr->SelectEntry(aString);
} }
...@@ -1149,7 +1149,7 @@ void AreaPropertyPanel::Update() ...@@ -1149,7 +1149,7 @@ void AreaPropertyPanel::Update()
if(mpHatchItem) if(mpHatchItem)
{ {
const String aString(mpHatchItem->GetName()); const OUString aString(mpHatchItem->GetName());
mpLbFillAttr->SelectEntry( aString ); mpLbFillAttr->SelectEntry( aString );
} }
...@@ -1178,7 +1178,7 @@ void AreaPropertyPanel::Update() ...@@ -1178,7 +1178,7 @@ void AreaPropertyPanel::Update()
if(mpBitmapItem) if(mpBitmapItem)
{ {
const String aString(mpBitmapItem->GetName()); const OUString aString(mpBitmapItem->GetName());
mpLbFillAttr->SelectEntry(aString); mpLbFillAttr->SelectEntry(aString);
} }
......
svx/source/sidebar/line/LineWidthControl.cxx
Dosyayı görüntüle @ 71622632
...@@ -214,14 +214,14 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e ...@@ -214,14 +214,14 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
mnCustomWidth = aWinData.ToInt32(); mnCustomWidth = aWinData.toInt32();
mbCustom = true; mbCustom = true;
maVSWidth.SetImage(maIMGCus); maVSWidth.SetImage(maIMGCus);
maVSWidth.SetCusEnable(true); maVSWidth.SetCusEnable(true);
String aStrTip( OUString::number( (double)mnCustomWidth / 10)); OUString aStrTip( OUString::number( (double)mnCustomWidth / 10));
aStrTip.Append(mstrPT); // aStrTip += mstrPT;
maVSWidth.SetItemText(9, aStrTip); maVSWidth.SetItemText(9, aStrTip);
} }
else else
...@@ -243,7 +243,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e ...@@ -243,7 +243,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
} }
else else
{ {
maMFWidth.SetText( String() ); maMFWidth.SetText( "" );
} }
MapUnit eOrgUnit = (MapUnit)eMapUnit; MapUnit eOrgUnit = (MapUnit)eMapUnit;
......
svx/source/sidebar/nbdtmg.cxx
Dosyayı görüntüle @ 71622632
This diff is collapsed.
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
Dosyayı görüntüle @ 71622632
...@@ -187,8 +187,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -187,8 +187,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
maPos = (sal_uInt16)aWinData.ToInt32(); maPos = (sal_uInt16)aWinData.toInt32();
} }
SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE ); SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE );
...@@ -199,10 +199,10 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -199,10 +199,10 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
maValue = (sal_uInt16)aWinData.ToInt32(); maValue = (sal_uInt16)aWinData.toInt32();
} }
String sHelpText; OUString sHelpText;
switch(maPos) switch(maPos)
{ {
case LLINESPACE_1: case LLINESPACE_1:
...@@ -216,27 +216,27 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -216,27 +216,27 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
break; break;
case LLINESPACE_PROP: case LLINESPACE_PROP:
sHelpText +=maLine; sHelpText +=maLine;
sHelpText.Append(String("Proportion: ", 12, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Proportion: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_MIN: case LLINESPACE_MIN:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("At Least: ", 10, RTL_TEXTENCODING_ASCII_US)); sHelpText += "At Least: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_DURCH: case LLINESPACE_DURCH:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("Leading: ", 9, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Leading: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_FIX: case LLINESPACE_FIX:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("Fixed: ", 7, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Fixed: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
} }
if( !aWinOpt.Exists() && !aWinOpt2.Exists() ) if( !aWinOpt.Exists() && !aWinOpt2.Exists() )
...@@ -259,7 +259,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -259,7 +259,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
// mpLineSPPage->SetAllNoSel(); // mpLineSPPage->SetAllNoSel();
aLineDist.Enable(); aLineDist.Enable();
pActLineDistFld->Enable(); pActLineDistFld->Enable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
//bool bValueSetFocus = sal_False; //wj //bool bValueSetFocus = sal_False; //wj
if( eState >= SFX_ITEM_AVAILABLE ) if( eState >= SFX_ITEM_AVAILABLE )
...@@ -280,7 +280,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -280,7 +280,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_1 ); aLineDist.SelectEntryPos( LLINESPACE_1 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
if ( LINESPACE_1 == currSPItem->GetPropLineSpace() ) if ( LINESPACE_1 == currSPItem->GetPropLineSpace() )
{ {
...@@ -296,7 +296,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -296,7 +296,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_1 ); aLineDist.SelectEntryPos( LLINESPACE_1 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(1); maLineSpacing.SelectItem(1);
//bValueSetFocus = sal_True; //wj //bValueSetFocus = sal_True; //wj
...@@ -306,7 +306,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -306,7 +306,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_15 ); aLineDist.SelectEntryPos( LLINESPACE_15 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(3); maLineSpacing.SelectItem(3);
...@@ -317,7 +317,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -317,7 +317,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_2 ); aLineDist.SelectEntryPos( LLINESPACE_2 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(4); maLineSpacing.SelectItem(4);
...@@ -452,7 +452,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -452,7 +452,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.Disable(); aLineDist.Disable();
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
maLineSpacing.SetNoSelection(); maLineSpacing.SetNoSelection();
maLineSpacing.SelectItem(0); maLineSpacing.SelectItem(0);
...@@ -461,7 +461,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe ...@@ -461,7 +461,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
else else
{ {
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
aLineDist.SetNoSelection(); aLineDist.SetNoSelection();
maLineSpacing.SetNoSelection(); maLineSpacing.SetNoSelection();
maLineSpacing.SelectItem(0); maLineSpacing.SelectItem(0);
...@@ -523,7 +523,7 @@ IMPL_LINK( ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, pBox ) ...@@ -523,7 +523,7 @@ IMPL_LINK( ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, pBox )
case LLINESPACE_15: case LLINESPACE_15:
case LLINESPACE_2: case LLINESPACE_2:
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
break; break;
case LLINESPACE_DURCH: case LLINESPACE_DURCH:
......
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
Dosyayı görüntüle @ 71622632
...@@ -616,7 +616,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -616,7 +616,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrWidth->SetText( String()); mpMtrWidth->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_HEIGHT: case SID_ATTR_TRANSFORM_HEIGHT:
...@@ -636,7 +636,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -636,7 +636,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrHeight->SetText( String()); mpMtrHeight->SetText( "");
break; break;
case SID_ATTR_TRANSFORM_POS_X: case SID_ATTR_TRANSFORM_POS_X:
...@@ -654,7 +654,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -654,7 +654,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrPosX->SetText( String()); mpMtrPosX->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_POS_Y: case SID_ATTR_TRANSFORM_POS_Y:
...@@ -672,7 +672,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -672,7 +672,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrPosY->SetText( String()); mpMtrPosY->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_ROT_X: case SID_ATTR_TRANSFORM_ROT_X:
...@@ -801,7 +801,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -801,7 +801,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrAngle->SetText( String() ); mpMtrAngle->SetText( "" );
mpDial->SetRotation( 0 ); mpDial->SetRotation( 0 );
break; break;
...@@ -883,12 +883,12 @@ void PosSizePropertyPanel::NotifyItemUpdate( ...@@ -883,12 +883,12 @@ void PosSizePropertyPanel::NotifyItemUpdate(
// mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( RID_SVXPAGE_POSITION_SIZE ) ); SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( RID_SVXPAGE_POSITION_SIZE ) );
String sUserData; OUString sUserData;
::com::sun::star::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); ::com::sun::star::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
::rtl::OUString aTemp; ::rtl::OUString aTemp;
if ( aUserItem >>= aTemp ) if ( aUserItem >>= aTemp )
sUserData = String( aTemp ); sUserData = aTemp;
mpCbxScale->Check( (bool)sUserData.ToInt32() ); mpCbxScale->Check( (bool)sUserData.toInt32() );
} }
......
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
Dosyayı görüntüle @ 71622632
...@@ -150,8 +150,8 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l ...@@ -150,8 +150,8 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
mnCustomKern = aWinData.ToInt32(); mnCustomKern = aWinData.toInt32();
mnLastCus = SPACING_CLOSE_BY_CUS_EDIT; mnLastCus = SPACING_CLOSE_BY_CUS_EDIT;
mbCusEnable = true; mbCusEnable = true;
} }
...@@ -171,21 +171,21 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l ...@@ -171,21 +171,21 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
maVSSpacing.ReplaceItemImages(6, maImgCus,0); maVSSpacing.ReplaceItemImages(6, maImgCus,0);
if(mnCustomKern > 0) if(mnCustomKern > 0)
{ {
String aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add
aStrTip.Append( OUString::number( (double)mnCustomKern / 10)); aStrTip += OUString::number( (double)mnCustomKern / 10);
aStrTip.Append(maStrUnit); // modify aStrTip += maStrUnit; // modify
maVSSpacing.SetItemText(6,aStrTip); maVSSpacing.SetItemText(6,aStrTip);
} }
else if(mnCustomKern < 0) else if(mnCustomKern < 0)
{ {
String aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add OUString aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add
aStrTip.Append( OUString::number( (double)-mnCustomKern / 10)); aStrTip += OUString::number( (double)-mnCustomKern / 10);
aStrTip.Append(maStrUnit); // modify aStrTip += maStrUnit; // modify
maVSSpacing.SetItemText( 6, aStrTip ); maVSSpacing.SetItemText( 6, aStrTip );
} }
else else
{ {
String aStrTip(maStrCusN) ; //LAST CUSTOM no tip defect //add OUString aStrTip(maStrCusN) ; //LAST CUSTOM no tip defect //add
maVSSpacing.SetItemText( 6, aStrTip ); maVSSpacing.SetItemText( 6, aStrTip );
} }
......
svx/source/sidebar/text/TextPropertyPanel.cxx
Dosyayı görüntüle @ 71622632
...@@ -769,7 +769,7 @@ void TextPropertyPanel::NotifyItemUpdate ( ...@@ -769,7 +769,7 @@ void TextPropertyPanel::NotifyItemUpdate (
} }
else else
{ {
mpFontNameBox->SetText( String() ); mpFontNameBox->SetText( "" );
if (SFX_ITEM_DISABLED == eState) if (SFX_ITEM_DISABLED == eState)
bIsControlEnabled = false; bIsControlEnabled = false;
} }
...@@ -825,7 +825,7 @@ void TextPropertyPanel::NotifyItemUpdate ( ...@@ -825,7 +825,7 @@ void TextPropertyPanel::NotifyItemUpdate (
else else
{ {
mpHeightItem = NULL; mpHeightItem = NULL;
mpFontSizeBox->SetText( String() ); mpFontSizeBox->SetText( "" );
//increase decrease diabled when multi-seletion have different font size //increase decrease diabled when multi-seletion have different font size
// font size +/- enhancement in sd // font size +/- enhancement in sd
......
svx/source/sidebar/tools/ColorControl.cxx
Dosyayı görüntüle @ 71622632
...@@ -89,7 +89,7 @@ ColorControl::ColorControl ( ...@@ -89,7 +89,7 @@ ColorControl::ColorControl (
const ResId& rControlResId, const ResId& rControlResId,
const ResId& rValueSetResId, const ResId& rValueSetResId,
const ::boost::function<Color(void)>& rNoColorGetter, const ::boost::function<Color(void)>& rNoColorGetter,
const ::boost::function<void(String&,Color)>& rColorSetter, const ::boost::function<void(OUString&,Color)>& rColorSetter,
FloatingWindow* pFloatingWindow, FloatingWindow* pFloatingWindow,
const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId) const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId)
: PopupControl(pParent, rControlResId), : PopupControl(pParent, rControlResId),
...@@ -200,10 +200,10 @@ IMPL_LINK(ColorControl, VSSelectHdl, void *, pControl) ...@@ -200,10 +200,10 @@ IMPL_LINK(ColorControl, VSSelectHdl, void *, pControl)
{ {
sal_uInt16 iPos = maVSColor.GetSelectItemId(); sal_uInt16 iPos = maVSColor.GetSelectItemId();
Color aColor = maVSColor.GetItemColor( iPos ); Color aColor = maVSColor.GetItemColor( iPos );
String aTmpStr = maVSColor.GetItemText( iPos ); OUString aTmpStr = maVSColor.GetItemText( iPos );
// react when the WB_NONEFIELD created entry is selected // react when the WB_NONEFIELD created entry is selected
if (aColor.GetColor() == 0 && aTmpStr.Len() == 0) if (aColor.GetColor() == 0 && aTmpStr.isEmpty())
{ {
if (maNoColorGetter) if (maNoColorGetter)
aColor = maNoColorGetter(); aColor = maNoColorGetter();
......
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
Dosyayı görüntüle @ 71622632
...@@ -346,7 +346,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -346,7 +346,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
Point aStart(aBLPos.X() + nRectWidth / 9,0); Point aStart(aBLPos.X() + nRectWidth / 9,0);
if ( nItemId == DEFAULT_NONE) if ( nItemId == DEFAULT_NONE)
{ {
String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE)); OUString sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
Font aLclFont = pDev->GetFont(); Font aLclFont = pDev->GetFont();
Size aLclSize = aLclFont.GetSize(); Size aLclSize = aLclFont.GetSize();
aLclSize.Height() = nRectHeight/4; aLclSize.Height() = nRectHeight/4;
...@@ -374,14 +374,12 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -374,14 +374,12 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
{ {
sal_uInt32 nY = 11 + i * 33; sal_uInt32 nY = 11 + i * 33;
aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100; aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100;
String sText; OUString sText;
sal_uInt16 nLvl = 0; sal_uInt16 nLvl = 0;
SvxNumRule aTempRule( 0, 10, false ); SvxNumRule aTempRule( 0, 10, false );
pNumbering->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl); pNumbering->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl);
SvxNumberFormat aNumFmt(aTempRule.GetLevel(nLvl)); SvxNumberFormat aNumFmt(aTempRule.GetLevel(nLvl));
sText=aNumFmt.GetNumStr(i+1); sText = aNumFmt.GetPrefix() + aNumFmt.GetNumStr(i+1) + aNumFmt.GetSuffix();
sText.Insert( aNumFmt.GetPrefix(), 0 );
sText += aNumFmt.GetSuffix();
aStart.X() = aBLPos.X() + 2; aStart.X() = aBLPos.X() + 2;
aStart.Y() -= pDev->GetTextHeight()/2; aStart.Y() -= pDev->GetTextHeight()/2;
pDev->DrawText(aStart, sText); pDev->DrawText(aStart, sText);
...@@ -444,8 +442,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -444,8 +442,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetFont(aFont); pDev->SetFont(aFont);
pDev->SetFillColor( aBackColor ); //wj pDev->SetFillColor( aBackColor ); //wj
String sText; OUString sText(cChar);
sText = cChar;
Font aOldBulletFont = pDev->GetFont(); Font aOldBulletFont = pDev->GetFont();
Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont); Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont);
Size aBulSize = aOldBulletFont.GetSize(); Size aBulSize = aOldBulletFont.GetSize();
...@@ -488,7 +485,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -488,7 +485,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetFont(aFont); pDev->SetFont(aFont);
pDev->SetFillColor( aBackColor ); pDev->SetFillColor( aBackColor );
String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE)); OUString sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
long nTextWidth = pDev->GetTextWidth(sText); long nTextWidth = pDev->GetTextWidth(sText);
long nTextHeight = pDev->GetTextHeight(); long nTextHeight = pDev->GetTextHeight();
......
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