summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-07-13 11:45:21 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-13 11:45:21 +0200
commita38eb6862868c18296b26d582658a831b622088a (patch)
tree928e98b833c4c699c439925664742f3df9cd8298 /sfx2/source
parent8d6db960d8f3a1eba5a5bcd865429cf4d5df401c (diff)
loplugin:oncevar: empty strings: sfx2
Change-Id: I76a8b7e9501951a0166dd63890949bd7d2781398
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/appserv.cxx3
-rw-r--r--sfx2/source/appl/appuno.cxx9
-rw-r--r--sfx2/source/doc/doctemplates.cxx3
-rw-r--r--sfx2/source/doc/objstor.cxx3
-rw-r--r--sfx2/source/inet/inettbc.cxx3
5 files changed, 7 insertions, 14 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 450e74931393..b17d8ba93128 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -199,8 +199,7 @@ namespace
using namespace svtools;
Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext()));
Sequence< OUString > vPackages { "libreoffice-base" };
- OUString sInteraction;
- xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction);
+ xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, OUString());
// Ill be back (hopefully)!
SolarMutexGuard aGuard;
executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 2abeaf4f4e28..d4d7cfbc9ab5 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1616,9 +1616,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > const & rModel,
const uno::Sequence< beans::PropertyValue >& rProperties )
{
- OUString temp;
uno::Reference< uno::XInterface > temp2;
- document::FilterOptionsRequest aOptionsRequest( temp,
+ document::FilterOptionsRequest aOptionsRequest( OUString(),
temp2,
rModel,
rProperties );
@@ -1656,9 +1655,8 @@ public:
RequestPackageReparation_Impl::RequestPackageReparation_Impl( const OUString& aName )
{
- OUString temp;
uno::Reference< uno::XInterface > temp2;
- document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, aName );
+ document::BrokenPackageRequest aBrokenPackageRequest( OUString(), temp2, aName );
m_aRequest <<= aBrokenPackageRequest;
m_xApprove = new comphelper::OInteractionApprove;
m_xDisapprove = new comphelper::OInteractionDisapprove;
@@ -1713,9 +1711,8 @@ public:
NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( const OUString& aName )
{
- OUString temp;
uno::Reference< uno::XInterface > temp2;
- document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, aName );
+ document::BrokenPackageRequest aBrokenPackageRequest( OUString(), temp2, aName );
m_aRequest <<= aBrokenPackageRequest;
m_xAbort = new comphelper::OInteractionAbort;
}
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index c811fde66138..2f287f70e1cf 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2452,7 +2452,6 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
OUString aChildTitle( xRow->getString( 1 ) );
const OUString aTargetURL {xContentAccess->queryContentIdentifierString()};
OUString aType;
- OUString aHierURL;
if ( aChildTitle == "sfx.tlx" || aChildTitle == "groupuinames.xml" )
continue;
@@ -2461,7 +2460,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
if( !getTitleFromURL( aTargetURL, aChildTitle, aType, bDocHasTitle ) )
continue;
- pGroup->addEntry( aChildTitle, aTargetURL, aType, aHierURL );
+ pGroup->addEntry( aChildTitle, aTargetURL, aType, OUString() );
}
}
catch ( Exception& ) {}
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 828d32043cd9..1f05b72bde83 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2544,10 +2544,9 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
if ( pSalvageItem )
{
const SfxStringItem* pFilterItem = SfxItemSet::GetItem<SfxStringItem>(GetMedium()->GetItemSet(), SID_FILTER_NAME, false);
- OUString aFilterName;
std::shared_ptr<const SfxFilter> pFilter;
if ( pFilterItem )
- pFilter = SfxFilterMatcher( GetFactory().GetFactoryName() ).GetFilter4FilterName( aFilterName );
+ pFilter = SfxFilterMatcher( GetFactory().GetFactoryName() ).GetFilter4FilterName( OUString() );
SfxMedium *pMed = new SfxMedium(
pSalvageItem->GetValue(), StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC, pFilter );
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 978209c6e941..da0820aa208d 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -78,7 +78,6 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const
{
OUString aName;
OUString aFilter;
- OUString aOptions;
INetURLObject aObj( rName );
if ( aObj.GetProtocol() == INetProtocol::NotValid )
@@ -112,7 +111,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName ) const
{
aArgs.realloc( 4 );
aArgs[2].Name = "FilterOptions";
- aArgs[2].Value <<= aOptions;
+ aArgs[2].Value <<= OUString();
aArgs[3].Name = "FilterName";
aArgs[3].Value <<= aFilter;
}