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

fixes for where fast string operator+ is not perfectly source compatible

Browse Source 
Change-Id: I80af0399037e4f68113338139e7f2ad2400e65ab
This commit is contained in:
Luboš Luňák 2012-12-02 22:35:57 +01:00
parent 249f09885b
commit ce90f99a2d
25 changed files with 76 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/main/ChartController.cxx
View File

@ -249,7 +249,7 @@ void ChartController::TheModel::tryTermination()
catch(const uno::Exception& ex)
{
(void)(ex); // no warning in non-debug builds
OSL_FAIL( ( OString("Termination of model failed: ")
OSL_FAIL( OString( OString("Termination of model failed: ")
+ OUStringToOString( ex.Message, RTL_TEXTENCODING_ASCII_US ) ).getStr() );
}
}

2
cppuhelper/source/bootstrap.cxx
View File

@ -180,7 +180,7 @@ Reference< XComponentContext > SAL_CALL bootstrap()
// start office process
oslProcess hProcess = 0;
oslProcessError rc = osl_executeProcess(
(path + OUSTR("soffice")).pData, ar_args, ARLEN( ar_args ),
OUString(path + "soffice").pData, ar_args, ARLEN( ar_args ),
osl_Process_DETACHED,
sec.getHandle(),
0, // => current working dir

4
cui/source/dialogs/scriptdlg.cxx
View File

@ -914,7 +914,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
}
for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
{
if ( (aNewName+extn).equals( childNodes[index]->getName() ) )
if ( (aNewName+extn) == childNodes[index]->getName() )
{
bFound = sal_True;
break;
@ -943,7 +943,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
bValid = sal_True;
for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
{
if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) )
if ( (aUserSuppliedName+extn) == childNodes[index]->getName() )
{
bValid = sal_False;
String aError( m_createErrStr );

2
extensions/source/update/check/updatecheckconfig.cxx
View File

@ -176,7 +176,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
for(sal_Int32 n=1; n < 6; ++n )
{
rtl::OUString aUStr = getStringValue(
(aStr + rtl::OString::valueOf(n)).getStr());
OString(aStr + rtl::OString::valueOf(n)).getStr());
if( !aUStr.isEmpty() )
rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr));
}

20
extensions/source/update/check/updatehdl.cxx
View File

@ -152,7 +152,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
aLabel += UNISTRING( "..." );
setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("Label"), uno::Any( aLabel ) );
setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) );
setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) );
mbDownloadBtnHasDots = bAppendDots;
}
@ -1116,7 +1116,7 @@ void UpdateHandler::createDialog()
xPropSet->setPropertyValue( UNISTRING("PositionY"), uno::Any(sal_Int32( 100 )) );
xPropSet->setPropertyValue( UNISTRING("Width"), uno::Any(sal_Int32( DIALOG_WIDTH )) );
xPropSet->setPropertyValue( UNISTRING("Height"), uno::Any(sal_Int32( DIALOG_HEIGHT )) );
xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) );
xPropSet->setPropertyValue( UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) );
}
{ // Label (fixed text) <status>
uno::Sequence< beans::NamedValue > aProps(1);
@ -1143,7 +1143,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) );
setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) );
setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) );
setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) );
setProperty( aProps, 6, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) );
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@ -1174,7 +1174,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msPauseBtn ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_PAUSE ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON],
awt::Rectangle( BOX1_BTN_X, BOX1_BTN_Y, BUTTON_WIDTH, BUTTON_HEIGHT ),
@ -1187,7 +1187,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msResumeBtn ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@ -1203,7 +1203,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msCancelBtn ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON],
awt::Rectangle( BOX1_BTN_X,
@ -1237,7 +1237,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 3, UNISTRING("MultiLine"), uno::Any( true ) );
setProperty( aProps, 4, UNISTRING("ReadOnly"), uno::Any( true ) );
setProperty( aProps, 5, UNISTRING("AutoVScroll"), uno::Any( true ) );
setProperty( aProps, 6, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) );
setProperty( aProps, 6, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) );
insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION,
awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET,
@ -1267,7 +1267,7 @@ void UpdateHandler::createDialog()
// setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
// [property] string Label // only if PushButtonType_STANDARD
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msClose ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CLOSE ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ],
awt::Rectangle( CLOSE_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@ -1280,7 +1280,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msInstall ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_INSTALL ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON],
awt::Rectangle( INSTALL_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),
@ -1293,7 +1293,7 @@ void UpdateHandler::createDialog()
setProperty( aProps, 1, UNISTRING("Enabled"), uno::Any( true ) );
setProperty( aProps, 2, UNISTRING("PushButtonType"), uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) );
setProperty( aProps, 3, UNISTRING("Label"), uno::Any( msDownload ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::Any( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) );
setProperty( aProps, 4, UNISTRING("HelpURL"), uno::makeAny( UNISTRING( INET_HID_SCHEME ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD ) ) );
insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON],
awt::Rectangle( DOWNLOAD_BTN_X, BUTTON_Y_POS, BUTTON_WIDTH, BUTTON_HEIGHT ),

4
i18npool/source/collator/collator_unicode.cxx
View File

@ -131,9 +131,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
OUString func_base = aBuf.makeStringAndClear();
if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
(func_base + OUString("TW_") + rAlgorithm).pData);
OUString(func_base + "TW_" + rAlgorithm).pData);
if (!func)
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, OUString(func_base + rAlgorithm).pData);
} else {
if ( rLocale.Language == "ja" ) {
// replace algrithm name to implementation name.

4
i18npool/source/indexentry/indexentrysupplier_asian.cxx
View File

@ -88,9 +88,9 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
if (hModule) {
OUString get("get_indexdata_");
if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 )
func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString("_TW_")+rAlgorithm).pData);
func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString(get+rLocale.Language+"_TW_"+rAlgorithm).pData);
if (!func)
func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, (get+rLocale.Language+OUString('_')+rAlgorithm).pData);
func=(sal_uInt16** (*)(sal_Int16*))osl_getFunctionSymbol(hModule, OUString(get+rLocale.Language+OUString('_')+rAlgorithm).pData);
}
#else
if ( rLocale.Language == "zh" && OUString( "TW HK MO" ).indexOf(rLocale.Country) >= 0 ) {

6
l10ntools/source/po.cxx
View File

@ -420,7 +420,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
OString sMsgCtxt =
vParts[GROUPID] + "\n" +
(vParts[LOCALID].isEmpty() ? "" : vParts[LOCALID] + "\n") +
(vParts[LOCALID].isEmpty() ? OString( "" ) : vParts[LOCALID] + "\n") +
vParts[RESOURCETYPE];
switch(eType){
case TTEXT:
@ -433,7 +433,7 @@ PoEntry::PoEntry(const OString& rSDFLine, const TYPE eType)
only three element*/
}
m_pGenPo->setExtractCom(
( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : "" ) +
( !vParts[HELPTEXT].isEmpty() ? vParts[HELPTEXT] + "\n" : OString( "" )) +
lcl_GenKeyId(
vParts[SOURCEFILE] + sMsgCtxt + vParts[eType] ) );
m_pGenPo->setMsgCtxt(sMsgCtxt);
@ -827,7 +827,7 @@ void PoIfstream::readEntry( PoEntry& rPoEntry )
sExtractCom.indexOf("\n") == -1 ) )
{
aGenPo.setExtractCom(
( !sExtractCom.isEmpty() ? sExtractCom + "\n" : "" ) +
( !sExtractCom.isEmpty() ? sExtractCom + "\n" : OString( "" )) +
lcl_GenKeyId(
aGenPo.getReference() + sMsgCtxt +
aGenPo.getMsgId() ) );

2
l10ntools/source/propmerge.cxx
View File

@ -210,7 +210,7 @@ void PropParser::Merge( const OString &rMergeSrc, const OString &rDestinationFil
{
OString sNewText;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, m_sLang );
aDestination << (sID + OString("=")).getStr();
aDestination << OString(sID + "=").getStr();
lcl_PrintJavaStyle( sNewText, aDestination );
aDestination << std::endl;
}

4
oox/source/export/drawingml.cxx
View File

@ -1349,8 +1349,8 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, sal_Bo
for( sal_Int32 i=0; i < nLength; i++ )
if( EscherPropertyContainer::GetAdjustmentValue( aAdjustmentSeq[ i ], i, nAdjustmentsWhichNeedsToBeConverted, nValue ) )
mpFS->singleElementNS( XML_a, XML_gd,
XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? ( OString( "adj" ) + OString::valueOf( i + 1 ) ).getStr() : "adj"),
XML_fmla, (OString("val ") + OString::valueOf( nValue )).getStr(),
XML_name, aAdjustmentSeq[ i ].Name.getLength() > 0 ? USS(aAdjustmentSeq[ i ].Name) : (nLength > 1 ? OString( "adj" + OString::valueOf( i + 1 ) ).getStr() : "adj"),
XML_fmla, OString("val " + OString::valueOf( nValue )).getStr(),
FSEND );
}

4
oox/source/export/shapes.cxx
View File

@ -112,7 +112,7 @@ using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using ::sax_fastparser::FSHelperPtr;
#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
struct CustomShapeTypeTranslationTable
{
@ -859,7 +859,7 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, Graph
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
XML_id, I32S( GetNewShapeID( xShape ) ),
XML_name, bHaveName ? USS( sName ) : (OString("Picture ") + OString::valueOf( mnPictureIdMax++ )).getStr(),
XML_name, bHaveName ? USS( sName ) : OString( "Picture " + OString::valueOf( mnPictureIdMax++ )).getStr(),
XML_descr, bHaveDesc ? USS( sDescr ) : NULL,
FSEND );
// OOXTODO: //cNvPr children: XML_extLst, XML_hlinkClick, XML_hlinkHover

2
oox/source/ppt/presentationfragmenthandler.cxx
View File

@ -286,7 +286,7 @@ void PresentationFragmentHandler::finalizeImport()
}
catch( uno::Exception& )
{
OSL_FAIL( (rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), "
OSL_FAIL( OString(rtl::OString("oox::ppt::PresentationFragmentHandler::EndDocument(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

2
oox/source/ppt/slidefragmenthandler.cxx
View File

@ -214,7 +214,7 @@ void SlideFragmentHandler::finalizeImport()
}
catch( uno::Exception& )
{
OSL_FAIL( (rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), "
OSL_FAIL( OString(rtl::OString("oox::ppt::SlideFragmentHandler::EndElement(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

1
sal/inc/sal/log-areas.dox
View File

@ -64,6 +64,7 @@ certain functionality.
@li @c sd.sls
@li @c sd.tools
@li @c sd.view
@li @c sd.slideshow
@li @c sdremote
@li @c sdremote.bluetooth

8
sc/source/ui/vba/vbaname.cxx
View File

@ -120,7 +120,7 @@ ScVbaName::getValue() throw (css::uno::RuntimeException)
if ( sTmpValue.toChar() == '$' )
{
::rtl::OUString sTmp = sTmpValue.copy( 1 );
sTmp = sTmp.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
sTmp = sTmp.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
sResult += sTmp;
sResult += sNewSegmentation;
}
@ -131,7 +131,7 @@ ScVbaName::getValue() throw (css::uno::RuntimeException)
if ( sTmpValue.toChar() == '$' )
{
::rtl::OUString sTmp = sTmpValue.copy(1);
sTmp = sTmp.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
sTmp = sTmp.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
sResult += sTmp;
}
if (sResult.indexOf('=') != 0)
@ -160,7 +160,7 @@ ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeEx
while ( nTo != -1 )
{
::rtl::OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
sTmpValue = sTmpValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
{
sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;
@ -171,7 +171,7 @@ ScVbaName::setValue( const ::rtl::OUString & rValue ) throw (css::uno::RuntimeEx
nTo = sValue.indexOf( sSegmentation, nFrom );
}
::rtl::OUString sTmpValue = sValue.copy( nFrom );
sTmpValue = sTmpValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
sTmpValue = sTmpValue.replaceAt(0, OUString(sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
{
sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;

6
sd/source/core/CustomAnimationCloner.cxx
View File

@ -129,7 +129,7 @@ namespace sd
catch( Exception& )
{
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::Clone(), "
OString(OString("sd::CustomAnimationClonerImpl::Clone(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -213,7 +213,7 @@ namespace sd
catch( Exception& )
{
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformNode(), "
OString(OString("sd::CustomAnimationClonerImpl::transformNode(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -287,7 +287,7 @@ namespace sd
catch( Exception& )
{
OSL_FAIL(
(OString("sd::CustomAnimationClonerImpl::transformValue(), "
OString(OString("sd::CustomAnimationClonerImpl::transformValue(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

2
sd/source/filter/eppt/pptx-epptooxml.cxx
View File

@ -98,7 +98,7 @@ using ::sax_fastparser::FSHelperPtr;
void dump_pset(Reference< XPropertySet > rXPropSet);
#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
#define IDS(x) OString(OStringLiteral(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
namespace oox {
using namespace drawingml;

4
sd/source/filter/html/htmlex.cxx
View File

@ -3100,7 +3100,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA
}
catch( com::sun::star::uno::Exception& )
{
OSL_FAIL((OString("sd::HtmlExport::checkFileExists(), exception caught: ") +
OSL_FAIL(OString(OString("sd::HtmlExport::checkFileExists(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
}
@ -3162,7 +3162,7 @@ bool HtmlExport::checkForExistingFiles()
}
catch( Exception& )
{
OSL_FAIL((OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") +
OSL_FAIL(OString(OString("sd::HtmlExport::checkForExistingFiles(), exception caught: ") +
rtl::OUStringToOString( comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() );
bFound = false;
}

44
sd/source/ui/slideshow/slideshowimpl.cxx
View File

@ -332,7 +332,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
catch( Exception& )
{
OSL_FAIL(
(OString("sd::AnimationSlideController::getSlideAPI(), "
OString(OString("sd::AnimationSlideController::getSlideAPI(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -656,7 +656,7 @@ void SAL_CALL SlideshowImpl::disposing()
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::stop(), "
OString(OString("sd::SlideshowImpl::stop(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -884,7 +884,7 @@ bool SlideshowImpl::startPreview(
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::startPreview(), "
OString(OString("sd::SlideshowImpl::startPreview(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1127,7 +1127,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::startShow(), "
OString(OString("sd::SlideshowImpl::startShow(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1188,7 +1188,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::startShowImpl(), "
OString(OString("sd::SlideshowImpl::startShowImpl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1226,7 +1226,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::paint(), "
OString(OString("sd::SlideshowImpl::paint(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1280,7 +1280,7 @@ void SlideshowImpl::removeShapeEvents()
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::removeShapeEvents(), "
OString(OString("sd::SlideshowImpl::removeShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1315,7 +1315,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
OString(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1393,7 +1393,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::registerShapeEvents(), "
OString(OString("sd::SlideshowImpl::registerShapeEvents(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1464,7 +1464,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::pause(), "
OString(OString("sd::SlideshowImpl::pause(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1500,7 +1500,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::resume(), "
OString(OString("sd::SlideshowImpl::resume(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1925,7 +1925,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
OString(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
+ rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
@ -2056,7 +2056,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
{
bRet = false;
OSL_FAIL(
(OString("sd::SlideshowImpl::keyInput(), "
OString(OString("sd::SlideshowImpl::keyInput(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -2448,7 +2448,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
catch( uno::Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::createSlideShow(), "
OString(OString("sd::SlideshowImpl::createSlideShow(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -2658,7 +2658,7 @@ void SlideshowImpl::resize( const Size& rSize )
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::resize(), "
OString(OString("sd::SlideshowImpl::resize(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -3014,7 +3014,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::setUsePen(), "
OString(OString("sd::SlideshowImpl::setUsePen(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -3087,12 +3087,8 @@ void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeExc
}
catch( Exception& )
{
OSL_TRACE(
(OString("sd::SlideshowImpl::setEraseAllInk(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );
SAL_WARN( "sd.slideshow", "sd::SlideshowImpl::setEraseAllInk(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
}
}
}
@ -3308,7 +3304,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::gotoPreviousSlide(), "
OString(OString("sd::SlideshowImpl::gotoPreviousSlide(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -3408,7 +3404,7 @@ void SAL_CALL SlideshowImpl::stopSound( ) throw (RuntimeException)
catch( Exception& )
{
OSL_FAIL(
(OString("sd::SlideshowImpl::stopSound(), "
OString(OString("sd::SlideshowImpl::stopSound(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

2
sd/source/ui/unoidl/DrawController.cxx
View File

@ -515,7 +515,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* pNewCurrentPage) throw()
catch (const uno::Exception&)
{
OSL_FAIL(
("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " +
OString("sd::SdUnoDrawView::FireSwitchCurrentPage(), exception caught: " +
::rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
RTL_TEXTENCODING_UTF8 )).getStr() );

2
sd/source/ui/view/drviews1.cxx
View File

@ -241,7 +241,7 @@ void DrawViewShell::SelectionHasChanged (void)
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), "
OString(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

4
sdext/source/presenter/PresenterTheme.cxx
View File

@ -382,8 +382,8 @@ bool PresenterTheme::ConvertToColor (
// Get configuration node for the view style container of the current
// theme.
if (pConfiguration->GoToChild(
A2S("Presenter/Themes/") + mpTheme->msConfigurationNodeName + A2S("/ViewStyles")))
if (pConfiguration->GoToChild( OUString(
"Presenter/Themes/" + mpTheme->msConfigurationNodeName + "/ViewStyles")))
{
pConfiguration->GoToChild(
::boost::bind(&PresenterConfigurationAccess::IsStringPropertyEqual,

2
stoc/source/inspect/introspection.cxx
View File

@ -2155,7 +2155,7 @@ rtl::Reference< IntrospectionAccessStatic_Impl > ImplIntrospection::implInspect(
else
{
OSL_FAIL(
( ::rtl::OString( "Introspection: Property \"" ) +
OString( ::rtl::OString( "Introspection: Property \"" ) +
::rtl::OUStringToOString( aPropName, RTL_TEXTENCODING_UTF8 ) +
::rtl::OString( "\" found more than once in PropertySet" ) ).getStr() );
}

16
svx/source/svdraw/svdoole2.cxx
View File

@ -931,7 +931,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::UpdateLinkURL_Impl(), "
OString(OString("SdrOle2Obj::UpdateLinkURL_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -973,7 +973,7 @@ void SdrOle2Obj::BreakFileLink_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::BreakFileLink_Impl(), "
OString(OString("SdrOle2Obj::BreakFileLink_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1024,7 +1024,7 @@ void SdrOle2Obj::CheckFileLink_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::CheckFileLink_Impl(), "
OString(OString("SdrOle2Obj::CheckFileLink_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1108,7 +1108,7 @@ void SdrOle2Obj::Connect_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::Connect_Impl(), "
OString(OString("SdrOle2Obj::Connect_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1195,7 +1195,7 @@ void SdrOle2Obj::RemoveListeners_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::RemoveListeners_Impl(), "
OString(OString("SdrOle2Obj::RemoveListeners_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1277,7 +1277,7 @@ void SdrOle2Obj::Disconnect_Impl()
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::Disconnect_Impl(), "
OString(OString("SdrOle2Obj::Disconnect_Impl(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1412,7 +1412,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::SetModel(), "
OString(OString("SdrOle2Obj::SetModel(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),
@ -1935,7 +1935,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
catch( ::com::sun::star::uno::Exception& )
{
OSL_FAIL(
(OString("SdrOle2Obj::Unload=(), "
OString(OString("SdrOle2Obj::Unload=(), "
"exception caught: ") +
rtl::OUStringToOString(
comphelper::anyToString( cppu::getCaughtException() ),

6
sw/source/filter/ww8/docxattributeoutput.cxx
View File

@ -2526,7 +2526,7 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
m_pSerializer->startElementNS( XML_w, XML_style,
FSNS( XML_w, XML_type ), bPapFmt? "paragraph": "character", // FIXME is this correct?
FSNS( XML_w, XML_styleId ), ( aStyle + OString::valueOf( sal_Int32( nId ) ) ).getStr(),
FSNS( XML_w, XML_styleId ), OString( aStyle + OString::valueOf( sal_Int32( nId ) ) ).getStr(),
FSEND );
m_pSerializer->singleElementNS( XML_w, XML_name,
@ -2536,12 +2536,12 @@ void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
if ( nBase != 0x0FFF )
{
m_pSerializer->singleElementNS( XML_w, XML_basedOn,
FSNS( XML_w, XML_val ), ( aStyle + OString::valueOf( sal_Int32( nBase ) ) ).getStr(),
FSNS( XML_w, XML_val ), OString( aStyle + OString::valueOf( sal_Int32( nBase ) ) ).getStr(),
FSEND );
}
m_pSerializer->singleElementNS( XML_w, XML_next,
FSNS( XML_w, XML_val ), ( aStyle + OString::valueOf( sal_Int32( nNext ) ) ).getStr(),
FSNS( XML_w, XML_val ), OString( aStyle + OString::valueOf( sal_Int32( nNext ) ) ).getStr(),
FSEND );
if ( bAutoUpdate )