diff options
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tabstpge.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 930073fad779..8f134be3192c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -714,7 +714,7 @@ void SvxBackgroundTabPage::FillUserData() */ { - SetUserData( m_pBtnPreview->IsChecked() ? rtl::OUString('1') : rtl::OUString('0') ); + SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') ); } //------------------------------------------------------------------------ diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index b7f0e7f701b4..02817b602f44 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() // ----------------------------------------------------------------------- -SvxCharBasePage::SvxCharBasePage(Window* pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( sal_False ) @@ -3370,7 +3370,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart ) if ( !bFound ) { - nEntryPos = pBox->InsertEntry( rtl::OUString(cBracket) ); + nEntryPos = pBox->InsertEntry( OUString(cBracket) ); pBox->SelectEntryPos( nEntryPos ); } } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 5fc05943e37c..6c127c4541e7 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -341,13 +341,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL ) { pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_SF ) ) ); } else { OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" ); pThis->aTbl.Insert( - nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); + nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) ); } } @@ -420,7 +420,7 @@ void _SfxMacroTabPage::FillMacroList() ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >(), GetFrame(), - ::rtl::OUString() ); + OUString() ); } void _SfxMacroTabPage::FillEvents() diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index f208845d5e46..1a35b045a30a 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -144,7 +144,7 @@ void SvxNumberPreview::Paint( const Rectangle& ) if ( mnPos != STRING_NOTFOUND ) { - long nCharWidth = GetTextWidth( rtl::OUString::valueOf( mnChar ) ); + long nCharWidth = GetTextWidth( OUString::valueOf( mnChar ) ); int nNumCharsToInsert = 0; if (nCharWidth > 0) nNumCharsToInsert = nLeadSpace / nCharWidth; @@ -518,7 +518,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) // is this a calc document Reference< XServiceInfo > xSI( pDocSh->GetModel(), UNO_QUERY ); if ( xSI.is() ) - bUseStarFormat = xSI->supportsService( rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); + bUseStarFormat = xSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ); } pNumFmtShell->SetUseStarFormat( bUseStarFormat ); @@ -1687,12 +1687,12 @@ void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler ) void SvxNumberFormatTabPage::FillCurrencyBox() { - std::vector<rtl::OUString> aList; + std::vector<OUString> aList; sal_uInt16 nSelPos=0; pNumFmtShell->GetCurrencySymbols(aList, &nSelPos); - for(std::vector<rtl::OUString>::iterator i = aList.begin() + 1;i != aList.end(); ++i) + for(std::vector<OUString>::iterator i = aList.begin() + 1;i != aList.end(); ++i) m_pLbCurrency->InsertEntry(*i); m_pLbCurrency->SelectEntryPos(nSelPos); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index dc5431959274..93ef1298b686 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -454,7 +454,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() pTypeBtn = &aDezTab; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER ) pTypeBtn = &aCenterTab; @@ -477,7 +477,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl() { pFillBtn = &aFillSpecial; aFillChar.Enable(); - aFillChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetFill() ) ); + aFillChar.SetText( OUString( (sal_Unicode)aAktTab.GetFill() ) ); } pFillBtn->Check(); } @@ -619,7 +619,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox ) eAdj = SVX_TAB_ADJUST_DECIMAL; aDezChar.Enable(); aDezCharLabel.Enable(); - aDezChar.SetText( rtl::OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); + aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) ); } aAktTab.GetAdjustment() = eAdj; diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c6716c1798e6..56939ddb7a28 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -2253,7 +2253,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p ) if( aTsbStepCount.GetState() == STATE_NOCHECK ) { if( aNumFldStepCount.GetText().isEmpty() ) - aNumFldStepCount.SetText(rtl::OUString("64")); + aNumFldStepCount.SetText(OUString("64")); aNumFldStepCount.Enable(); } |