summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/opengl/x11/X11DeviceInfo.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx54
-rw-r--r--vcl/source/window/builder.cxx56
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/window2.cxx4
-rw-r--r--vcl/unx/generic/app/sm.cxx2
-rw-r--r--vcl/unx/generic/fontmanager/fontconfig.cxx4
-rw-r--r--vcl/unx/generic/fontmanager/fontmanager.cxx4
9 files changed, 51 insertions, 79 deletions
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 8b8b88e0cba7..8cd5cbb906b9 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -206,7 +206,7 @@ void X11OpenGLDeviceInfo::GetData()
}
}
- if (!strcmp(textureFromPixmap.getStr(), "TRUE"))
+ if (textureFromPixmap != "TRUE")
mbHasTextureFromPixmap = true;
// only useful for Linux kernel version check for FGLRX driver.
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index a4a7ed68ac34..f104ded051d6 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -544,7 +544,6 @@ static void appendName( const OUString& rStr, OStringBuffer& rBuffer )
// FIXME i59651 add a check for max length of 127 chars? Per PDF spec 1.4, appendix C.1
// I guess than when reading the #xx sequence it will count for a single character.
OString aStr( OUStringToOString( rStr, RTL_TEXTENCODING_UTF8 ) );
- const sal_Char* pStr = aStr.getStr();
int nLen = aStr.getLength();
for( int i = 0; i < nLen; i++ )
{
@@ -555,17 +554,17 @@ static void appendName( const OUString& rStr, OStringBuffer& rBuffer )
* but has a narrower acceptance rate we only pass
* alphanumerics and '-' literally.
*/
- if( (pStr[i] >= 'A' && pStr[i] <= 'Z' ) ||
- (pStr[i] >= 'a' && pStr[i] <= 'z' ) ||
- (pStr[i] >= '0' && pStr[i] <= '9' ) ||
- pStr[i] == '-' )
+ if( (aStr[i] >= 'A' && aStr[i] <= 'Z' ) ||
+ (aStr[i] >= 'a' && aStr[i] <= 'z' ) ||
+ (aStr[i] >= '0' && aStr[i] <= '9' ) ||
+ aStr[i] == '-' )
{
- rBuffer.append( pStr[i] );
+ rBuffer.append( aStr[i] );
}
else
{
rBuffer.append( '#' );
- appendHex( (sal_Int8)pStr[i], rBuffer );
+ appendHex( (sal_Int8)aStr[i], rBuffer );
}
}
}
@@ -696,7 +695,6 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
*/
const OUString& rName = (m_aContext.Version > PDFWriter::PDFVersion::PDF_1_2) ? i_rControl.Name : i_rControl.Text;
OString aStr( OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ) );
- const sal_Char* pStr = aStr.getStr();
int nLen = aStr.getLength();
OStringBuffer aBuffer( rName.getLength()+64 );
@@ -706,12 +704,12 @@ void PDFWriterImpl::createWidgetFieldName( sal_Int32 i_nWidgetIndex, const PDFWr
* outside the interval [32(=ASCII' ');126(=ASCII'~')]
* should be escaped hexadecimal
*/
- if( (pStr[i] >= 32 && pStr[i] <= 126 ) )
- aBuffer.append( pStr[i] );
+ if( (aStr[i] >= 32 && aStr[i] <= 126 ) )
+ aBuffer.append( aStr[i] );
else
{
aBuffer.append( '#' );
- appendHex( (sal_Int8)pStr[i], aBuffer );
+ appendHex( (sal_Int8)aStr[i], aBuffer );
}
}
@@ -6463,7 +6461,7 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (!cms_msg)
return false;
- char *pass(strdup(OUStringToOString( rContext.m_aSignPassword, RTL_TEXTENCODING_UTF8 ).getStr()));
+ OString pass(OUStringToOString( rContext.m_aSignPassword, RTL_TEXTENCODING_UTF8 ));
TimeStampReq src;
OStringBuffer response_buffer;
@@ -6487,7 +6485,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
NSSCMSMessage *ts_cms_msg = CreateCMSMessage(&now, &ts_cms_sd, &ts_cms_signer, cert, &digest);
if (!ts_cms_msg)
{
- free(pass);
return false;
}
@@ -6496,12 +6493,12 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
ts_cms_output.len = 0;
PLArenaPool *ts_arena = PORT_NewArena(10000);
NSSCMSEncoderContext *ts_cms_ecx;
- ts_cms_ecx = NSS_CMSEncoder_Start(ts_cms_msg, nullptr, nullptr, &ts_cms_output, ts_arena, PDFSigningPKCS7PasswordCallback, pass, nullptr, nullptr, nullptr, nullptr);
+ ts_cms_ecx = NSS_CMSEncoder_Start(ts_cms_msg, nullptr, nullptr, &ts_cms_output, ts_arena, PDFSigningPKCS7PasswordCallback,
+ const_cast<sal_Char*>(pass.getStr()), nullptr, nullptr, nullptr, nullptr);
if (NSS_CMSEncoder_Finish(ts_cms_ecx) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "NSS_CMSEncoder_Finish failed");
- free(pass);
return false;
}
@@ -6521,7 +6518,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (!ts_hc.get())
{
SAL_WARN("vcl.pdfwriter", "HASH_Create failed");
- free(pass);
return false;
}
@@ -6571,14 +6567,12 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (timestamp_request == nullptr)
{
SAL_WARN("vcl.pdfwriter", "SEC_ASN1EncodeItem failed");
- free(pass);
return false;
}
if (timestamp_request->data == nullptr)
{
SAL_WARN("vcl.pdfwriter", "SEC_ASN1EncodeItem succeeded but got NULL data");
- free(pass);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
}
@@ -6602,7 +6596,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (!curl)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_init failed");
- free(pass);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
}
@@ -6612,7 +6605,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if ((rc = curl_easy_setopt(curl, CURLOPT_URL, OUStringToOString(rContext.m_aSignTSA, RTL_TEXTENCODING_UTF8).getStr())) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_URL) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6624,7 +6616,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if ((rc = curl_easy_setopt(curl, CURLOPT_HTTPHEADER, slist)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_HTTPHEADER) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_slist_free_all(slist);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
@@ -6635,7 +6626,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
(rc = curl_easy_setopt(curl, CURLOPT_POSTFIELDS, timestamp_request->data)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_POSTFIELDSIZE or CURLOPT_POSTFIELDS) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6645,7 +6635,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
(rc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, AppendToBuffer)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_WRITEDATA or CURLOPT_WRITEFUNCTION) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6654,7 +6643,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if ((rc = curl_easy_setopt(curl, CURLOPT_POST, 1)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_POST) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6664,7 +6652,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if ((rc = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buffer)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_ERRORBUFFER) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6675,7 +6662,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
(rc = curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10)) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_setopt(CURLOPT_TIMEOUT or CURLOPT_CONNECTTIMEOUT) failed: " << curl_easy_strerror(rc));
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6684,7 +6670,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (curl_easy_perform(curl) != CURLE_OK)
{
SAL_WARN("vcl.pdfwriter", "curl_easy_perform failed: " << error_buffer);
- free(pass);
curl_easy_cleanup(curl);
SECITEM_FreeItem(timestamp_request, PR_TRUE);
return false;
@@ -6713,7 +6698,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (SEC_ASN1DecodeItem(nullptr, &response, TimeStampResp_Template, &response_item) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "SEC_ASN1DecodeItem failed");
- free(pass);
return false;
}
@@ -6723,7 +6707,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
(response.status.status.data[0] != 0 && response.status.status.data[0] != 1))
{
SAL_WARN("vcl.pdfwriter", "Timestamp request was not granted");
- free(pass);
return false;
}
@@ -6746,7 +6729,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (my_SEC_StringToOID(&typetag.oid, "1.2.840.113549.1.9.16.2.14", 0) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "SEC_StringToOID failed");
- free(pass);
return false;
}
typetag.offset = SEC_OID_UNKNOWN; // ???
@@ -6767,7 +6749,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (my_NSS_CMSSignerInfo_AddUnauthAttr(cms_signer, &timestamp) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "NSS_CMSSignerInfo_AddUnauthAttr failed");
- free(pass);
return false;
}
}
@@ -6786,7 +6767,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (!aCertHashContext.get())
{
SAL_WARN("vcl.pdfwriter", "HASH_Create() failed");
- free(pass);
return false;
}
HASH_Begin(aCertHashContext.get());
@@ -6811,7 +6791,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (!pEncodedCertificate)
{
SAL_WARN("vcl.pdfwriter", "SEC_ASN1EncodeItem() failed");
- free(pass);
return false;
}
@@ -6836,7 +6815,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (my_SEC_StringToOID(&aOidData.oid, "1.2.840.113549.1.9.16.2.47", 0) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "my_SEC_StringToOID() failed");
- free(pass);
return false;
}
aOidData.offset = SEC_OID_UNKNOWN;
@@ -6850,7 +6828,6 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
if (my_NSS_CMSSignerInfo_AddAuthAttr(cms_signer, &aAttribute) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "my_NSS_CMSSignerInfo_AddAuthAttr() failed");
- free(pass);
return false;
}
@@ -6865,24 +6842,21 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
// with, the software itself pops up a dialog asking for the PIN (password). But I am not going
// to test it and risk locking up my token...
- cms_ecx = NSS_CMSEncoder_Start(cms_msg, nullptr, nullptr, &cms_output, arena, PDFSigningPKCS7PasswordCallback, pass, nullptr, nullptr, nullptr, nullptr);
+ cms_ecx = NSS_CMSEncoder_Start(cms_msg, nullptr, nullptr, &cms_output, arena, PDFSigningPKCS7PasswordCallback,
+ const_cast<sal_Char*>(pass.getStr()), nullptr, nullptr, nullptr, nullptr);
if (!cms_ecx)
{
SAL_WARN("vcl.pdfwriter", "NSS_CMSEncoder_Start failed");
- free(pass);
return false;
}
if (NSS_CMSEncoder_Finish(cms_ecx) != SECSuccess)
{
SAL_WARN("vcl.pdfwriter", "NSS_CMSEncoder_Finish failed");
- free(pass);
return false;
}
- free(pass);
-
#ifdef DBG_UTIL
{
FILE *out = fopen("PDFWRITER.cms.data", "wb");
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 83d61fbbad93..da3435510a7e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -255,7 +255,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
pSource->SetAccessibleRelationMemberOf(pTarget);
else
{
- SAL_INFO("vcl.layout", "unhandled a11y relation :" << rType.getStr());
+ SAL_INFO("vcl.layout", "unhandled a11y relation :" << rType);
}
}
}
@@ -496,8 +496,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
m_pParserState.reset();
SAL_WARN_IF(!m_sID.isEmpty() && (!m_bToplevelParentFound && !get_by_name(m_sID)), "vcl.layout",
- "Requested top level widget \"" << m_sID.getStr() <<
- "\" not found in " << sUIFile);
+ "Requested top level widget \"" << m_sID << "\" not found in " << sUIFile);
#if defined SAL_LOG_WARN
if (m_bToplevelParentFound && m_pParent->IsDialog())
@@ -1454,7 +1453,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
if (sPattern.isEmpty())
{
connectNumericFormatterAdjustment(id, sAdjustment);
- SAL_INFO("vcl.layout", "making numeric field for " << name.getStr() << " " << sUnit.getStr());
+ SAL_INFO("vcl.layout", "making numeric field for " << name << " " << sUnit);
xWindow = VclPtr<NumericField>::Create(pParent, nBits);
}
else
@@ -1462,20 +1461,20 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
if (sPattern == "hh:mm")
{
connectTimeFormatterAdjustment(id, sAdjustment);
- SAL_INFO("vcl.layout", "making time field for " << name.getStr() << " " << sUnit.getStr());
+ SAL_INFO("vcl.layout", "making time field for " << name << " " << sUnit.getStr());
xWindow = VclPtr<TimeField>::Create(pParent, nBits);
}
else if (sPattern == "yy:mm:dd")
{
connectDateFormatterAdjustment(id, sAdjustment);
- SAL_INFO("vcl.layout", "making date field for " << name.getStr() << " " << sUnit.getStr());
+ SAL_INFO("vcl.layout", "making date field for " << name << " " << sUnit.getStr());
xWindow = VclPtr<DateField>::Create(pParent, nBits);
}
else
{
connectNumericFormatterAdjustment(id, sAdjustment);
FieldUnit eUnit = detectMetricUnit(sUnit);
- SAL_INFO("vcl.layout", "making metric field for " << name.getStr() << " " << sUnit.getStr());
+ SAL_INFO("vcl.layout", "making metric field for " << name << " " << sUnit.getStr());
VclPtrInstance<MetricField> xField(pParent, nBits);
xField->SetUnit(eUnit);
if (eUnit == FUNIT_CUSTOM)
@@ -1504,9 +1503,9 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
connectNumericFormatterAdjustment(id, sAdjustment);
OUString sUnit = extractUnit(sPattern);
FieldUnit eUnit = detectMetricUnit(sUnit);
- SAL_WARN("vcl.layout", "making metric box for type: " << name.getStr()
- << " unit: " << sUnit.getStr()
- << " name: " << id.getStr()
+ SAL_WARN("vcl.layout", "making metric box for type: " << name
+ << " unit: " << sUnit
+ << " name: " << id
<< " use a VclComboBoxNumeric instead");
VclPtrInstance<MetricBox> xBox(pParent, nBits);
xBox->EnableAutoSize(true);
@@ -1547,7 +1546,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
connectNumericFormatterAdjustment(id, sAdjustment);
OUString sUnit = extractUnit(sPattern);
FieldUnit eUnit = detectMetricUnit(sUnit);
- SAL_INFO("vcl.layout", "making metric box for " << name.getStr() << " " << sUnit.getStr());
+ SAL_INFO("vcl.layout", "making metric box for " << name << " " << sUnit);
VclPtrInstance<MetricBox> xBox(pParent, nBits);
xBox->EnableAutoSize(true);
xBox->SetUnit(eUnit);
@@ -1558,7 +1557,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
}
else
{
- SAL_INFO("vcl.layout", "making numeric box for " << name.getStr());
+ SAL_INFO("vcl.layout", "making numeric box for " << name);
connectNumericFormatterAdjustment(id, sAdjustment);
VclPtrInstance<NumericBox> xBox(pParent, nBits);
if (bDropdown)
@@ -1809,16 +1808,16 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
}
}
}
- SAL_WARN_IF(!xWindow, "vcl.layout", "probably need to implement " << name.getStr() << " or add a make" << name.getStr() << " function");
+ SAL_WARN_IF(!xWindow, "vcl.layout", "probably need to implement " << name << " or add a make" << name << " function");
if (xWindow)
{
xWindow->SetHelpId(m_sHelpRoot + id);
- SAL_INFO("vcl.layout", "for " << name.getStr() <<
+ SAL_INFO("vcl.layout", "for " << name <<
", created " << xWindow.get() << " child of " <<
pParent << "(" << xWindow->mpWindowImpl->mpParent.get() << "/" <<
xWindow->mpWindowImpl->mpRealParent.get() << "/" <<
xWindow->mpWindowImpl->mpBorderWindow.get() << ") with helpid " <<
- xWindow->GetHelpId().getStr());
+ xWindow->GetHelpId());
m_aChildren.push_back(WinAndId(id, xWindow, bVertical));
}
return xWindow;
@@ -1885,8 +1884,7 @@ VclPtr<vcl::Window> VclBuilder::insertObject(vcl::Window *pParent, const OString
{
pCurrentChild->SetHelpId(m_sHelpRoot + m_sID);
SAL_INFO("vcl.layout", "for toplevel dialog " << this << " " <<
- rID.getStr() << ", set helpid " <<
- pCurrentChild->GetHelpId().getStr());
+ rID << ", set helpid " << pCurrentChild->GetHelpId());
}
m_bToplevelParentFound = true;
}
@@ -2418,7 +2416,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
if (pWindow && rKey.match("AtkObject::"))
pWindow->set_property(rKey.copy(RTL_CONSTASCII_LENGTH("AtkObject::")), rValue);
else
- SAL_WARN("vcl.layout", "unhandled atk prop: " << rKey.getStr());
+ SAL_WARN("vcl.layout", "unhandled atk prop: " << rKey);
}
}
@@ -2772,7 +2770,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, PopupMenu *pSubMenu, const
pParent->InsertSeparator(rID);
}
- SAL_WARN_IF(nOldCount == pParent->GetItemCount(), "vcl.layout", "probably need to implement " << rClass.getStr());
+ SAL_WARN_IF(nOldCount == pParent->GetItemCount(), "vcl.layout", "probably need to implement " << rClass);
if (nOldCount != pParent->GetItemCount())
{
@@ -2792,7 +2790,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, PopupMenu *pSubMenu, const
else if (rKey == "has-default" && toBool(rValue))
pParent->SetSelectedEntry(nNewId);
else
- SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property: " << rKey);
}
for (accelmap::iterator aI = rAccels.begin(), aEnd = rAccels.end(); aI != aEnd; ++aI)
@@ -2803,7 +2801,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, PopupMenu *pSubMenu, const
if (rSignal == "activate")
pParent->SetAccelKey(nNewId, makeKeyCode(rValue));
else
- SAL_INFO("vcl.layout", "unhandled accelerator for: " << rSignal.getStr());
+ SAL_INFO("vcl.layout", "unhandled accelerator for: " << rSignal);
}
}
@@ -3107,7 +3105,7 @@ void VclBuilder::applyPackingProperty(vcl::Window *pCurrent,
}
else
{
- SAL_WARN("vcl.layout", "unknown packing: " << sKey.getStr());
+ SAL_WARN("vcl.layout", "unknown packing: " << sKey);
}
}
}
@@ -3151,7 +3149,7 @@ std::vector<vcl::EnumContext::Context> VclBuilder::handleStyle(xmlreader::XmlRea
}
else
{
- SAL_WARN("vcl.layout", "unknown class: " << classStyle.getStr());
+ SAL_WARN("vcl.layout", "unknown class: " << classStyle);
}
}
}
@@ -3510,7 +3508,7 @@ void VclBuilder::mungeAdjustment(NumericFormatter &rTarget, const Adjustment &rA
}
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
@@ -3541,7 +3539,7 @@ void VclBuilder::mungeAdjustment(TimeField &rTarget, const Adjustment &rAdjustme
}
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
@@ -3572,7 +3570,7 @@ void VclBuilder::mungeAdjustment(DateField &rTarget, const Adjustment &rAdjustme
}
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
@@ -3596,7 +3594,7 @@ void VclBuilder::mungeAdjustment(ScrollBar &rTarget, const Adjustment &rAdjustme
rTarget.SetPageSize(rValue.toInt32());
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
@@ -3620,7 +3618,7 @@ void VclBuilder::mungeAdjustment(Slider& rTarget, const Adjustment& rAdjustment)
rTarget.SetPageSize(rValue.toInt32());
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
@@ -3636,7 +3634,7 @@ void VclBuilder::mungeTextBuffer(VclMultiLineEdit &rTarget, const TextBuffer &rT
rTarget.SetText(rValue);
else
{
- SAL_INFO("vcl.layout", "unhandled property :" << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property :" << rKey);
}
}
}
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 91525b3f590c..6847fb2d5d76 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -766,7 +766,7 @@ bool Dialog::ImplStartExecuteModal()
case Application::DialogCancelMode::Silent:
SAL_INFO(
"vcl",
- "Dialog \"" << ImplGetDialogText(this).getStr()
+ "Dialog \"" << ImplGetDialogText(this)
<< "\"cancelled in silent mode");
return false;
default: // default cannot happen
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e73808df8e9b..010ee2a5c2f6 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2153,7 +2153,7 @@ bool VclSizeGroup::set_property(const OString &rKey, const OUString &rValue)
}
else
{
- SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property: " << rKey);
return false;
}
return true;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 9c891ec309d9..0a54ea7fe31c 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1463,7 +1463,7 @@ bool Window::set_font_attribute(const OString &rKey, const OUString &rValue)
}
else
{
- SAL_INFO("vcl.layout", "unhandled font attribute: " << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled font attribute: " << rKey);
return false;
}
return true;
@@ -1605,7 +1605,7 @@ bool Window::set_property(const OString &rKey, const OUString &rValue)
}
else
{
- SAL_INFO("vcl.layout", "unhandled property: " << rKey.getStr());
+ SAL_INFO("vcl.layout", "unhandled property: " << rKey);
return false;
}
return true;
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index e33ccfd50726..be572f29a7c6 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -631,7 +631,7 @@ OString SessionManagerClient::getPreviousSessionID()
}
}
- SAL_INFO("vcl.sm.debug", " previous ID = " << aPrevId.getStr());
+ SAL_INFO("vcl.sm.debug", " previous ID = " << aPrevId);
return aPrevId;
}
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 4b3803231179..6b6b1442778a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -276,7 +276,7 @@ namespace
for( std::vector<lang_and_element>::const_iterator aIter = elements.begin(); aIter != aEnd; ++aIter )
{
const char *pLang = reinterpret_cast<const char*>(aIter->first);
- if( rtl_str_compare( pLang, sFullMatch.getStr() ) == 0)
+ if( sFullMatch == pLang)
{
// both language and country match
candidate = aIter->second;
@@ -288,7 +288,7 @@ namespace
// override candidate only if there is a full match
continue;
}
- else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0)
+ else if( sLangMatch == pLang)
{
// just the language matches
candidate = aIter->second;
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 715223809afa..84b3cfd56a89 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -604,7 +604,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
if( aInfo.usubfamily )
pFont->m_aStyleName = OUString( aInfo.usubfamily );
- SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile.getStr() );
+ SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile );
pFont->m_aPSName = aInfo.psname ?
OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) :
@@ -697,7 +697,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
bSuccess = true;
}
else
- SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile.getStr() << "\"");
+ SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile << "\"");
return bSuccess;
}
generated by cgit (git 2.34.1) at 2025-02-24 17:10:59 +0000