summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-07-02 13:56:53 +0200
committerMichael Stahl <mstahl@redhat.com>2013-07-02 14:01:19 +0200
commitfb3778b2a26d693d56c750fcf081117cc440cf07 (patch)
treed489f1cd65bb3ddbe6cd3075cffa3bf8d087433b
parent23326c48274dc64a53ef142edc8bc551ea6c15eb (diff)
... fix more -Werror=address (wrong TempFile ctor called)
Change-Id: I19b2195a5e524f8c485f904989f1c604fca9612f
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx6
-rw-r--r--sfx2/source/doc/docfile.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx6
4 files changed, 7 insertions, 9 deletions
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 2f67a5e7a7da..405017f65a0d 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -429,9 +429,8 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
Reference< XStorable > xStorable( xComp, UNO_QUERY );
if( xStorable.is() )
{
- String leadingChars;
OUString const ext(RTL_CONSTASCII_USTRINGPARAM(".xml"));
- utl::TempFile aTempFile(leadingChars, &ext);
+ utl::TempFile aTempFile(OUString(), &ext);
OUString aTempFileURL( aTempFile.GetURL() );
const application_info_impl* pAppInfo = getApplicationInfo( m_pFilterInfo->maExportService );
@@ -593,9 +592,8 @@ void XMLFilterTestDialog::import( const OUString& rURL )
if( m_pCBXDisplaySource->IsChecked() )
{
- String lead;
OUString const ext(RTL_CONSTASCII_USTRINGPARAM(".xml"));
- TempFile aTempFile(lead, &ext);
+ TempFile aTempFile(OUString(), &ext);
OUString aTempFileURL( aTempFile.GetURL() );
Reference< XImportFilter > xImporter( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.documentconversion.XSLTFilter", mxContext ), UNO_QUERY );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f35d49ee0ff6..1643872c5393 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3642,7 +3642,7 @@ OUString SfxMedium::SwitchDocumentToTempFile()
OUString const aExt = (nPrefixLen == -1)
? OUString()
: aOrigURL.copy(nPrefixLen);
- OUString aNewURL = ::utl::TempFile( String(), &aExt ).GetURL();
+ OUString aNewURL = ::utl::TempFile( OUString(), &aExt ).GetURL();
// TODO/LATER: In future the aLogicName should be set to shared folder URL
// and a temporary file should be created. Transport_Impl should be impossible then.
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 438448187c86..d71990ef61d7 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -396,7 +396,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton)
uno::Reference<sdb::XDocumentDataSource> xDS(xNewInstance, UNO_QUERY_THROW);
uno::Reference<frame::XStorable> xStore(xDS->getDatabaseDocument(), UNO_QUERY_THROW);
- String sExt = OUString(".odb");
+ OUString const sExt(".odb");
String sTmpName;
{
OUString sHomePath(SvtPathOptions().GetWorkPath());
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 44c7b9ee1fe6..34fafc218039 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -110,9 +110,9 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) :
{
//temp file needs it's own block
//creating with extension is not supported by a static method :-(
- String sLeading;
- String sExt(comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(), '*'));
- utl::TempFile aTempFile( sLeading, &sExt );
+ OUString const sExt(
+ comphelper::string::stripStart(pSfxFlt->GetDefaultExtension(),'*'));
+ utl::TempFile aTempFile( OUString(), &sExt );
m_sExampleURL = aTempFile.GetURL();
aTempFile.EnableKillingFile();
}