forms/source/inc/FormComponent.hxx | 2 +- forms/source/inc/forms_module.hxx | 2 +- forms/source/inc/frm_strings.hxx | 2 +- forms/source/misc/services.cxx | 4 ++-- forms/source/richtext/richtextengine.cxx | 2 +- forms/source/richtext/richtextimplcontrol.cxx | 2 +- sax/source/fastparser/fastparser.cxx | 8 ++++---- sax/source/tools/converter.cxx | 2 +- scaddins/source/datefunc/datefunc.cxx | 8 ++++---- scaddins/source/pricing/pricing.cxx | 8 ++++---- smoketest/smoketest.cxx | 3 +-- sot/source/base/formats.cxx | 2 +- sot/source/sdstor/ucbstorage.cxx | 2 +- svl/qa/unit/test_URIHelper.cxx | 24 ++++++++++++------------ svl/source/items/style.cxx | 2 +- svl/source/misc/urihelper.cxx | 2 +- svl/source/numbers/zforlist.cxx | 24 ++++++++++++------------ toolkit/source/awt/vclxtoolkit.cxx | 6 +++--- toolkit/source/awt/vclxwindows.cxx | 4 ++-- vbahelper/inc/vbahelper/vbahelperinterface.hxx | 2 +- 20 files changed, 55 insertions(+), 56 deletions(-)
New commits: commit f32677968ad4e79338608e6f93f601b1bdfcd868 Author: Chr. Rossmanith <[email protected]> Date: Mon Apr 1 22:08:13 2013 +0200 Remove RTL_CONSTASCII_(U)STRINGPARAM in scaddins/sax Change-Id: Ic4f9bef02cc4bdc74b9a6d81e3317e10b9c79bd4 diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 5cc207d..601905b 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -631,11 +631,11 @@ OUString lclGetErrorMessage( XML_Error xmlE, const OUString& sSystemId, sal_Int3 OUStringBuffer aBuffer( sal_Unicode( '[' ) ); aBuffer.append( sSystemId ); - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " line " ) ); + aBuffer.append( " line " ); aBuffer.append( nLine ); - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "]: " ) ); - aBuffer.appendAscii( pMessage ); - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " error" ) ); + aBuffer.append( "]: " ); + aBuffer.append( pMessage ); + aBuffer.append( " error" ); return aBuffer.makeStringAndClear(); } diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx index fae1280..af36a02 100644 --- a/sax/source/tools/converter.cxx +++ b/sax/source/tools/converter.cxx @@ -650,7 +650,7 @@ void Converter::convertDuration(::rtl::OUStringBuffer& rBuffer, fValue = - fValue; } - rBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM( "PT" )); + rBuffer.append( "PT" ); fValue *= 24; double fHoursValue = ::rtl::math::approxFloor (fValue); fValue -= fHoursValue; diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 3794104..8f016d6 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -336,15 +336,15 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex OUString ScaDateAddIn::getImplementationName_Static() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME )); + return OUString( MY_IMPLNAME ); } uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet( 2 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); + pArray[0] = OUString( ADDIN_SERVICE ); + pArray[1] = OUString( MY_SERVICE ); return aRet; } @@ -353,7 +353,7 @@ uno::Sequence< OUString > ScaDateAddIn::getSupportedServiceNames_Static() OUString SAL_CALL ScaDateAddIn::getServiceName() throw( uno::RuntimeException ) { // name of specific AddIn service - return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); + return OUString( MY_SERVICE ); } // XServiceInfo diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index cc1a30c..48f37d7 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -340,15 +340,15 @@ OUString ScaPricingAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrInd OUString ScaPricingAddIn::getImplementationName_Static() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_IMPLNAME )); + return OUString( MY_IMPLNAME ); } uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static() { uno::Sequence< OUString > aRet( 2 ); OUString* pArray = aRet.getArray(); - pArray[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( ADDIN_SERVICE )); - pArray[1] = OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); + pArray[0] = OUString( ADDIN_SERVICE ); + pArray[1] = OUString( MY_SERVICE ); return aRet; } @@ -357,7 +357,7 @@ uno::Sequence< OUString > ScaPricingAddIn::getSupportedServiceNames_Static() OUString SAL_CALL ScaPricingAddIn::getServiceName() throw( uno::RuntimeException ) { // name of specific AddIn service - return OUString(RTL_CONSTASCII_USTRINGPARAM( MY_SERVICE )); + return OUString( MY_SERVICE ); } // XServiceInfo commit 563a9b7ab3cc1ed0166d1bfe0568124a2fd9b80e Author: Chr. Rossmanith <[email protected]> Date: Mon Apr 1 21:08:13 2013 +0200 Remove RTL_CONSTASCII_USTRINGPARAM in smoketest/sot/svl/toolkit/vbahelper Change-Id: I0816631a1d0c68dcef9c640c91d00ac9942ded28 diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx index 8714c0a..7327f89 100644 --- a/smoketest/smoketest.cxx +++ b/smoketest/smoketest.cxx @@ -151,9 +151,8 @@ void Test::test() { args[1].State = css::beans::PropertyState_DIRECT_VALUE; css::util::URL url; url.Complete = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?" - "language=Basic&location=document")); + "language=Basic&location=document"); css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create(connection_.getComponentContext()); diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 9c229ef..2f90452 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1312,7 +1312,7 @@ static sal_Bool CheckTransferableContext_Impl( const Reference< XTransferable >* if( pFDesc->cItems ) { rtl::OString sDesc( pFDesc->fgd[ 0 ].cFileName ); - bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM(".URL")); + bRet = 4 < sDesc.getLength() && sDesc.copy(sDesc.getLength()-4).equalsIgnoreAsciiCase(".URL"); } } } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index b03c962..6771dcc 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3166,7 +3166,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) if( nBytes == 0x04034b50 ) { rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); - if (aTmp.matchL(RTL_CONSTASCII_STRINGPARAM("ContentURL="))) + if (aTmp.match("ContentURL=")) { aString = rtl::OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8); } diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 9fd68aa..90ca5fa 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -124,7 +124,7 @@ Content::Content( { assert(m_identifier.is()); rtl::OUString uri(m_identifier->getContentIdentifier()); - if (!uri.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(m_prefix)) + if (!uri.matchIgnoreAsciiCase(m_prefix) || uri.indexOf('#', RTL_CONSTASCII_LENGTH(m_prefix)) != -1) { throw css::ucb::IllegalIdentifierException(); @@ -269,9 +269,9 @@ void Test::testNormalizedMakeRelative() { rtl::OStringBuffer buf; buf.append('<'); buf.append(tests[i].base); - buf.append(RTL_CONSTASCII_STRINGPARAM(">, <")); + buf.append(">, <"); buf.append(tests[i].absolute); - buf.append(RTL_CONSTASCII_STRINGPARAM(">: ")); + buf.append(">: "); if (ref.is()) { buf.append('<'); buf.append( @@ -279,11 +279,11 @@ void Test::testNormalizedMakeRelative() { ref->getUriReference(), RTL_TEXTENCODING_UTF8)); buf.append('>'); } else { - buf.append(RTL_CONSTASCII_STRINGPARAM("none")); + buf.append("none"); } - buf.append(RTL_CONSTASCII_STRINGPARAM(" instead of ")); + buf.append(" instead of "); if (tests[i].relative == 0) { - buf.append(RTL_CONSTASCII_STRINGPARAM("none")); + buf.append("none"); } else { buf.append('<'); buf.append(tests[i].relative); @@ -401,18 +401,18 @@ void Test::testFindFirstURLInText() { rtl::OStringBuffer buf; buf.append('"'); buf.append(tests[i].input); - buf.append(RTL_CONSTASCII_STRINGPARAM("\" -> ")); + buf.append("\" -> "); buf.append(tests[i].result == 0 ? "none" : tests[i].result); - buf.append(RTL_CONSTASCII_STRINGPARAM(" (")); + buf.append(" ("); buf.append(static_cast< sal_Int32 >(tests[i].begin)); - buf.append(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append(", "); buf.append(static_cast< sal_Int32 >(tests[i].end)); buf.append(')'); - buf.append(RTL_CONSTASCII_STRINGPARAM(" != ")); + buf.append(" != "); buf.append(rtl::OUStringToOString(result, RTL_TEXTENCODING_UTF8)); - buf.append(RTL_CONSTASCII_STRINGPARAM(" (")); + buf.append(" ("); buf.append(static_cast< sal_Int32 >(begin)); - buf.append(RTL_CONSTASCII_STRINGPARAM(", ")); + buf.append(", "); buf.append(static_cast< sal_Int32 >(end)); buf.append(')'); msg = buf.makeStringAndClear(); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 8de1508..3e06512 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -341,7 +341,7 @@ XubString SfxStyleSheetBase::GetDescription( SfxMapUnit eMetric ) eMetric, aItemPresentation, &aIntlWrapper ) ) { if ( aDesc.Len() && !aItemPresentation.isEmpty() ) - aDesc.AppendAscii(RTL_CONSTASCII_STRINGPARAM(" + ")); + aDesc.AppendAscii(" + "); if ( !aItemPresentation.isEmpty() ) aDesc += aItemPresentation; } diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 2e7e2bd..6642cd1 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -211,7 +211,7 @@ OUString normalize( OUStringBuffer head(ref->getScheme()); head.append(static_cast< sal_Unicode >(':')); if (ref->hasAuthority()) { - head.appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); + head.append("//"); head.append(ref->getAuthority()); } for (sal_Int32 i = count - 1; i > 0; --i) { diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index c573293..7fa3241 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2102,7 +2102,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex( rSeq[0].Code = OUStringBuffer(). append('0'). append(GetNumDecimalSep()). - appendAscii(RTL_CONSTASCII_STRINGPARAM("############")). + append("############"). makeStringAndClear(); } return 0; @@ -2137,7 +2137,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( nLong = nElem; break; default: - aMsg.append(RTL_CONSTASCII_STRINGPARAM("unknown type")); + aMsg.append("unknown type"); } if ( pFormatArr[nElem].Default ) { @@ -2145,25 +2145,25 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( { case i18n::KNumberFormatType::SHORT : if ( nShortDef != -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe short type default")); + aMsg.append("dupe short type default"); nShortDef = nElem; break; case i18n::KNumberFormatType::MEDIUM : if ( nMediumDef != -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe medium type default")); + aMsg.append("dupe medium type default"); nMediumDef = nElem; break; case i18n::KNumberFormatType::LONG : if ( nLongDef != -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("dupe long type default")); + aMsg.append("dupe long type default"); nLongDef = nElem; break; } } if (aMsg.getLength()) { - aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: ")); - aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement formatindex: ")); + aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: "); + aMsg.append("\nXML locale data FormatElement formatindex: "); aMsg.append(static_cast<sal_Int32>(pFormatArr[nElem].Index)); OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); @@ -2171,15 +2171,15 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault( } } if ( nShort != -1 && nShortDef == -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("no short type default ")); + aMsg.append("no short type default "); if ( nMedium != -1 && nMediumDef == -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("no medium type default ")); + aMsg.append("no medium type default "); if ( nLong != -1 && nLongDef == -1 ) - aMsg.append(RTL_CONSTASCII_STRINGPARAM("no long type default ")); + aMsg.append("no long type default "); if (aMsg.getLength()) { - aMsg.insert(0, RTL_CONSTASCII_STRINGPARAM("SvNumberFormatter::ImpAdjustFormatCodeDefault: ")); - aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nXML locale data FormatElement group of: ")); + aMsg.insert(0, "SvNumberFormatter::ImpAdjustFormatCodeDefault: "); + aMsg.append("\nXML locale data FormatElement group of: "); OUString aUMsg(OStringToOUString(aMsg.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)); LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo(aUMsg + pFormatArr[0].NameID)); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index ab08d92..9cb0853 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -582,12 +582,12 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, Window* pNewWindow = NULL; sal_uInt16 nType = ImplGetComponentType( aServiceName ); bool bFrameControl = false; - if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("frame") ) ) + if ( aServiceName == String( "frame" ) ) bFrameControl = true; - if ( aServiceName == String( RTL_CONSTASCII_USTRINGPARAM("tabcontrolnotabs") ) ) + if ( aServiceName == String( "tabcontrolnotabs" ) ) { nWinBits |= WB_NOBORDER; - nType = ImplGetComponentType( String( RTL_CONSTASCII_USTRINGPARAM("tabcontrol") ) ); + nType = ImplGetComponentType( String( "tabcontrol" ) ); } if ( !pParent ) { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 0eb97e2..bba1abe 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2677,7 +2677,7 @@ void SAL_CALL VCLXMultiPage::setTabProps( sal_Int32 ID, const uno::Sequence< bea const rtl::OUString &name = Properties[i].Name; const uno::Any &value = Properties[i].Value; - if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Title"))) + if (name == "Title") { rtl::OUString title = value.get<rtl::OUString>(); pTabControl->SetPageText( sal::static_int_cast< sal_uInt16 >( ID ), title ); @@ -2695,7 +2695,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL VCLXMultiPage::getTabProps( sal_Int3 #define ADD_PROP( seq, i, name, val ) { \ beans::NamedValue value; \ - value.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( name ) ); \ + value.Name = rtl::OUString( name ); \ value.Value = uno::makeAny( val ); \ seq[i] = value; \ } diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index ee963db..a37bb59 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -138,7 +138,7 @@ public: #define VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \ OUString classname::getServiceImplName() \ { \ - return OUString( RTL_CONSTASCII_USTRINGPARAM( #classname ) ); \ + return OUString( #classname ); \ } // ---------------------------------------------------------------------------- commit 6591068f2a73252f4e3c9abf9b153a5b4f59410b Author: Chr. Rossmanith <[email protected]> Date: Mon Apr 1 14:29:59 2013 +0200 Remove RTL_CONSTASCII_(U)STRINGPARAM in forms(frm_strings.hxx) Change-Id: Ic94187181b102b8d1623806027b857203c4b746f diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 3e10031..18ed90c 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -34,7 +34,7 @@ namespace frm extern const ConstAsciiString ident #else #define FORMS_CONSTASCII_STRING( ident, string ) \ - extern const ConstAsciiString ident = {RTL_CONSTASCII_STRINGPARAM(string)} + extern const ConstAsciiString ident = {OString(string)} #endif //.............................................................................. commit 0502d66d88e1ac65869c6fe6a9a6f2c1be6a4db6 Author: Chr. Rossmanith <[email protected]> Date: Mon Apr 1 14:29:27 2013 +0200 Remove RTL_CONSTASCII_(U)STRING in forms Change-Id: I5086a8ba9073e8ef2dfde0ecae55ee6065cb0253 diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index b0b71fa..4164533 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -93,7 +93,7 @@ namespace frm // old macro for quickly implementing XServiceInfo::getImplementationName #define IMPLEMENTATION_NAME(ImplName) \ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ - { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } + { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(#ImplName); } class OControlModel; diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index f172f71..2eaada9 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -228,7 +228,7 @@ namespace FORMS_MODULE_NAMESPACE } \ \ ::rtl::OUString SAL_CALL classname::getImplementationName_Static() \ - { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms."#classname ) ); } \ + { return ::rtl::OUString( "com.sun.star.comp.forms."#classname ); } \ \ Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \ { return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \ diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 0ba171f..2c2ce38 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -123,7 +123,7 @@ void registerClassInfo( //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ - ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ + ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \ aServices, \ frm::classImplName##_CreateInstance) @@ -265,7 +265,7 @@ void ensureClassInfos() // = XForms core #define REGISTER_XFORMS_CLASS(name) \ aServices.realloc(1); \ - aServices.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms." #name )); \ + aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \ REGISTER_CLASS_CORE(name) REGISTER_XFORMS_CLASS(Model); diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 2ea8f2c..6b045ba 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -59,7 +59,7 @@ namespace frm // defaults Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); - aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) ); + aFont.SetName( String( "Times New Roman" ) ); pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); // 12 pt font size diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index eca642f..c5b2cc4 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -468,7 +468,7 @@ namespace frm { m_pViewport->Push( PUSH_FONT ); m_pViewport->SetFont( m_pEngine->GetStandardFont(0) ); - nFontWidth = m_pViewport->GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "x" ) ) ); + nFontWidth = m_pViewport->GetTextWidth( String( "x" ) ); m_pViewport->Pop(); } // ... is the scroll size for the horizontal scrollbar _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
