[Libreoffice-commits] core.git: basic/source chart2/source cui/source dbaccess/source desktop/source editeng/source forms/source include/editeng include/oox include/sfx2 include/svtools oox/source sd/source svtools/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 9 06:28:42 UTC 2017
basic/source/classes/errobject.cxx | 2 -
basic/source/inc/runtime.hxx | 2 -
basic/source/runtime/runtime.cxx | 4 +-
chart2/source/controller/main/CommandDispatch.cxx | 5 +--
chart2/source/controller/main/CommandDispatch.hxx | 3 -
cui/source/factory/dlgfact.cxx | 2 -
cui/source/factory/dlgfact.hxx | 2 -
dbaccess/source/core/api/querycontainer.cxx | 2 -
dbaccess/source/core/inc/veto.hxx | 3 -
dbaccess/source/core/misc/veto.cxx | 7 +---
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 -
dbaccess/source/ui/dlg/CollectionView.cxx | 10 +++---
dbaccess/source/ui/inc/TokenWriter.hxx | 11 ++----
dbaccess/source/ui/misc/RowSetDrop.cxx | 5 +--
dbaccess/source/ui/misc/TokenWriter.cxx | 5 +--
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 5 +--
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 3 -
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 -
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 6 +--
desktop/source/deployment/registry/dp_backend.cxx | 6 +--
desktop/source/deployment/registry/help/dp_help.cxx | 4 +-
desktop/source/deployment/registry/inc/dp_backend.h | 2 -
editeng/source/outliner/outlvw.cxx | 4 +-
forms/source/helper/controlfeatureinterception.cxx | 10 +-----
forms/source/inc/controlfeatureinterception.hxx | 5 ---
include/editeng/outliner.hxx | 2 -
include/oox/mathml/importutils.hxx | 3 -
include/sfx2/sfxdlg.hxx | 2 -
include/svtools/DocumentInfoPreview.hxx | 4 --
include/svtools/fileview.hxx | 3 -
include/svtools/grfmgr.hxx | 1
include/svtools/inetimg.hxx | 6 +--
oox/source/mathml/importutils.cxx | 3 -
sd/source/ui/view/sdview3.cxx | 4 +-
svtools/source/contnr/DocumentInfoPreview.cxx | 16 ----------
svtools/source/contnr/fileview.cxx | 4 +-
svtools/source/graphic/grfmgr.cxx | 4 +-
sw/source/core/doc/notxtfrm.cxx | 2 -
sw/source/uibase/dochdl/swdtflvr.cxx | 6 +--
sw/source/uibase/docvw/romenu.cxx | 2 -
40 files changed, 63 insertions(+), 111 deletions(-)
New commits:
commit 4763091bbecab8722a43d0ed73eafc0a1f596242
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon May 8 14:17:56 2017 +0200
loplugin:constantparam
Change-Id: Ia9500b25602c14aadf49fe373682ae9d87a0a1a2
Reviewed-on: https://gerrit.libreoffice.org/37390
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx
index d6fb2cca2866..63289c8f94d5 100644
--- a/basic/source/classes/errobject.cxx
+++ b/basic/source/classes/errobject.cxx
@@ -76,7 +76,7 @@ ErrObject::getNumber()
void SAL_CALL
ErrObject::setNumber( ::sal_Int32 _number )
{
- GetSbData()->pInst->setErrorVB( _number, OUString() );
+ GetSbData()->pInst->setErrorVB( _number );
OUString _description = GetSbData()->pInst->GetErrorMsg();
setData( uno::Any( _number ), uno::Any(), uno::Any( _description ), uno::Any(), uno::Any() );
}
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index d4e5b25c4353..f80d07322690 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -167,7 +167,7 @@ public:
void Error( SbError ); // trappable Error
void Error( SbError, const OUString& rMsg ); // trappable Error with message
void ErrorVB( sal_Int32 nVBNumber, const OUString& rMsg );
- void setErrorVB( sal_Int32 nVBNumber, const OUString& rMsg );
+ void setErrorVB( sal_Int32 nVBNumber );
void FatalError( SbError ); // non-trappable Error
void FatalError( SbError, const OUString& ); // non-trappable Error
void Abort(); // with current error code
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 0e88e57ec9ec..526c51054513 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -491,14 +491,14 @@ void SbiInstance::ErrorVB( sal_Int32 nVBNumber, const OUString& rMsg )
}
}
-void SbiInstance::setErrorVB( sal_Int32 nVBNumber, const OUString& rMsg )
+void SbiInstance::setErrorVB( sal_Int32 nVBNumber )
{
SbError n = StarBASIC::GetSfxFromVBError( static_cast< sal_uInt16 >( nVBNumber ) );
if( !n )
{
n = nVBNumber; // force orig number, probably should have a specific table of vb ( localized ) errors
}
- aErrorMsg = rMsg;
+ aErrorMsg = OUString();
SbiRuntime::translateErrorToVba( n, aErrorMsg );
nErr = n;
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 42beadb65f8d..1907615f9bd1 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -119,8 +119,7 @@ void CommandDispatch::fireStatusEventForURL(
const OUString & rURL,
const uno::Any & rState,
bool bEnabled,
- const Reference< frame::XStatusListener > & xSingleListener, /* = 0 */
- const OUString & rFeatureDescriptor /* = OUString() */ )
+ const Reference< frame::XStatusListener > & xSingleListener /* = 0 */)
{
// prepare event to send
util::URL aURL;
@@ -134,7 +133,7 @@ void CommandDispatch::fireStatusEventForURL(
frame::FeatureStateEvent aEventToSend(
static_cast< cppu::OWeakObject* >( this ), // Source
aURL, // FeatureURL
- rFeatureDescriptor, // FeatureDescriptor
+ OUString(), // FeatureDescriptor
bEnabled, // IsEnabled
false, // Requery
rState // State
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index a9a76a1ab587..d6ed61aa1068 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -92,8 +92,7 @@ protected:
const OUString & rURL,
const css::uno::Any & rState,
bool bEnabled,
- const css::uno::Reference< css::frame::XStatusListener > & xSingleListener,
- const OUString & rFeatureDescriptor = OUString() );
+ const css::uno::Reference< css::frame::XStatusListener > & xSingleListener );
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1b956fb8855f..19f48e5c224e 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1522,7 +1522,7 @@ VclPtr<SvxAbstractNewTableDialog> AbstractDialogFactory_Impl::CreateSvxNewTableD
}
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateOptionsDialog(
- vcl::Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ )
+ vcl::Window* pParent, const OUString& rExtensionId )
{
return VclPtr<CuiVclAbstractDialog_Impl>::Create( VclPtr<OfaTreeOptionsDialog>::Create( pParent, rExtensionId ) );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 69ec922558aa..e333254d3cc8 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -622,7 +622,7 @@ public:
virtual VclPtr<SvxAbstractNewTableDialog> CreateSvxNewTableDialog() override ;
virtual VclPtr<VclAbstractDialog> CreateOptionsDialog(
- vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) override;
+ vcl::Window* pParent, const OUString& rExtensionId ) override;
virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) override;
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 7e96da269a4b..0d3add13f1a6 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -298,7 +298,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain
}
catch( const Exception& )
{
- xReturn = new Veto( OUString(), ::cppu::getCaughtException() );
+ xReturn = new Veto( ::cppu::getCaughtException() );
}
return xReturn;
}
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index 5d3f3bf5c8ca..63a0748b24af 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -35,11 +35,10 @@ namespace dbaccess
class Veto : public Veto_Base
{
private:
- const OUString m_sReason;
const css::uno::Any m_aDetails;
public:
- Veto( const OUString& _rReason, const css::uno::Any& _rDetails );
+ Veto( const css::uno::Any& _rDetails );
virtual OUString SAL_CALL getReason() override;
virtual css::uno::Any SAL_CALL getDetails() override;
diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index 81331252cfbc..d716fa364766 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -26,9 +26,8 @@ namespace dbaccess
using ::com::sun::star::uno::RuntimeException;
// Veto
- Veto::Veto( const OUString& _rReason, const Any& _rDetails )
- :m_sReason( _rReason )
- ,m_aDetails( _rDetails )
+ Veto::Veto( const Any& _rDetails )
+ :m_aDetails( _rDetails )
{
}
@@ -38,7 +37,7 @@ namespace dbaccess
OUString SAL_CALL Veto::getReason()
{
- return m_sReason;
+ return OUString();
}
Any SAL_CALL Veto::getDetails()
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 7897e6692227..5262a422fff2 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1055,7 +1055,7 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
Reference<document::XDocumentProperties> xProp(
aPreview, UNO_QUERY);
if ( xProp.is() )
- m_aDocumentInfo->fill(xProp,OUString());
+ m_aDocumentInfo->fill(xProp);
}
}
else
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 5b59928037ab..dfc2631f9c1e 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -73,7 +73,7 @@ OCollectionView::OCollectionView( vcl::Window * pParent
get(m_pPB_OK, "ok");
OSL_ENSURE(m_xContent.is(),"No valid content!");
- m_pView->Initialize(m_xContent,OUString());
+ m_pView->Initialize(m_xContent);
m_pFTCurrentPath->SetStyle( m_pFTCurrentPath->GetStyle() | WB_PATHELLIPSIS );
initCurrentPath();
@@ -132,7 +132,7 @@ IMPL_LINK_NOARG(OCollectionView, Save_Click, Button*, void)
xChild.set(m_xContent,UNO_QUERY);
}
}
- m_pView->Initialize(m_xContent,OUString());
+ m_pView->Initialize(m_xContent);
initCurrentPath();
}
sSubFolder = sName.copy(0,nIndex-1);
@@ -201,7 +201,7 @@ IMPL_LINK_NOARG(OCollectionView, NewFolder_Click, Button*, void)
{
Reference<XHierarchicalNameContainer> xNameContainer(m_xContent,UNO_QUERY);
if ( dbaui::insertHierachyElement(this,m_xContext,xNameContainer,OUString(),m_bCreateForm) )
- m_pView->Initialize(m_xContent,OUString());
+ m_pView->Initialize(m_xContent);
}
catch( const SQLException& )
{
@@ -224,7 +224,7 @@ IMPL_LINK_NOARG(OCollectionView, Up_Click, Button*, void)
if ( xNameAccess.is() )
{
m_xContent.set(xNameAccess,UNO_QUERY);
- m_pView->Initialize(m_xContent,OUString());
+ m_pView->Initialize(m_xContent);
initCurrentPath();
}
else
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView, SvTreeListBox*, bool)
if ( xContent.is() )
{
m_xContent = xContent;
- m_pView->Initialize(m_xContent,OUString());
+ m_pView->Initialize(m_xContent);
initCurrentPath();
}
}
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 120125be6c89..0a8320a9b1d9 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -126,9 +126,8 @@ namespace dbaui
// export data
ORTFImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor,
const css::uno::Reference< css::uno::XComponentContext >& _rM,
- const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF,
- const OUString& rExchange = OUString())
- : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {};
+ const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF)
+ : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,OUString()) {};
// import data
ORTFImportExport( const SharedConnection& _rxConnection,
@@ -170,8 +169,7 @@ namespace dbaui
// export data
OHTMLImportExport( const svx::ODataAccessDescriptor& _aDataDescriptor,
const css::uno::Reference< css::uno::XComponentContext >& _rM,
- const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF,
- const OUString& rExchange = OUString());
+ const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF);
// import data
OHTMLImportExport( const SharedConnection& _rxConnection,
const css::uno::Reference< css::util::XNumberFormatter >& _rxNumberF,
@@ -206,8 +204,7 @@ namespace dbaui
ORowSetImportExport(vcl::Window* _pParent,
const css::uno::Reference< css::sdbc::XResultSetUpdate >& _xResultSetUpdate,
const svx::ODataAccessDescriptor& _aDataDescriptor,
- const css::uno::Reference< css::uno::XComponentContext >& _rM,
- const OUString& rExchange = OUString());
+ const css::uno::Reference< css::uno::XComponentContext >& _rM);
virtual bool Write() override;
virtual bool Read() override;
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 944b8b6d631c..e178dea9416c 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -41,10 +41,9 @@ using namespace ::com::sun::star::lang;
ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent,
const Reference< XResultSetUpdate >& _xResultSetUpdate,
const svx::ODataAccessDescriptor& _aDataDescriptor,
- const Reference< XComponentContext >& _rM,
- const OUString& rExchange
+ const Reference< XComponentContext >& _rM
)
- : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr,rExchange)
+ : ODatabaseImportExport(_aDataDescriptor,_rM,nullptr,OUString())
,m_xTargetResultSetUpdate(_xResultSetUpdate)
,m_xTargetRowUpdate(_xResultSetUpdate,UNO_QUERY)
,m_pParent(_pParent)
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index e2edd92abd4e..982d2bad9800 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -625,9 +625,8 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
OHTMLImportExport::OHTMLImportExport(const svx::ODataAccessDescriptor& _aDataDescriptor,
const Reference< XComponentContext >& _rM,
- const Reference< css::util::XNumberFormatter >& _rxNumberF,
- const OUString& rExchange)
- : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange)
+ const Reference< css::util::XNumberFormatter >& _rxNumberF)
+ : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,OUString())
,m_nIndent(0)
#if OSL_DEBUG_LEVEL > 0
,m_bCheckFont(false)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index 9fa51f091500..7f5fb4c59ed1 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -47,9 +47,8 @@ OQueryTableConnectionData::OQueryTableConnectionData( const OQueryTableConnectio
}
OQueryTableConnectionData::OQueryTableConnectionData(const TTableWindowData::value_type& _pReferencingTable,
- const TTableWindowData::value_type& _pReferencedTable,
- const OUString& rConnName)
- : OTableConnectionData( _pReferencingTable,_pReferencedTable, rConnName )
+ const TTableWindowData::value_type& _pReferencedTable)
+ : OTableConnectionData( _pReferencingTable,_pReferencedTable, OUString() )
, m_nFromEntryIndex(0)
, m_nDestEntryIndex(0)
, m_eJoinType (INNER_JOIN)
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 6d590cfccbb4..c7137eb5e81b 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -43,8 +43,7 @@ namespace dbaui
public:
OQueryTableConnectionData();
OQueryTableConnectionData( const OQueryTableConnectionData& rConnData );
- OQueryTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,const TTableWindowData::value_type& _pReferencedTable,
- const OUString& rConnName=OUString());
+ OQueryTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,const TTableWindowData::value_type& _pReferencedTable );
virtual ~OQueryTableConnectionData() override;
virtual void CopyFrom(const OTableConnectionData& rSource) override;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 676e94283661..0c2d527055a1 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -875,7 +875,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleOptionsBtn, Button*, void)
if ( pFact )
{
OUString sExtensionId = m_pExtensionBox->GetEntryData( nActive )->m_xPackage->getIdentifier().Value;
- ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId, OUString() ));
+ ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateOptionsDialog( this, sExtensionId ));
pDlg->Execute();
}
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index a7906c3694e1..ad372fa73297 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -215,7 +215,7 @@ BackendImpl::BackendImpl(
//can be removed. This works now, because the extension manager is a singleton
//and the backends are only create once per process.
std::list<OUString> folders = m_backendDb->getAllDataUrls();
- deleteUnusedFolders(OUString(), folders);
+ deleteUnusedFolders(folders);
configmgrini_verify_init( xCmdEnv );
@@ -699,7 +699,7 @@ void BackendImpl::PackageImpl::processPackage_(
ConfigurationBackendDb::Data data;
if (!m_isSchema)
{
- const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
+ const OUString sModFolder = that->createFolder(xCmdEnv);
bool out_replaced = false;
url = replaceOrigin(url, sModFolder, xCmdEnv, that->getComponentContext(), out_replaced);
if (out_replaced)
@@ -755,7 +755,7 @@ void BackendImpl::PackageImpl::processPackage_(
ConfigurationBackendDb::Data data;
if (!schema)
{
- const OUString sModFolder = that->createFolder(OUString(), xCmdEnv);
+ const OUString sModFolder = that->createFolder(xCmdEnv);
bool out_replaced = false;
url_replaced = replaceOrigin(
url2, sModFolder, xCmdEnv, that->getComponentContext(), out_replaced);
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 645f7df694d4..1e7de838735e 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -212,10 +212,9 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
}
OUString PackageRegistryBackend::createFolder(
- OUString const & relUrl,
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
- const OUString sDataFolder = makeURL(getCachePath(), relUrl);
+ const OUString sDataFolder = makeURL(getCachePath(), OUString());
//make sure the folder exist
ucbhelper::Content dataContent;
::dp_misc::create_folder(&dataContent, sDataFolder, xCmdEnv);
@@ -252,12 +251,11 @@ void PackageRegistryBackend::deleteTempFolder(
//then created a Folder with a same name and a trailing '_'
//If the folderURL has no '_' then there is no corresponding tmp file.
void PackageRegistryBackend::deleteUnusedFolders(
- OUString const & relUrl,
std::list< OUString> const & usedFolders)
{
try
{
- const OUString sDataFolder = makeURL(getCachePath(), relUrl);
+ const OUString sDataFolder = makeURL(getCachePath(), OUString());
::ucbhelper::Content tempFolder(
sDataFolder, Reference<ucb::XCommandEnvironment>(), m_xComponentContext);
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 4eba37cf3243..42c35400fd3f 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -148,7 +148,7 @@ BackendImpl::BackendImpl(
//can be removed. This works now, because the extension manager is a singleton
//and the backends are only create once per process.
std::list<OUString> folders = m_backendDb->getAllDataUrls();
- deleteUnusedFolders(OUString(), folders);
+ deleteUnusedFolders(folders);
}
}
@@ -369,7 +369,7 @@ void BackendImpl::implProcessHelp(
if (!package->extensionContainsCompiledHelp())
{
#if HAVE_FEATURE_DESKTOP
- const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
+ const OUString sHelpFolder = createFolder(xCmdEnv);
data.dataUrl = sHelpFolder;
Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess();
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index a315c143b070..2fc4c81a52a7 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -247,7 +247,6 @@ protected:
at a location relative to that folder specified by url.
*/
OUString createFolder(
- OUString const & relUrl,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv);
/* deletes folders and files.
@@ -255,7 +254,6 @@ protected:
not used are deleted.
*/
void deleteUnusedFolders(
- OUString const & relUrl,
std::list< OUString> const & usedFolders);
/* deletes one folder with a "temporary" name and the corresponding
tmp file, which was used to derive the folder name.
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index b1410319c3ee..bfd8b329f4b4 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1378,13 +1378,13 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallback
pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
}
-sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong OutlinerView::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
{
sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
ESelection aOldSel = pEditView->GetSelection();
aOldSel.Adjust();
- sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, pHTTPHeaderAttrs );
+ sal_uLong nRet = pEditView->Read( rInput, OUString(), eFormat, pHTTPHeaderAttrs );
long nParaDiff = pEditView->GetEditEngine()->GetParagraphCount() - nOldParaCount;
sal_Int32 nChangesStart = aOldSel.nStartPara;
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 1196afd70742..4bb4ef189a1a 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -127,21 +127,15 @@ namespace frm
}
}
- Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName )
+ Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL )
{
Reference< XDispatch > xDispatcher;
if ( m_xFirstDispatchInterceptor.is() )
- xDispatcher = m_xFirstDispatchInterceptor->queryDispatch( _rURL, _rTargetFrameName, 0 );
+ xDispatcher = m_xFirstDispatchInterceptor->queryDispatch( _rURL, OUString(), 0 );
return xDispatcher;
}
- Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL )
- {
- return queryDispatch( _rURL, OUString() );
- }
-
-
Reference< XDispatch > ControlFeatureInterception::queryDispatch( const sal_Char* _pAsciiURL )
{
return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) );
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index b757e20ca198..80d3a2cab8f0 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -68,11 +68,6 @@ namespace frm
// XComponent
void SAL_CALL dispose();
- /** queries the interceptor chain for the given dispatch
- */
- css::uno::Reference< css::frame::XDispatch >
- queryDispatch( const css::util::URL& _rURL, const OUString& _rTargetFrameName );
-
/** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags
*/
css::uno::Reference< css::frame::XDispatch >
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 06b21e38ec21..8d570919fcc7 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -259,7 +259,7 @@ public:
void AdjustHeight( long nDY );
- sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs );
+ sal_uLong Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs );
void InsertText( const OUString& rNew, bool bSelect = false );
void InsertText( const OutlinerParaObject& rParaObj );
diff --git a/include/oox/mathml/importutils.hxx b/include/oox/mathml/importutils.hxx
index 8481cb9a32b7..6beacf9e8795 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -133,8 +133,7 @@ public:
struct OOX_DLLPUBLIC Tag
{
Tag( int token = XML_TOKEN_INVALID,
- const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >(),
- const OUString& text = OUString());
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& attributes = css::uno::Reference< css::xml::sax::XFastAttributeList >());
Tag( int token,
const AttributeList& attribs);
int token; ///< tag type, or XML_TOKEN_INVALID
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 14e93052b5be..35aaa384a15c 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -153,7 +153,7 @@ public:
virtual VclPtr<VclAbstractDialog> CreateScriptErrorDialog( const css::uno::Any& rException ) = 0;
virtual VclPtr<VclAbstractDialog> CreateOptionsDialog(
- vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0;
+ vcl::Window* pParent, const OUString& rExtensionId ) = 0;
};
#endif
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx
index 78c8bd6dca45..c4e48d697a12 100644
--- a/include/svtools/DocumentInfoPreview.hxx
+++ b/include/svtools/DocumentInfoPreview.hxx
@@ -50,9 +50,7 @@ public:
void clear();
- void fill(
- css::uno::Reference< css::document::XDocumentProperties > const & xDocProps,
- OUString const & rURL);
+ void fill(css::uno::Reference< css::document::XDocumentProperties > const & xDocProps);
private:
VclPtr<ExtMultiLineEdit> m_pEditWin;
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 1def65a885a2..4463bedd6116 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -121,8 +121,7 @@ public:
/** initializes the view with the content of a folder given by an UCB content
*/
- bool Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent,
- const OUString& rFilter );
+ bool Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent );
/** reads the current content of the current folder again, and applies the given filter to it
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 6693bc20328d..b63fd66fcaad 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -339,7 +339,6 @@ public:
bool IsCached(
OutputDevice* pOut,
- const Point& rPt,
const Size& rSz,
const GraphicAttr* pAttr,
GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index cf227635abc2..e257fc55f69d 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -39,13 +39,11 @@ public:
const OUString& rImageURL,
const OUString& rTargetURL,
const OUString& rTargetFrame,
- const OUString& rAlternateText,
- const Size& rSizePixel )
+ const OUString& rAlternateText )
: aImageURL( rImageURL ),
aTargetURL( rTargetURL ),
aTargetFrame( rTargetFrame ),
- aAlternateText( rAlternateText ),
- aSizePixel( rSizePixel )
+ aAlternateText( rAlternateText )
{}
INetImage()
{}
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index ed97abd3a0ad..7333f27dc352 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -141,10 +141,9 @@ sal_Unicode XmlStream::AttributeList::attribute( int token, sal_Unicode def ) co
return def;
}
-XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a, const OUString& txt )
+XmlStream::Tag::Tag( int t, const uno::Reference< xml::sax::XFastAttributeList >& a )
: token( t )
, attributes( AttributeListBuilder( a ))
-, text( txt )
{
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index c57182f1ca13..26deaffc2e23 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1410,7 +1410,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
{
// mba: clipboard always must contain absolute URLs (could be from alien source)
- pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, mpDocSh->GetHeaderAttributes() );
+ pOLV->Read( *xStm, EE_FORMAT_BIN, mpDocSh->GetHeaderAttributes() );
bReturn = true;
}
}
@@ -1446,7 +1446,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) )
{
// mba: clipboard always must contain absolute URLs (could be from alien source)
- pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, mpDocSh->GetHeaderAttributes() );
+ pOLV->Read( *xStm, EE_FORMAT_RTF, mpDocSh->GetHeaderAttributes() );
bReturn = true;
}
}
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index cab3eb118a47..f8f2c9a1742b 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -79,8 +79,7 @@ void ODocumentInfoPreview::clear() {
}
void ODocumentInfoPreview::fill(
- css::uno::Reference< css::document::XDocumentProperties > const & xDocProps,
- OUString const & rURL)
+ css::uno::Reference< css::document::XDocumentProperties > const & xDocProps)
{
assert(xDocProps.is());
@@ -98,19 +97,6 @@ void ODocumentInfoPreview::fill(
DI_KEYWORDS,
comphelper::string::convertCommaSeparated(xDocProps->getKeywords()));
insertNonempty(DI_DESCRIPTION, xDocProps->getDescription());
- if (!rURL.isEmpty()) {
- insertNonempty(
- DI_SIZE, CreateExactSizeText(utl::UCBContentHelper::GetSize(rURL)));
- INetContentType eTypeID = INetContentTypes::GetContentTypeFromURL(rURL);
- if(eTypeID == CONTENT_TYPE_APP_OCTSTREAM)
- {
- insertNonempty( DI_MIMETYPE, SvFileInformationManager::GetDescription(INetURLObject(rURL)));
- }
- else
- {
- insertNonempty( DI_MIMETYPE, INetContentTypes::GetPresentation(eTypeID, m_aLanguageTag));
- }
- }
// User-defined (custom) properties:
css::uno::Reference< css::beans::XPropertySet > user(
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 64c7b2a7ebfe..0c75869623a1 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1112,7 +1112,7 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
}
-bool SvtFileView::Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent, const OUString& rFilter )
+bool SvtFileView::Initialize( const css::uno::Reference< css::ucb::XContent>& _xContent )
{
WaitObject aWaitCursor( this );
@@ -1123,7 +1123,7 @@ bool SvtFileView::Initialize( const css::uno::Reference< css::ucb::XContent>& _x
if ( eResult != eSuccess )
return false;
- mpImpl->FilterFolderContent_Impl( rFilter );
+ mpImpl->FilterFolderContent_Impl( OUString() );
mpImpl->SortFolderContent_Impl(); // possibly not necessary!!!!!!!!!!
mpImpl->CreateDisplayText_Impl();
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index c271fd4d5720..51a8abad1704 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -423,14 +423,14 @@ void GraphicObject::FireSwapOutRequest()
ImplAutoSwapOutHdl( nullptr );
}
-bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+bool GraphicObject::IsCached( OutputDevice* pOut, const Size& rSz,
const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) const
{
bool bRet;
if( nFlags & GraphicManagerDrawFlags::CACHED )
{
- Point aPt( rPt );
+ Point aPt;
Size aSz( rSz );
if ( pAttr && pAttr->IsCropped() )
{
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index fce675b9225d..75cb237c5f36 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -589,7 +589,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
if( pVSh )
{
GraphicAttr aAttr;
- if( pNd->GetGrfObj().IsCached( pVSh->GetOut(), Point(),
+ if( pNd->GetGrfObj().IsCached( pVSh->GetOut(),
Prt().SSize(), &pNd->GetGraphicAttr( aAttr, this ) ))
{
for(SwViewShell& rShell : pVSh->GetRingContainer())
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index b2428735bee8..57270b8e2a31 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -478,7 +478,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
else if( !rURL.GetURL().isEmpty() )
m_pTargetURL = new INetImage( aEmptyOUStr, rURL.GetURL(),
rURL.GetTargetFrameName(),
- aEmptyOUStr, Size() );
+ aEmptyOUStr );
}
}
@@ -1004,7 +1004,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut )
{
m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
rURL.GetTargetFrameName(),
- aEmptyOUStr, Size() );
+ aEmptyOUStr );
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}
@@ -3142,7 +3142,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
{
m_pTargetURL = new INetImage( sGrfNm, rURL.GetURL(),
rURL.GetTargetFrameName(),
- aEmptyOUStr, Size() );
+ aEmptyOUStr );
AddFormat( SotClipboardFormatId::INET_IMAGE );
}
}
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 18f0e5e37d10..79121f2239e4 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -152,7 +152,7 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV)
pTargetURL = new INetImage( bLink ? sGrfName : OUString(),
rURL.GetURL(),
rURL.GetTargetFrameName(),
- OUString(), Size() );
+ OUString() );
}
}
More information about the Libreoffice-commits
mailing list