diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 4 | ||||
-rw-r--r-- | sd/source/core/stlsheet.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptbase.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/copydlg.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 9edf91062a16..8820252853d4 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1075,10 +1075,10 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const switch (mePageNumType) { case css::style::NumberingType::CHARS_UPPER_LETTER: - aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'A' ); + aPageNumValue += OUStringChar( (nNum - 1) % 26 + 'A' ); break; case css::style::NumberingType::CHARS_LOWER_LETTER: - aPageNumValue += OUStringLiteral1( (nNum - 1) % 26 + 'a' ); + aPageNumValue += OUStringChar( (nNum - 1) % 26 + 'a' ); break; case css::style::NumberingType::ROMAN_UPPER: bUpper = true; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 99fdd72c6940..77f7908337bc 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -614,7 +614,7 @@ struct ApiNameMap OUString GetApiNameForHelpId(sal_uLong nId) { if ((nId >= HID_PSEUDOSHEET_OUTLINE1) && (nId <= HID_PSEUDOSHEET_OUTLINE9)) - return "outline" + OUStringLiteral1('1' + (nId - HID_PSEUDOSHEET_OUTLINE1)); + return "outline" + OUStringChar('1' + (nId - HID_PSEUDOSHEET_OUTLINE1)); for (const auto& i : pApiNameMap) if (nId == i.mnHelpId) diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 01b837c1870a..ca8dc682ea60 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -569,7 +569,7 @@ bool PPTWriterBase::GetStyleSheets() if ( nInstance == EPP_TEXTTYPE_Body ) { sal_Unicode cTemp = aStyle[aStyle.getLength() - 1]; - aStyle = aStyle.copy(0, aStyle.getLength() - 1) + OUStringLiteral1(++cTemp); + aStyle = aStyle.copy(0, aStyle.getLength() - 1) + OUStringChar(++cTemp); if ( aXFamily->hasByName( aStyle ) ) { aXFamily->getByName( aStyle ) >>= xStyle; diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index e7def2808185..5c141cb65103 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1032,7 +1032,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int1 break; case SVX_NUM_NUMBER_LOWER_ZH : { - if ( sSuffix == OUStringLiteral1(0xff0e) ) + if ( sSuffix == OUStringChar(0xff0e) ) nMappedNumType = 0x260001; // Japanese with double-byte period. else if ( !sSuffix.isEmpty() ) nMappedNumType = 0x1B0001; // Japanese/Korean with single-byte period. diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index d83576b80abf..08d6dac24aef 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -71,13 +71,13 @@ CopyDlg::~CopyDlg() { SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8)); OUString sStr = - OUString::number(m_xNumFldCopies->get_value()) + OUStringLiteral1(TOKEN) + - OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) + - OUString::number(m_xMtrFldMoveY->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) + - OUString::number(m_xMtrFldAngle->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) + - OUString::number(m_xMtrFldWidth->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) + - OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUStringLiteral1(TOKEN) + - OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUStringLiteral1(TOKEN) + + OUString::number(m_xNumFldCopies->get_value()) + OUStringChar(TOKEN) + + OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + + OUString::number(m_xMtrFldMoveY->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + + OUString::number(m_xMtrFldAngle->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + + OUString::number(m_xMtrFldWidth->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + + OUString::number(m_xMtrFldHeight->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) + + OUString::number(static_cast<sal_uInt32>(m_xLbStartColor->GetSelectEntryColor())) + OUStringChar(TOKEN) + OUString::number(static_cast<sal_uInt32>(m_xLbEndColor->GetSelectEntryColor())); aDlgOpt.SetUserItem("UserItem", css::uno::makeAny(sStr)); } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index a908348123b8..a2b3a8cefb3c 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -798,7 +798,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) OUString aTmpStr( m_xLbTreeDocument->get_selected_text() ); if( !aTmpStr.isEmpty() ) { - aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr; + aStr += OUStringChar(DOCUMENT_TOKEN) + aTmpStr; } } diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index d26132af1496..2adcd977111f 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -525,7 +525,7 @@ void SdTpOptionsMisc::SetDrawMode() OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) { - return OUString::number(nX) + OUStringLiteral1(TOKEN) + OUString::number(nY); + return OUString::number(nX) + OUStringChar(TOKEN) + OUString::number(nY); } bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 13904969f8e8..2e33d4a64f35 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1788,7 +1788,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) case KEY_7: case KEY_8: case KEY_9: - maCharBuffer += OUStringLiteral1( rKEvt.GetCharCode() ); + maCharBuffer += OUStringChar( rKEvt.GetCharCode() ); break; case KEY_PAGEUP: |