ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use more string_view in INetURLObject

Browse Source 
Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-04-29 08:53:22 +02:00
parent f9b6bd6336
commit d3849255b7
189 changed files with 430 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
avmedia/source/viewer/mediawindow.cxx
+1 -1
View File
@@ -302,7 +302,7 @@ void MediaWindow::executeFormatErrorBox(weld::Window* pParent)
xBox->run();
}
bool MediaWindow::isMediaURL(const OUString& rURL, const OUString& rReferer, bool bDeep, rtl::Reference<PlayerListener> xPreferredPixelSizeListener)
bool MediaWindow::isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep, rtl::Reference<PlayerListener> xPreferredPixelSizeListener)
{
const INetURLObject aURL( rURL );
basctl/source/basicide/baside2b.cxx
+1
View File
@@ -65,6 +65,7 @@
#include <vector>
#include <com/sun/star/reflection/theCoreReflection.hpp>
#include <unotools/charclass.hxx>
#include <o3tl/string_view.hxx>
#include "textwindowpeer.hxx"
#include "uiobject.hxx"
basctl/source/basicide/baside3.cxx
+1 -1
View File
@@ -682,7 +682,7 @@ void DialogWindow::SaveDialog()
if( bResource )
{
INetURLObject aURLObj("");
INetURLObject aURLObj(u"");
aURLObj.removeExtension();
OUString aDialogName( aURLObj.getName() );
aURLObj.removeSegment();
basic/source/basmgr/basicmanagerrepository.cxx
+3 -2
View File
@@ -27,6 +27,7 @@
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <o3tl/string_view.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/pathoptions.hxx>
@@ -284,7 +285,7 @@ namespace basic
// The first dir in the path as destination:
OUString aFileName( aAppBasic.getName() );
aAppBasic = INetURLObject( aAppBasicDir.getToken(1, ';') );
aAppBasic = INetURLObject( o3tl::getToken(aAppBasicDir, 1, ';') );
DBG_ASSERT(aAppBasic.GetProtocol() != INetProtocol::NotValid,
OString("Invalid URL: \"" +
OUStringToOString(aAppBasicDir, osl_getThreadTextEncoding()) +
@@ -430,7 +431,7 @@ namespace basic
// Storage and BaseURL are only needed by binary documents!
tools::SvRef<SotStorage> xDummyStor = new SotStorage( OUString() );
_out_rpBasicManager.reset(new BasicManager( *xDummyStor, OUString() /* TODO/LATER: xStorage */,
_out_rpBasicManager.reset(new BasicManager( *xDummyStor, u"" /* TODO/LATER: xStorage */,
pAppBasic,
&aAppBasicDir, true ));
if ( !_out_rpBasicManager->GetErrors().empty() )
basic/source/basmgr/basmgr.cxx
+3 -3
View File
@@ -421,7 +421,7 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream )
return pInfo;
}
BasicManager::BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib, OUString const * pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
BasicManager::BasicManager( SotStorage& rStorage, std::u16string_view rBaseURL, StarBASIC* pParentFromStdLib, OUString const * pLibPath, bool bDocMgr ) : mbDocMgr( bDocMgr )
{
if( pLibPath )
{
@@ -630,7 +630,7 @@ void BasicManager::ImpCreateStdLib( StarBASIC* pParentFromStdLib )
pStdLib->SetFlag( SbxFlagBits::DontStore | SbxFlagBits::ExtSearch );
}
void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL )
void BasicManager::LoadBasicManager( SotStorage& rStorage, std::u16string_view rBaseURL )
{
tools::SvRef<SotStorageStream> xManagerStream = rStorage.OpenSotStream( szManagerStream, eStreamReadMode );
@@ -648,7 +648,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const OUString& rBase
OUString aRealStorageName = maStorageName; // for relative paths, can be modified through BaseURL
if ( !rBaseURL.isEmpty() )
if ( !rBaseURL.empty() )
{
INetURLObject aObj( rBaseURL );
if ( aObj.GetProtocol() == INetProtocol::File )
basic/source/inc/namecont.hxx
+2 -2
View File
@@ -224,7 +224,7 @@ protected:
void implStoreLibrary( SfxLibrary* pLib,
std::u16string_view rName,
const css::uno::Reference< css::embed::XStorage >& rStorage,
const OUString& rTargetURL,
std::u16string_view rTargetURL,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI,
const css::uno::Reference< css::task::XInteractionHandler >& rHandler );
@@ -234,7 +234,7 @@ protected:
// New variant for library export
void implStoreLibraryIndexFile( SfxLibrary* pLib, const ::xmlscript::LibDescriptor& rLib,
const css::uno::Reference< css::embed::XStorage >& xStorage,
const OUString& aTargetURL,
std::u16string_view aTargetURL,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI );
bool implLoadLibraryIndexFile( SfxLibrary* pLib,
basic/source/runtime/methods.cxx
+1 -1
View File
@@ -2582,7 +2582,7 @@ static bool implCheckWildcard(std::u16string_view rName, SbiRTLData const& rRTLD
}
static bool isRootDir( const OUString& aDirURLStr )
static bool isRootDir( std::u16string_view aDirURLStr )
{
INetURLObject aDirURLObj( aDirURLStr );
bool bRoot = false;
basic/source/uno/namecont.cxx
+16 -15
View File
@@ -31,6 +31,7 @@
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <vcl/svapp.hxx>
#include <o3tl/string_view.hxx>
#include <osl/mutex.hxx>
#include <vcl/errinf.hxx>
#include <rtl/ustring.hxx>
@@ -733,11 +734,11 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
{
if( nPass == 1 )
{
pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(0, ';') ));
pLibInfoInetObj.reset(new INetURLObject( o3tl::getToken(maLibraryPath, 0, ';') ));
}
else
{
pLibInfoInetObj.reset(new INetURLObject( maLibraryPath.getToken(1, ';') ));
pLibInfoInetObj.reset(new INetURLObject( o3tl::getToken(maLibraryPath, 1, ';') ));
}
pLibInfoInetObj->insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All );
pLibInfoInetObj->setExtension( u"xlc" );
@@ -757,7 +758,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
// Old variant?
if( !xInput.is() && nPass == 0 )
{
INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, ';') );
INetURLObject aLibInfoInetObj( o3tl::getToken(maLibraryPath, 1, ';') );
aLibInfoInetObj.insertName( maOldInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All );
aLibInfoInetObj.setExtension( u"xli" );
aFileName = aLibInfoInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
@@ -830,7 +831,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
else if( rLib.bLink )
{
// Check "share" path
INetURLObject aShareInetObj( maLibraryPath.getToken(0, ';') );
INetURLObject aShareInetObj( o3tl::getToken(maLibraryPath, 0, ';') );
aShareInetObj.insertName( rLib.aName, true, INetURLObject::LAST_SEGMENT,
INetURLObject::EncodeMechanism::All );
OUString aShareLibDirPath = aShareInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
@@ -972,7 +973,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
if( meInitMode != DEFAULT )
return;
INetURLObject aUserBasicInetObj( maLibraryPath.getToken(1, ';') );
INetURLObject aUserBasicInetObj( o3tl::getToken(maLibraryPath, 1, ';') );
OUString aStandardStr("Standard");
INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj );
@@ -1320,7 +1321,7 @@ OUString SfxLibraryContainer::createAppLibraryFolder( SfxLibrary* pLib, std::u16
OUString aLibDirPath = pLib->maStorageURL;
if( aLibDirPath.isEmpty() )
{
INetURLObject aInetObj( maLibraryPath.getToken(1, ';') );
INetURLObject aInetObj( o3tl::getToken(maLibraryPath, 1, ';') );
aInetObj.insertName( aName, true, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All );
checkStorageURL( aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), pLib->maLibInfoFileURL,
pLib->maStorageURL, pLib->maUnexpandedStorageURL );
@@ -1347,14 +1348,14 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
{
Reference< XSimpleFileAccess3 > xDummySFA;
Reference< XInteractionHandler > xDummyHandler;
implStoreLibrary( pLib, aName, xStorage, OUString(), xDummySFA, xDummyHandler );
implStoreLibrary( pLib, aName, xStorage, u"", xDummySFA, xDummyHandler );
}
// New variant for library export
void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
std::u16string_view aName,
const uno::Reference< embed::XStorage >& xStorage,
const OUString& aTargetURL,
std::u16string_view aTargetURL,
const Reference< XSimpleFileAccess3 >& rToUseSFI,
const Reference< XInteractionHandler >& xHandler )
{
@@ -1415,7 +1416,7 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
else
{
// Export?
bool bExport = !aTargetURL.isEmpty();
bool bExport = !aTargetURL.empty();
try
{
Reference< XSimpleFileAccess3 > xSFI = mxSFI;
@@ -1499,14 +1500,14 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
const uno::Reference< embed::XStorage >& xStorage )
{
Reference< XSimpleFileAccess3 > xDummySFA;
implStoreLibraryIndexFile( pLib, rLib, xStorage, OUString(), xDummySFA );
implStoreLibraryIndexFile( pLib, rLib, xStorage, u"", xDummySFA );
}
// New variant for library export
void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
const ::xmlscript::LibDescriptor& rLib,
const uno::Reference< embed::XStorage >& xStorage,
const OUString& aTargetURL,
std::u16string_view aTargetURL,
const Reference< XSimpleFileAccess3 >& rToUseSFI )
{
// Create sax writer
@@ -1548,7 +1549,7 @@ void SfxLibraryContainer::implStoreLibraryIndexFile( SfxLibrary* pLib,
else
{
// Export?
bool bExport = !aTargetURL.isEmpty();
bool bExport = !aTargetURL.empty();
Reference< XSimpleFileAccess3 > xSFI = mxSFI;
if( rToUseSFI.is() )
{
@@ -2053,7 +2054,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
else
{
// Create Output stream
INetURLObject aLibInfoInetObj( maLibraryPath.getToken(1, ';') );
INetURLObject aLibInfoInetObj( o3tl::getToken(maLibraryPath, 1, ';') );
aLibInfoInetObj.insertName( maInfoFileName, false, INetURLObject::LAST_SEGMENT, INetURLObject::EncodeMechanism::All );
aLibInfoInetObj.setExtension( u"xlc" );
OUString aLibInfoPath( aLibInfoInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
@@ -2244,7 +2245,7 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name )
catch(const Exception& ) {}
// Delete folder if empty
INetURLObject aInetObj( maLibraryPath.getToken(1, ';') );
INetURLObject aInetObj( o3tl::getToken(maLibraryPath, 1, ';') );
aInetObj.insertName( Name, true, INetURLObject::LAST_SEGMENT,
INetURLObject::EncodeMechanism::All );
OUString aLibDirPath = aInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
@@ -2501,7 +2502,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU
OUString aLibDirPath = pImplLib->maStorageURL;
INetURLObject aDestInetObj( maLibraryPath.getToken(1, ';'));
INetURLObject aDestInetObj( o3tl::getToken(maLibraryPath, 1, ';'));
aDestInetObj.insertName( NewName, true, INetURLObject::LAST_SEGMENT,
INetURLObject::EncodeMechanism::All );
OUString aDestDirPath = aDestInetObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
connectivity/source/drivers/dbase/DTable.cxx
+1 -1
View File
@@ -1418,7 +1418,7 @@ bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
return true;
}
bool ODbaseTable::Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, OCollection* _pIndexes )
bool ODbaseTable::Drop_Static(std::u16string_view _sUrl, bool _bHasMemoFields, OCollection* _pIndexes )
{
INetURLObject aURL;
aURL.SetURL(_sUrl);
connectivity/source/inc/dbase/DTable.hxx
+1 -1
View File
@@ -182,7 +182,7 @@ namespace connectivity::dbase
virtual void dropColumn(sal_Int32 _nPos) override;
static OUString getEntry(file::OConnection const * _pConnection, std::u16string_view _sURL );
static bool Drop_Static(const OUString& _sUrl, bool _bHasMemoFields, sdbcx::OCollection* _pIndexes );
static bool Drop_Static(std::u16string_view _sUrl, bool _bHasMemoFields, sdbcx::OCollection* _pIndexes );
virtual void refreshHeader() override;
cui/source/dialogs/AdditionsDialog.cxx
+1 -1
View File
@@ -229,7 +229,7 @@ bool getPreviewFile(const AdditionInfo& aAdditionInfo, OUString& sPreviewFile)
return true;
}
void LoadImage(const OUString& rPreviewFile, std::shared_ptr<AdditionsItem> pCurrentItem)
void LoadImage(std::u16string_view rPreviewFile, std::shared_ptr<AdditionsItem> pCurrentItem)
{
const sal_Int8 Margin = 6;
cui/source/dialogs/cuigaldlg.cxx
+1 -1
View File
@@ -620,7 +620,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
m_xCbxPreview->set_sensitive(false);
}
void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult )
void TPGalleryThemeProperties::StartSearchFiles( std::u16string_view _rFolderURL, short _nDlgResult )
{
if ( RET_OK == _nDlgResult )
{
cui/source/dialogs/hldocntp.cxx
+1 -1
View File
@@ -66,7 +66,7 @@ struct DocumentTypeData
}
bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const
bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, std::u16string_view rBase, INetURLObject& aURLObject ) const
{
bool bIsValidURL = !rPath.isEmpty();
if ( bIsValidURL )
cui/source/dialogs/hldoctp.cxx
+1 -1
View File
@@ -304,7 +304,7 @@ void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark )
|* retrieve kind of pathstr
|*
|************************************************************************/
SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rStrPath )
SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( std::u16string_view rStrPath )
{
INetURLObject aURL( rStrPath, INetProtocol::File );
cui/source/dialogs/scriptdlg.cxx
+2 -2
View File
@@ -298,9 +298,9 @@ void SvxScriptOrgDialog::RequestSubEntries(const weld::TreeIter& rRootEntry, Ref
void SvxScriptOrgDialog::insertEntry(const OUString& rText, const OUString& rBitmap,
const weld::TreeIter* pParent, bool bChildrenOnDemand, std::unique_ptr<SFEntry> && aUserData,
const OUString& factoryURL, bool bSelect)
std::u16string_view factoryURL, bool bSelect)
{
if (rBitmap == RID_CUIBMP_DOC && !factoryURL.isEmpty())
if (rBitmap == RID_CUIBMP_DOC && !factoryURL.empty())
{
OUString aImage = SvFileInformationManager::GetFileImageId(INetURLObject(factoryURL));
insertEntry(rText, aImage, pParent, bChildrenOnDemand, std::move(aUserData), bSelect);
cui/source/inc/cuigaldlg.hxx
+1 -1
View File
@@ -268,7 +268,7 @@ public:
void SetXChgData( ExchangeData* pData );
const ExchangeData* GetXChgData() const { return pData; }
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
void StartSearchFiles( std::u16string_view _rFolderURL, short _nDlgResult );
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
};
cui/source/inc/hldocntp.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ private:
std::unique_ptr<weld::Button> m_xBtCreate;
std::unique_ptr<weld::TreeView> m_xLbDocTypes;
bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const;
bool ImplGetURLObject( const OUString& rPath, std::u16string_view rBase, INetURLObject& aURLObject ) const;
void FillDocumentList ();
DECL_LINK (ClickNewHdl_Impl, weld::Button&, void );
cui/source/inc/hldoctp.hxx
+1 -1
View File
@@ -49,7 +49,7 @@ private:
DECL_LINK( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout
enum class EPathType { Invalid, ExistsFile };
static EPathType GetPathType ( const OUString& rStrPath );
static EPathType GetPathType ( std::u16string_view rStrPath );
void FillDlgFields(const OUString& rStrURL) override;
void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
cui/source/inc/scriptdlg.hxx
+1 -1
View File
@@ -124,7 +124,7 @@ protected:
const weld::TreeIter* pParent,
bool bChildrenOnDemand,
std::unique_ptr< SFEntry > && aUserData,
const OUString& factoryURL, bool bSelect);
std::u16string_view factoryURL, bool bSelect);
void insertEntry(OUString const & rText, OUString const & rBitmap,
const weld::TreeIter* pParent,
bool bChildrenOnDemand,
cui/source/options/personalization.cxx
+1 -1
View File
@@ -130,7 +130,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
m_vDefaultPersonaSettings.push_back(aPersonaSetting);
INetURLObject aURLObj(gallery + aPreviewFile);
INetURLObject aURLObj(rtl::OUStringConcatenation(gallery + aPreviewFile));
aFilter.ImportGraphic(aGraphic, aURLObj);
Size aSize(aGraphic.GetSizePixel());
dbaccess/source/core/dataaccess/databaseregistrations.cxx
+3 -3
View File
@@ -100,7 +100,7 @@ namespace dbaccess
::utl::OConfigurationNode
impl_checkValidName_throw_must_not_exist(const OUString& _rName);
void impl_checkValidLocation_throw( const OUString& _rLocation );
void impl_checkValidLocation_throw( std::u16string_view _rLocation );
/** retrieves the configuration node whose "Name" sub node has the given value
@@ -221,9 +221,9 @@ namespace dbaccess
return impl_getNodeForName_throw_must_not_exist(_rName);
}
void DatabaseRegistrations::impl_checkValidLocation_throw( const OUString& _rLocation )
void DatabaseRegistrations::impl_checkValidLocation_throw( std::u16string_view _rLocation )
{
if ( _rLocation.isEmpty() )
if ( _rLocation.empty() )
throw IllegalArgumentException( OUString(), *this, 2 );
INetURLObject aURL( _rLocation );
dbaccess/source/ui/dlg/ConnectionHelper.cxx
+1 -1
View File
@@ -570,7 +570,7 @@ namespace dbaui
commitURL();
}
bool OConnectionHelper::createDirectoryDeep(const OUString& _rPathURL)
bool OConnectionHelper::createDirectoryDeep(std::u16string_view _rPathURL)
{
// get a URL object analyzing the URL for us ...
INetURLObject aParser;
dbaccess/source/ui/dlg/ConnectionHelper.hxx
+1 -1
View File
@@ -74,7 +74,7 @@ namespace dbaui
sal_Int32 checkPathExistence(const OUString& _rURL);
IS_PATH_EXIST pathExists(const OUString& _rURL, bool bIsFile) const;
bool createDirectoryDeep(const OUString& _rPathNormalized);
bool createDirectoryDeep(std::u16string_view _rPathNormalized);
bool commitURL();
/** opens the FileOpen dialog and asks for a FileName
dbaccess/source/ui/dlg/dbwizsetup.cxx
+1 -1
View File
@@ -755,7 +755,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
m_pImpl->saveChanges(*m_pOutSet);
}
void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const OUString& _sPath)
void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(std::u16string_view _sPath)
{
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
Reference< XDatabaseContext > xDatabaseContext( DatabaseContext::create(getORB()) );
dbaccess/source/ui/inc/dbwizsetup.hxx
+1 -1
View File
@@ -147,7 +147,7 @@ private:
*/
void declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const vcl::RoadmapWizardTypes::WizardPath& _rPaths);
void RegisterDataSourceByLocation(const OUString& sPath);
void RegisterDataSourceByLocation(std::u16string_view sPath);
bool SaveDatabaseDocument();
void activateDatabasePath();
OUString createUniqueFileName(const INetURLObject& rURL);
desktop/source/migration/migration.cxx
+3 -3
View File
@@ -429,7 +429,7 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir)
void MigrationImpl::setInstallInfoIfExist(
install_info& aInfo,
const OUString& rConfigDir,
std::u16string_view rConfigDir,
const OUString& rVersion)
{
OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::DecodeMechanism::NONE));
@@ -470,11 +470,11 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions)
( aInfo.userdata.isEmpty() ||
aProfileName.equalsIgnoreAsciiCase(
utl::ConfigManager::getProductName() ) ) ) {
setInstallInfoIfExist(aInfo, aTopConfigDir + aProfileName, aVersion);
setInstallInfoIfExist(aInfo, OUStringConcatenation(aTopConfigDir + aProfileName), aVersion);
#if defined UNX && ! defined MACOSX
//try preXDG path if the new one does not exist
if ( aInfo.userdata.isEmpty())
setInstallInfoIfExist(aInfo, aPreXDGTopConfigDir + aProfileName, aVersion);
setInstallInfoIfExist(aInfo, OUStringConcatenation(aPreXDGTopConfigDir + aProfileName), aVersion);
#endif
}
}
desktop/source/migration/migration_impl.hxx
+1 -1
View File
@@ -159,7 +159,7 @@ private:
#if defined UNX && ! defined MACOSX
static OUString preXDGConfigDir(const OUString& rConfigDir);
#endif
static void setInstallInfoIfExist(install_info& aInfo, const OUString& rConfigDir, const OUString& rVersion);
static void setInstallInfoIfExist(install_info& aInfo, std::u16string_view rConfigDir, const OUString& rVersion);
static install_info findInstallation(const strings_v& rVersions);
strings_vr compileFileList();
drawinglayer/source/tools/emfpimage.cxx
+2 -2
View File
@@ -38,7 +38,7 @@ namespace emfplushelper
{
// non native formats
GraphicFilter filter;
filter.ImportGraphic(graphic, OUString(), s);
filter.ImportGraphic(graphic, u"", s);
SAL_INFO("drawinglayer.emf", "EMF+\tbitmap width: " << graphic.GetSizePixel().Width() << " height: " << graphic.GetSizePixel().Height());
}
}
@@ -58,7 +58,7 @@ namespace emfplushelper
GraphicFilter filter;
// workaround buggy metafiles, which have wrong mfSize set (n#705956 for example)
SvMemoryStream mfStream(const_cast<char *>(static_cast<char const *>(s.GetData()) + s.Tell()), dataSize, StreamMode::READ);
filter.ImportGraphic(graphic, OUString(), mfStream);
filter.ImportGraphic(graphic, u"", mfStream);
// debug code - write the stream to debug file /tmp/emf-stream.emf
#if OSL_DEBUG_LEVEL > 1
editeng/source/items/frmitems.cxx
+1 -1
View File
@@ -3208,7 +3208,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
std::unique_ptr<SvMemoryStream> const xMemStream(aGraphicURL.getData());
if (xMemStream)
{
if (ERRCODE_NONE == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, "", *xMemStream))
if (ERRCODE_NONE == GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, u"", *xMemStream))
{
bGraphicLoaded = true;
editeng/source/items/legacyitem.cxx
+2 -2
View File
@@ -573,7 +573,7 @@ namespace legacy
// TODO/MBA: how can we get a BaseURL here?!
OSL_FAIL("No BaseURL!");
OUString aAbs = INetURLObject::GetAbsURL( "", aRel );
OUString aAbs = INetURLObject::GetAbsURL( u"", aRel );
DBG_ASSERT( !aAbs.isEmpty(), "Invalid URL!" );
rItem.SetGraphicLink(aAbs);
}
@@ -616,7 +616,7 @@ namespace legacy
{
OSL_FAIL("No BaseURL!");
// TODO/MBA: how to get a BaseURL?!
OUString aRel = INetURLObject::GetRelURL( "", rItem.GetGraphicLink() );
OUString aRel = INetURLObject::GetRelURL( u"", rItem.GetGraphicLink() );
// UNICODE: rStrm << aRel;
rStrm.WriteUniOrByteString(aRel, rStrm.GetStreamCharSet());
}
extensions/source/propctrlr/defaultforminspection.cxx
+1 -1
View File
@@ -145,7 +145,7 @@ namespace pcr
{
pReturn->ProgrammaticName = OUString::createFromAscii( aCategories[i].programmaticName );
pReturn->UIName = PcrRes( aCategories[i].uiNameResId );
pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId );
pReturn->HelpURL = HelpIdUrl::getHelpURL( aCategories[i].helpId.asView() );
}
return aReturn;
extensions/source/propctrlr/pcrcommon.cxx
+2 -2
View File
@@ -34,7 +34,7 @@ namespace pcr
//= HelpIdUrl
OString HelpIdUrl::getHelpId( const OUString& _rHelpURL )
OString HelpIdUrl::getHelpId( std::u16string_view _rHelpURL )
{
INetURLObject aHID( _rHelpURL );
if ( aHID.GetProtocol() == INetProtocol::Hid )
@@ -44,7 +44,7 @@ namespace pcr
}
OUString HelpIdUrl::getHelpURL( const OUString & sHelpId )
OUString HelpIdUrl::getHelpURL( std::u16string_view sHelpId )
{
OUStringBuffer aBuffer;
INetURLObject aHID( sHelpId );
extensions/source/propctrlr/pcrcommon.hxx
+2 -2
View File
@@ -61,8 +61,8 @@ namespace pcr
class HelpIdUrl
{
public:
static OString getHelpId( const OUString& _rHelpURL );
static OUString getHelpURL( const OUString& );
static OString getHelpId( std::u16string_view _rHelpURL );
static OUString getHelpURL( std::u16string_view );
};
filter/source/graphic/GraphicExportFilter.cxx
+1 -1
View File
@@ -163,7 +163,7 @@ bool GraphicExportFilter::filterRenderDocument() const
SvMemoryStream aMemStream;
const GraphicConversionParameters aParameters(aTargetSizePixel, true, true);
const ErrCode nResult = rFilter.ExportGraphic( aGraphic.GetBitmapEx(aParameters), OUString(), aMemStream,
const ErrCode nResult = rFilter.ExportGraphic( aGraphic.GetBitmapEx(aParameters), u"", aMemStream,
nFilterFormat, &maFilterDataSequence );
if ( nResult == ERRCODE_NONE )
filter/source/msfilter/escherex.cxx
+2 -2
View File
@@ -4199,7 +4199,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
SvMemoryStream aGIFStream;
const char* const pString = "MSOFFICE9.0";
aGIFStream.WriteBytes(pString, strlen(pString));
nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aGIFStream,
nErrCode = rFilter.ExportGraphic( aGraphic, u"", aGIFStream,
rFilter.GetExportFormatNumberForShortName( u"GIF" ) );
SAL_WARN_IF(
nErrCode != ERRCODE_NONE, "filter.ms",
@@ -4218,7 +4218,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
aFilterProp.Name = "AdditionalChunks";
aFilterProp.Value <<= aAdditionalChunkSequence;
uno::Sequence<beans::PropertyValue> aFilterData{ aFilterProp };
nErrCode = rFilter.ExportGraphic( aGraphic, OUString(), aStream,
nErrCode = rFilter.ExportGraphic( aGraphic, u"", aStream,
rFilter.GetExportFormatNumberForShortName( u"PNG" ), &aFilterData );
}
}
filter/source/msfilter/msdffimp.cxx
+1 -1
View File
@@ -6643,7 +6643,7 @@ bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, tool
nRes = ERRCODE_NONE;
}
else
nRes = rGF.ImportGraphic( rData, "", *pGrStream );
nRes = rGF.ImportGraphic( rData, u"", *pGrStream );
// SJ: I40472, sometimes the aspect ratio (aMtfSize100) does not match and we get scaling problems,
// then it is better to use the prefsize that is stored within the metafile. Bug #72846# for what the
filter/source/svg/svgfilter.cxx
+1 -1
View File
@@ -231,7 +231,7 @@ bool SVGFilter::filterImpressOrDraw( const Sequence< PropertyValue >& rDescripto
GraphicFilter aGraphicFilter;
Graphic aGraphic;
const ErrCode nGraphicFilterErrorCode(
aGraphicFilter.ImportGraphic(aGraphic, OUString(), *aStream));
aGraphicFilter.ImportGraphic(aGraphic, u"", *aStream));
if(ERRCODE_NONE != nGraphicFilterErrorCode)
{
filter/source/xsltdialog/xmlfilterjar.cxx
+1 -1
View File
@@ -299,7 +299,7 @@ bool XMLFilterJarHelper::copyFiles( const Reference< XHierarchicalNameAccess >&
return bOk;
}
bool XMLFilterJarHelper::copyFile( const Reference< XHierarchicalNameAccess >& xIfc, OUString& rURL, const OUString& rTargetURL )
bool XMLFilterJarHelper::copyFile( const Reference< XHierarchicalNameAccess >& xIfc, OUString& rURL, std::u16string_view rTargetURL )
{
if( !rURL.matchIgnoreAsciiCase( sVndSunStarPackage ) )
return true;
filter/source/xsltdialog/xmlfilterjar.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ private:
/// @throws css::uno::Exception
void addFile( css::uno::Reference< css::uno::XInterface > const & xRootFolder, css::uno::Reference< css::lang::XSingleServiceFactory > const & xFactory, const OUString& rSourceFile );
static bool copyFile( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, OUString& rURL, const OUString& rTargetURL );
static bool copyFile( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, OUString& rURL, std::u16string_view rTargetURL );
bool copyFiles( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xIfc, filter_info_impl* pFilter );
css::uno::Reference< css::uno::XComponentContext > mxContext;
filter/source/xsltdialog/xmlfiltertestdialog.cxx
+1 -1
View File
@@ -199,7 +199,7 @@ void XMLFilterTestDialog::test( const filter_info_impl& rFilterInfo )
m_xDialog->run();
}
static OUString getFileNameFromURL( OUString const & rURL )
static OUString getFileNameFromURL( std::u16string_view rURL )
{
INetURLObject aURL( rURL );
OUString aName( aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset) );
forms/source/xforms/submission/submission.hxx
+1 -1
View File
@@ -114,7 +114,7 @@ public:
UNKNOWN_ERROR
};
CSubmission(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
CSubmission(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: m_aURLObj(aURL)
, m_aFragment(aFragment)
, m_xContext(::comphelper::getProcessComponentContext())
forms/source/xforms/submission/submission_get.cxx
+1 -1
View File
@@ -36,7 +36,7 @@ using namespace osl;
using namespace ucbhelper;
CSubmissionGet::CSubmissionGet(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
CSubmissionGet::CSubmissionGet(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
forms/source/xforms/submission/submission_get.hxx
+1 -1
View File
@@ -24,7 +24,7 @@
class CSubmissionGet : public CSubmission
{
public:
CSubmissionGet(const OUString& aURL,
CSubmissionGet(std::u16string_view aURL,
const css::uno::Reference<css::xml::dom::XDocumentFragment>& aFragment);
virtual SubmissionResult
submit(const css::uno::Reference<css::task::XInteractionHandler>& aInteractionHandler) override;
forms/source/xforms/submission/submission_post.cxx
+1 -1
View File
@@ -36,7 +36,7 @@ using namespace osl;
using namespace ucbhelper;
CSubmissionPost::CSubmissionPost(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
CSubmissionPost::CSubmissionPost(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
forms/source/xforms/submission/submission_post.hxx
+1 -1
View File
@@ -24,7 +24,7 @@
class CSubmissionPost : public CSubmission
{
public:
CSubmissionPost(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
CSubmissionPost(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment);
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& aInteractionHandler) override;
};
forms/source/xforms/submission/submission_put.cxx
+1 -1
View File
@@ -34,7 +34,7 @@ using namespace osl;
using namespace ucbhelper;
CSubmissionPut::CSubmissionPut(const OUString& aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
CSubmissionPut::CSubmissionPut(std::u16string_view aURL, const css::uno::Reference< css::xml::dom::XDocumentFragment >& aFragment)
: CSubmission(aURL, aFragment)
{
}
forms/source/xforms/submission/submission_put.hxx
+1 -1
View File
@@ -24,7 +24,7 @@
class CSubmissionPut : public CSubmission
{
public:
CSubmissionPut(const OUString& aURL,
CSubmissionPut(std::u16string_view aURL,
const css::uno::Reference<css::xml::dom::XDocumentFragment>& aFragment);
virtual SubmissionResult
submit(const css::uno::Reference<css::task::XInteractionHandler>& aInteractionHandler) override;
fpicker/source/office/fileview.cxx
+2 -2
View File
@@ -287,7 +287,7 @@ public:
void Clear();
FileViewResult GetFolderContent_Impl(
const OUString& rFolder,
std::u16string_view rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
const css::uno::Sequence< OUString >& rDenyList );
@@ -1172,7 +1172,7 @@ void SvtFileView_Impl::Clear()
}
FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
const OUString& rFolder,
std::u16string_view rFolder,
const FileViewAsyncAction* pAsyncDescriptor,
const css::uno::Sequence< OUString >& rDenyList )
{
fpicker/source/office/foldertree.cxx
+1 -1
View File
@@ -126,7 +126,7 @@ void FolderTree::FillTreeEntry( const OUString & rUrl, const ::std::vector< std:
m_xTreeView->expand_row(*xParent);
}
void FolderTree::SetTreePath( OUString const & sUrl )
void FolderTree::SetTreePath( std::u16string_view sUrl )
{
INetURLObject aUrl( sUrl );
aUrl.setFinalSlash();
fpicker/source/office/foldertree.hxx
+1 -1
View File
@@ -41,7 +41,7 @@ public:
void InsertRootEntry(const OUString& rId, const OUString& rRootLabel);
void FillTreeEntry(const weld::TreeIter& rEntry);
void FillTreeEntry(const OUString & rUrl, const ::std::vector< std::pair< OUString, OUString > >& rFolders);
void SetTreePath(OUString const & sUrl);
void SetTreePath(std::u16string_view sUrl);
void SetDenyList(const css::uno::Sequence< OUString >& rDenyList);
};
fpicker/source/office/iodlg.cxx
+2 -2
View File
@@ -253,7 +253,7 @@ namespace
}
#endif
OUString lcl_ensureFinalSlash( const OUString& _rDir )
OUString lcl_ensureFinalSlash( std::u16string_view _rDir )
{
INetURLObject aWorkPathObj( _rDir, INetProtocol::File );
aWorkPathObj.setFinalSlash();
@@ -1270,7 +1270,7 @@ bool implIsInvalid( const OUString & rURL )
}
OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, const OUString& _rFallback )
OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, std::u16string_view _rFallback )
{
// a URL parser for the fallback
INetURLObject aURLParser;
fpicker/source/office/iodlg.hxx
+1 -1
View File
@@ -230,7 +230,7 @@ private:
virtual void enableControl( sal_Int16 _nControlId, bool _bEnable ) override;
virtual OUString getCurFilter( ) const override;
OUString implGetInitialURL( const OUString& _rPath, const OUString& _rFallback );
OUString implGetInitialURL( const OUString& _rPath, std::u16string_view _rFallback );
/// executes a certain FileView action asynchronously
void executeAsync(
framework/source/fwe/classes/addonsoptions.cxx
+1 -1
View File
@@ -1570,7 +1570,7 @@ BitmapEx AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
Graphic aGraphic;
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
rGF.ImportGraphic( aGraphic, OUString(), *pStream );
rGF.ImportGraphic( aGraphic, u"", *pStream );
BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
framework/source/fwe/helper/titlehelper.cxx
+1 -1
View File
@@ -656,7 +656,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
xNewBroadcaster->addTitleChangeListener (xThis);
}
OUString TitleHelper::impl_convertURL2Title(const OUString& sURL)
OUString TitleHelper::impl_convertURL2Title(std::u16string_view sURL)
{
INetURLObject aURL (sURL);
OUString sTitle;
framework/source/services/pathsettings.cxx
+2 -2
View File
@@ -395,7 +395,7 @@ private:
const PathSettings::PathInfo* impl_getPathAccessConst(sal_Int32 nHandle) const;
/** it checks, if the given path value seems to be a valid URL or system path. */
bool impl_isValidPath(const OUString& sPath) const;
bool impl_isValidPath(std::u16string_view sPath) const;
bool impl_isValidPath(const std::vector<OUString>& lPath) const;
void impl_storePath(const PathSettings::PathInfo& aPath);
@@ -1228,7 +1228,7 @@ bool PathSettings::impl_isValidPath(const std::vector<OUString>& lPath) const
return true;
}
bool PathSettings::impl_isValidPath(const OUString& sPath) const
bool PathSettings::impl_isValidPath(std::u16string_view sPath) const
{
// allow empty path to reset a path.
// idea by LLA to support empty paths
framework/source/uielement/generictoolbarcontroller.cxx
+3 -3
View File
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::frame::status;
namespace framework
{
static bool isEnumCommand( const OUString& rCommand )
static bool isEnumCommand( std::u16string_view rCommand )
{
INetURLObject aURL( rCommand );
@@ -52,7 +52,7 @@ static bool isEnumCommand( const OUString& rCommand )
( aURL.GetURLPath().indexOf( '.' ) != -1);
}
static OUString getEnumCommand( const OUString& rCommand )
static OUString getEnumCommand( std::u16string_view rCommand )
{
INetURLObject aURL( rCommand );
@@ -74,7 +74,7 @@ static OUString getMasterCommand( const OUString& rCommand )
sal_Int32 nIndex = aURL.GetURLPath().indexOf( '.' );
if ( nIndex )
{
aURL.SetURLPath( aURL.GetURLPath().copy( 0, nIndex ) );
aURL.SetURLPath( aURL.GetURLPath().subView( 0, nIndex ) );
aMasterCommand = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE );
}
}
framework/source/uielement/imagebuttontoolbarcontroller.cxx
+1 -1
View File
@@ -124,7 +124,7 @@ bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUStr
Graphic aGraphic;
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
rGF.ImportGraphic( aGraphic, OUString(), *pStream );
rGF.ImportGraphic( aGraphic, u"", *pStream );
BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
include/avmedia/mediawindow.hxx
+1 -1
View File
@@ -129,7 +129,7 @@ namespace avmedia
/// checkbox and store its state in *o_pbLink
static bool executeMediaURLDialog(weld::Window* pParent, OUString& rURL, bool *const o_pbLink);
static void executeFormatErrorBox(weld::Window* pParent);
static bool isMediaURL(const OUString& rURL, const OUString& rReferer, bool bDeep = false,
static bool isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep = false,
rtl::Reference<PlayerListener> xPreferredPixelSizeListener = nullptr);
static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = nullptr );
include/basic/basmgr.hxx
+2 -2
View File
@@ -124,7 +124,7 @@ private:
void ImpCreateStdLib( StarBASIC* pParentFromStdLib );
void ImpMgrNotLoaded( const OUString& rStorageName );
BasicLibInfo* CreateLibInfo();
void LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL );
void LoadBasicManager( SotStorage& rStorage, std::u16string_view rBaseURL );
void LoadOldBasicManager( SotStorage& rStorage );
bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const;
static bool ImplEncryptStream( SvStream& rStream );
@@ -132,7 +132,7 @@ private:
static void CheckModules( StarBASIC* pBasic, bool bReference );
public:
BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString const * pLibPath = nullptr, bool bDocMgr = false );
BasicManager( SotStorage& rStorage, std::u16string_view rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString const * pLibPath = nullptr, bool bDocMgr = false );
BasicManager( StarBASIC* pStdLib, OUString const * pLibPath = nullptr, bool bDocMgr = false );
virtual ~BasicManager() override;
include/framework/titlehelper.hxx
+1 -1
View File
@@ -140,7 +140,7 @@ class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex
void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
OUString impl_convertURL2Title(const OUString& sURL);
OUString impl_convertURL2Title(std::u16string_view sURL);
// member
include/sfx2/docfile.hxx
+1 -1
View File
@@ -290,7 +290,7 @@ public:
static css::uno::Sequence < css::util::RevisionTag > GetVersionList(
const css::uno::Reference< css::embed::XStorage >& xStorage );
static OUString CreateTempCopyWithExt( const OUString& aURL );
static OUString CreateTempCopyWithExt( std::u16string_view aURL );
static bool CallApproveHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler, const css::uno::Any& rRequest, bool bAllowAbort);
static bool SetWritableForUserOnly( const OUString& aURL );
include/sfx2/doctempl.hxx
+2 -2
View File
@@ -94,12 +94,12 @@ public:
*/
bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx);
bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const;
bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, std::u16string_view rName) const;
bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName);
bool GetFull(
std::u16string_view rRegion, std::u16string_view rName, OUString& rPath );
bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const;
bool GetLogicNames( std::u16string_view rPath, OUString& rRegion, OUString& rName ) const;
/** updates the configuration where the document templates structure is stored.
include/sfx2/frmdescr.hxx
+1 -1
View File
@@ -65,7 +65,7 @@ public:
SfxItemSet* GetArgs();
const INetURLObject& GetURL() const
{ return aURL; }
void SetURL( const OUString& rURL );
void SetURL( std::u16string_view rURL );
void SetActualURL();
// FrameName
include/sfx2/frmhtml.hxx
+1 -1
View File
@@ -30,7 +30,7 @@ class SfxFrameDescriptor;
namespace SfxFrameHTMLParser
{
// These methods can also be used by other parsers.
SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString&);
SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, std::u16string_view);
};
#endif
include/sfx2/objsh.hxx
+1 -1
View File
@@ -742,7 +742,7 @@ public:
PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName,
SfxItemSet const& rItemSet,
const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet,
SAL_DLLPRIVATE bool APISaveAs_Impl(std::u16string_view aFileName, SfxItemSet& rItemSet,
const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
SAL_DLLPRIVATE bool
CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet,
include/sfx2/sfxhtml.hxx
+3 -3
View File
@@ -57,11 +57,11 @@ public:
static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions);
bool ParseMapOptions(ImageMap * pImageMap)
{ return ParseMapOptions(pImageMap, GetOptions()); }
static bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
static bool ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL,
const HTMLOptions& rOptions,
SvMacroItemId nEventMouseOver,
SvMacroItemId nEventMouseOut );
inline bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
inline bool ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL,
SvMacroItemId nEventMouseOver,
SvMacroItemId nEventMouseOut);
@@ -99,7 +99,7 @@ protected:
const OUString& GetScriptTypeString( SvKeyValueIterator* ) const;
};
inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL,
SvMacroItemId nEventMouseOver,
SvMacroItemId nEventMouseOut)
{
include/sfx2/templatelocalview.hxx
+3 -3
View File
@@ -55,7 +55,7 @@ public:
bool operator () (const ThumbnailViewItem *pItem);
static bool isFilteredExtension(FILTER_APPLICATION filter, std::u16string_view rExt);
bool isValid (const OUString& rPath) const;
bool isValid (std::u16string_view rPath) const;
private:
@@ -114,7 +114,7 @@ public:
bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath);
bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName);
bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, std::u16string_view rName);
virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) override;
@@ -152,7 +152,7 @@ public:
static BitmapEx scaleImg (const BitmapEx &rImg, tools::Long width, tools::Long height);
static BitmapEx getDefaultThumbnail( const OUString& rPath );
static BitmapEx getDefaultThumbnail( std::u16string_view rPath );
static BitmapEx fetchThumbnail (const OUString &msURL, tools::Long width, tools::Long height);
include/svl/documentlockfile.hxx
+1 -1
View File
@@ -56,7 +56,7 @@ class SVL_DLLPUBLIC DocumentLockFile final : public GenDocumentLockFile
virtual void WriteEntryToStream( const LockFileEntry& aEntry, const css::uno::Reference< css::io::XOutputStream >& xStream ) override;
public:
DocumentLockFile( const OUString& aOrigURL );
DocumentLockFile( std::u16string_view aOrigURL );
virtual ~DocumentLockFile() override;
virtual LockFileEntry GetLockData() override;
include/svl/inethist.hxx
+1 -1
View File
@@ -74,7 +74,7 @@ public:
return false;
}
bool QueryUrl (const OUString &rUrl) const;
bool QueryUrl (std::u16string_view rUrl) const;
/** PutUrl.
*/
include/svl/lockfilecommon.hxx
+1 -1
View File
@@ -50,7 +50,7 @@ protected:
::osl::Mutex m_aMutex;
/// This method generates the URL of the lock file based on the document URL and the specified prefix.
static OUString GenerateOwnLockFileURL(const OUString& aOrigURL, std::u16string_view aPrefix);
static OUString GenerateOwnLockFileURL(std::u16string_view aOrigURL, std::u16string_view aPrefix);
public:
LockFileCommon(const OUString& aLockFileURL);
include/svl/msodocumentlockfile.hxx
+3 -3
View File
@@ -29,7 +29,7 @@ private:
Excel,
PowerPoint
};
static AppType getAppType(const OUString& sOrigURL);
static AppType getAppType(std::u16string_view sOrigURL);
AppType m_eAppType;
virtual void
@@ -39,14 +39,14 @@ private:
virtual css::uno::Reference<css::io::XInputStream> OpenStream() override;
public:
MSODocumentLockFile(const OUString& aOrigURL);
MSODocumentLockFile(std::u16string_view aOrigURL);
virtual ~MSODocumentLockFile() override;
virtual LockFileEntry GetLockData() override;
virtual void RemoveFile() override;
static bool IsMSOSupportedFileFormat(const OUString& aURL);
static bool IsMSOSupportedFileFormat(std::u16string_view aURL);
};
}
include/svl/sharecontrolfile.hxx
+1 -1
View File
@@ -52,7 +52,7 @@ class SVL_DLLPUBLIC ShareControlFile final : public LockFileCommon
public:
// The constructor will throw exception in case the stream can not be opened
ShareControlFile( const OUString& aOrigURL );
ShareControlFile( std::u16string_view aOrigURL );
virtual ~ShareControlFile() override;
std::vector< LockFileEntry > GetUsersData();
include/svtools/parhtml.hxx
+1 -1
View File
@@ -257,7 +257,7 @@ public:
virtual bool ParseMetaOptions( const css::uno::Reference< css::document::XDocumentProperties>&,
SvKeyValueIterator* );
void ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang,
void ParseScriptOptions( OUString& rLangString, std::u16string_view rBaseURL, HTMLScriptLanguage& rLang,
OUString& rSrc, OUString& rLibrary, OUString& rModule );
// Remove a comment around the content of <SCRIPT> or <STYLE>.
include/svtools/place.hxx
+2 -2
View File
@@ -21,13 +21,13 @@ private:
public:
Place( const OUString& sName, const OUString& sUrl, bool bEditable = false ) :
Place( const OUString& sName, std::u16string_view sUrl, bool bEditable = false ) :
msName( sName ),
maUrl( sUrl ),
mbEditable( bEditable ) {};
void SetName(const OUString& aName ) { msName = aName; }
void SetUrl(const OUString& aUrl ) { maUrl.SetURL( aUrl ); }
void SetUrl(std::u16string_view aUrl ) { maUrl.SetURL( aUrl ); }
OUString& GetName( ) { return msName; }
OUString GetUrl( ) const { return maUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); }
include/svx/gallery.hxx
+2 -2
View File
@@ -109,8 +109,8 @@ public:
// FillObjTitleList is filling the rList with the title for each gallery object
static bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
static bool InsertURL( std::u16string_view rThemeName, const OUString& rURL );
static bool InsertURL( sal_uInt32 nThemeId, const OUString& rURL );
static bool InsertURL( std::u16string_view rThemeName, std::u16string_view rURL );
static bool InsertURL( sal_uInt32 nThemeId, std::u16string_view rURL );
static bool GetGraphicObj( std::u16string_view rThemeName, sal_uInt32 nPos,
Graphic* pGraphic );
include/svx/gallery1.hxx
+2 -2
View File
@@ -102,7 +102,7 @@ private:
INetURLObject aUserURL;
bool bMultiPath;
SAL_DLLPRIVATE void ImplLoad( const OUString& rMultiPath );
SAL_DLLPRIVATE void ImplLoad( std::u16string_view rMultiPath );
SAL_DLLPRIVATE void ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly );
GalleryThemeEntry* ImplGetThemeEntry( std::u16string_view rThemeName );
@@ -115,7 +115,7 @@ private:
public:
// only for gengal utility!
Gallery( const OUString& rMultiPath );
Gallery( std::u16string_view rMultiPath );
virtual ~Gallery() override;
static Gallery* GetGalleryInstance();
include/svx/langbox.hxx
+1 -1
View File
@@ -43,7 +43,7 @@ namespace o3tl
}
// load language strings from resource
SVXCORE_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg );
SVXCORE_DLLPUBLIC OUString GetDicInfoStr( std::u16string_view rName, const LanguageType nLang, bool bNeg );
class SVXCORE_DLLPUBLIC SvxLanguageBox
{
include/svx/xtable.hxx
+1 -1
View File
@@ -215,7 +215,7 @@ public:
const OUString& rReferer);
// as above but initializes name as expected
static XPropertyListRef CreatePropertyListFromURL(XPropertyListType t,
const OUString & rUrl);
std::u16string_view rUrl);
// helper accessors
static inline XDashListRef AsDashList(
include/tools/urlobj.hxx
+16 -16
View File
@@ -287,22 +287,22 @@ public:
// Strict Parsing:
inline explicit INetURLObject(
OUString const & rTheAbsURIRef,
std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
inline bool SetURL(OUString const & rTheAbsURIRef,
inline bool SetURL(std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
bool ConcatData(INetProtocol eTheScheme, std::u16string_view rTheUser,
std::u16string_view rThePassword,
std::u16string_view rTheHost, sal_uInt32 nThePort,
OUString const & rThePath);
std::u16string_view rThePath);
// Smart Parsing:
inline INetURLObject(OUString const & rTheAbsURIRef,
inline INetURLObject(std::u16string_view rTheAbsURIRef,
INetProtocol eTheSmartScheme,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
@@ -312,7 +312,7 @@ public:
{ m_eSmartScheme = eTheSmartScheme; }
inline bool
SetSmartURL(OUString const & rTheAbsURIRef,
SetSmartURL(std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8,
FSysStyle eStyle = FSysStyle::Detect);
@@ -341,14 +341,14 @@ public:
is returned.
*/
static OUString
GetAbsURL(OUString const & rTheBaseURIRef,
GetAbsURL(std::u16string_view rTheBaseURIRef,
OUString const & rTheRelURIRef,
EncodeMechanism eEncodeMechanism = EncodeMechanism::WasEncoded,
DecodeMechanism eDecodeMechanism = DecodeMechanism::ToIUri,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8);
static inline OUString
GetRelURL(OUString const & rTheBaseURIRef,
GetRelURL(std::u16string_view rTheBaseURIRef,
OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism = EncodeMechanism::WasEncoded,
DecodeMechanism eDecodeMechanism = DecodeMechanism::ToIUri,
@@ -458,7 +458,7 @@ public:
= RTL_TEXTENCODING_UTF8) const
{ return decode(m_aPath, eMechanism, eCharset); }
bool SetURLPath(OUString const & rThePath,
bool SetURLPath(std::u16string_view rThePath,
EncodeMechanism eMechanism = EncodeMechanism::WasEncoded,
rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8)
{ return setPath(rThePath, eMechanism, eCharset); }
@@ -971,7 +971,7 @@ private:
TOOLS_DLLPRIVATE void setInvalid();
bool setAbsURIRef(
OUString const & rTheAbsURIRef,
std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart,
FSysStyle eStyle);
@@ -1058,7 +1058,7 @@ private:
OUStringBuffer &rSynPath);
bool setPath(
OUString const & rThePath,
std::u16string_view rThePath,
EncodeMechanism eMechanism, rtl_TextEncoding eCharset);
// Hierarchical Path:
@@ -1140,16 +1140,16 @@ inline OUString INetURLObject::decode(SubString const & rSubString,
OUString();
}
inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
inline INetURLObject::INetURLObject(std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset):
m_aAbsURIRef(rTheAbsURIRef.getLength() * 2), m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http)
m_aAbsURIRef(rTheAbsURIRef.size() * 2), m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http)
{
setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, false,
FSysStyle(0));
}
inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef,
inline bool INetURLObject::SetURL(std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
@@ -1157,7 +1157,7 @@ inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef,
FSysStyle(0));
}
inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
inline INetURLObject::INetURLObject(std::u16string_view rTheAbsURIRef,
INetProtocol eTheSmartScheme,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
@@ -1167,7 +1167,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef,
setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, true, eStyle);
}
inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef,
inline bool INetURLObject::SetSmartURL(std::u16string_view rTheAbsURIRef,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset,
FSysStyle eStyle)
@@ -1208,7 +1208,7 @@ inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef,
}
// static
inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef,
inline OUString INetURLObject::GetRelURL(std::u16string_view rTheBaseURIRef,
OUString const & rTheAbsURIRef,
EncodeMechanism eEncodeMechanism,
DecodeMechanism eDecodeMechanism,
include/unotools/ucbhelper.hxx
+1 -1
View File
@@ -63,7 +63,7 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
UNOTOOLS_DLLPUBLIC bool ensureFolder(
const css::uno::Reference< css::uno::XComponentContext >& xCtx,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv,
const OUString& rFolder, ucbhelper::Content & result) noexcept;
std::u16string_view rFolder, ucbhelper::Content & result) noexcept;
UNOTOOLS_DLLPUBLIC bool IsYounger(
OUString const & younger, OUString const & older);
include/vcl/graphicfilter.hxx
+5 -5
View File
@@ -295,7 +295,7 @@ public:
ErrCode ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath,
sal_uInt16 nFormat,
const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr );
ErrCode ExportGraphic( const Graphic& rGraphic, const OUString& rPath,
ErrCode ExportGraphic( const Graphic& rGraphic, std::u16string_view rPath,
SvStream& rOStm, sal_uInt16 nFormat,
const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr );
@@ -307,11 +307,11 @@ public:
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE );
ErrCode CanImportGraphic( const OUString& rPath, SvStream& rStream,
ErrCode CanImportGraphic( std::u16string_view rPath, SvStream& rStream,
sal_uInt16 nFormat,
sal_uInt16 * pDeterminedFormat);
ErrCode ImportGraphic( Graphic& rGraphic, const OUString& rPath,
ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view rPath,
SvStream& rStream,
sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW,
sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE,
@@ -328,7 +328,7 @@ public:
*/
void MakeGraphicsAvailableThreaded(std::vector< Graphic* >& rGraphics);
ErrCode ImportGraphic( Graphic& rGraphic, const OUString& rPath,
ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view rPath,
SvStream& rStream,
sal_uInt16 nFormat,
sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags,
@@ -387,7 +387,7 @@ private:
void ImplInit();
ErrCode ImplSetError( ErrCode nError, const SvStream* pStm = nullptr );
ErrCode ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat );
ErrCode ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat );
DECL_DLLPRIVATE_LINK( FilterCallback, ConvertData&, bool );
linguistic/source/convdiclist.cxx
+1 -1
View File
@@ -53,7 +53,7 @@ using namespace com::sun::star::container;
using namespace com::sun::star::linguistic2;
using namespace linguistic;
static OUString GetConvDicMainURL( std::u16string_view rDicName, const OUString &rDirectoryURL )
static OUString GetConvDicMainURL( std::u16string_view rDicName, std::u16string_view rDirectoryURL )
{
// build URL to use for new (persistent) dictionaries
oox/source/drawingml/shape.cxx
+1 -1
View File
@@ -1948,7 +1948,7 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase const & rFilte
Graphic aGraphic;
GraphicFilter aFilter( false );
if ( aFilter.ImportGraphic( aGraphic, "", aTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != ERRCODE_NONE )
if ( aFilter.ImportGraphic( aGraphic, u"", aTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != ERRCODE_NONE )
{
SAL_WARN( "oox.drawingml", "Shape::renderDiagramToGraphic: Unable to import rendered stream into graphic object" );
return xShape;
sc/inc/externalrefmgr.hxx
+1 -1
View File
@@ -432,7 +432,7 @@ public:
OUString maFilterName;
OUString maFilterOptions;
void maybeCreateRealFileName(const OUString& rOwnDocName);
void maybeCreateRealFileName(std::u16string_view rOwnDocName);
};
public:
sc/source/core/data/global2.cxx
+1 -1
View File
@@ -297,7 +297,7 @@ OUString ScGlobal::GetAbsDocName( const OUString& rFileName,
aObj.setFinalSlash(); // it IS a path
}
else
aObj.SetSmartURL("file:///tmp/document");
aObj.SetSmartURL(u"file:///tmp/document");
bool bWasAbs = true;
aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::DecodeMechanism::NONE);
// returned string must be encoded because it's used directly to create SfxMedium
sc/source/filter/excel/xehelper.cxx
+1 -1
View File
@@ -968,7 +968,7 @@ OUString lclEncodeDosUrl(
} // namespace
OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName )
OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, std::u16string_view rAbsUrl, const OUString* pTableName )
{
OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(FSysStyle::Dos);
OUString aDosBase = INetURLObject(rRoot.GetBasePath()).getFSysPath(FSysStyle::Dos);
sc/source/filter/excel/xepivot.cxx
+1 -1
View File
@@ -789,7 +789,7 @@ void XclExpPivotCache::AddGroupFields( const ScDPObject& rDPObj )
void XclExpPivotCache::WriteDconref( XclExpStream& rStrm ) const
{
XclExpString aRef( XclExpUrlHelper::EncodeUrl( GetRoot(), OUString(), &maTabName ) );
XclExpString aRef( XclExpUrlHelper::EncodeUrl( GetRoot(), u"", &maTabName ) );
rStrm.StartRecord( EXC_ID_DCONREF, 7 + aRef.GetSize() );
rStrm << static_cast< sal_uInt16 >( maExpSrcRange.aStart.Row() )
<< static_cast< sal_uInt16 >( maExpSrcRange.aEnd.Row() )
sc/source/filter/html/htmlexp.cxx
+1 -1
View File
@@ -1312,7 +1312,7 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData )
}
void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm,
const OUString& rTargetNm )
std::u16string_view rTargetNm )
{
INetURLObject aFileUrl, aTargetUrl;
aFileUrl.SetSmartURL( rFileNm );
sc/source/filter/inc/htmlexp.hxx
+1 -1
View File
@@ -146,7 +146,7 @@ class ScHTMLExport : public ScExportBase
bool WriteFieldText( const EditTextObject* pData );
// copy a local file to internet if needed
void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm );
void CopyLocalFileToINet( OUString& rFileNm, std::u16string_view rTargetNm );
void PrepareGraphics( ScDrawLayer*, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow,
sc/source/filter/inc/xehelper.hxx
+1 -1
View File
@@ -409,7 +409,7 @@ public:
/** Encodes and returns the URL passed in rAbsUrl to an Excel like URL.
@param pTableName Optional pointer to a table name to be encoded in this URL. */
static OUString EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName = nullptr );
static OUString EncodeUrl( const XclExpRoot& rRoot, std::u16string_view rAbsUrl, const OUString* pTableName = nullptr );
/** Encodes and returns the passed DDE link to an Excel like DDE link. */
static OUString EncodeDde( std::u16string_view rApplic, std::u16string_view rTopic );
};
sc/source/ui/docshell/docsh8.cxx
+1 -1
View File
@@ -102,7 +102,7 @@ constexpr OUStringLiteral SC_DBPROP_CHARSET = u"CharSet";
namespace
{
ErrCode lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager2>& _rDrvMgr, uno::Reference<sdbc::XConnection>& _rConnection, OUString& _rTabName, const OUString& rFullFileName, rtl_TextEncoding eCharSet)
ErrCode lcl_getDBaseConnection(uno::Reference<sdbc::XDriverManager2>& _rDrvMgr, uno::Reference<sdbc::XConnection>& _rConnection, OUString& _rTabName, std::u16string_view rFullFileName, rtl_TextEncoding eCharSet)
{
INetURLObject aURL;
aURL.SetSmartProtocol( INetProtocol::File );
sc/source/ui/docshell/externalrefmgr.cxx
+1 -1
View File
@@ -2717,7 +2717,7 @@ void ScExternalRefManager::addFilesToLinkManager()
maybeLinkExternalFile( nFileId, true);
}
void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(const OUString& rOwnDocName)
void ScExternalRefManager::SrcFileData::maybeCreateRealFileName(std::u16string_view rOwnDocName)
{
if (maRelativeName.isEmpty())
// No relative path given. Nothing to do.
scripting/source/dlgprov/dlgprov.cxx
+1 -1
View File
@@ -63,7 +63,7 @@ using namespace ::sf_misc;
namespace dlgprov
{
Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext,const OUString& i_sURL)
Reference< resource::XStringResourceManager > lcl_getStringResourceManager(const Reference< XComponentContext >& i_xContext, std::u16string_view i_sURL)
{
INetURLObject aInetObj( i_sURL );
OUString aDlgName = aInetObj.GetBase();
scripting/source/dlgprov/dlgprov.hxx
+1 -1
View File
@@ -51,7 +51,7 @@ namespace dlgprov
css::uno::Reference< css::container::XNameContainer > lcl_createControlModel(const css::uno::Reference< css::uno::XComponentContext >& i_xContext);
css::uno::Reference< css::resource::XStringResourceManager > lcl_getStringResourceManager(const css::uno::Reference< css::uno::XComponentContext >& i_xContext,const OUString& i_sURL);
css::uno::Reference< css::resource::XStringResourceManager > lcl_getStringResourceManager(const css::uno::Reference< css::uno::XComponentContext >& i_xContext, std::u16string_view i_sURL);
/// @throws css::uno::Exception
css::uno::Reference< css::container::XNameContainer > lcl_createDialogModel(
const css::uno::Reference< css::uno::XComponentContext >& i_xContext,
scripting/source/stringresource/stringresource.cxx
+4 -4
View File
@@ -934,7 +934,7 @@ void StringResourcePersistenceImpl::storeToURL( const OUString& URL,
void StringResourcePersistenceImpl::implKillRemovedLocaleFiles
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
)
@@ -957,7 +957,7 @@ void StringResourcePersistenceImpl::implKillRemovedLocaleFiles
void StringResourcePersistenceImpl::implKillChangedDefaultFiles
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
)
@@ -976,7 +976,7 @@ void StringResourcePersistenceImpl::implKillChangedDefaultFiles
void StringResourcePersistenceImpl::implStoreAtLocation
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const OUString& aComment,
const Reference< ucb::XSimpleFileAccess3 >& xFileAccess,
@@ -1615,7 +1615,7 @@ OUString StringResourcePersistenceImpl::implGetFileNameForLocaleItem
OUString StringResourcePersistenceImpl::implGetPathForLocaleItem
( LocaleItem const * pLocaleItem, const OUString& aNameBase,
const OUString& aLocation, bool bDefaultFile )
std::u16string_view aLocation, bool bDefaultFile )
{
OUString aFileName = implGetFileNameForLocaleItem( pLocaleItem, aNameBase );
INetURLObject aInetObj( aLocation );
scripting/source/stringresource/stringresource.hxx
+4 -4
View File
@@ -212,7 +212,7 @@ protected:
void implScanLocaleNames( const css::uno::Sequence< OUString >& aContentSeq );
static OUString implGetFileNameForLocaleItem( LocaleItem const * pLocaleItem, const OUString& aNameBase );
static OUString implGetPathForLocaleItem( LocaleItem const * pLocaleItem, const OUString& aNameBase,
const OUString& aLocation, bool bDefaultFile=false );
std::u16string_view aLocation, bool bDefaultFile=false );
bool implReadPropertiesFile( LocaleItem* pLocaleItem,
const css::uno::Reference< css::io::XInputStream >& xInput );
@@ -238,7 +238,7 @@ protected:
/// @throws css::uno::RuntimeException
void implKillRemovedLocaleFiles
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
);
@@ -247,7 +247,7 @@ protected:
/// @throws css::uno::RuntimeException
void implKillChangedDefaultFiles
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess
);
@@ -256,7 +256,7 @@ protected:
/// @throws css::uno::RuntimeException
void implStoreAtLocation
(
const OUString& Location,
std::u16string_view Location,
const OUString& aNameBase,
const OUString& aComment,
const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess,
sd/source/filter/ppt/pptin.cxx
+1 -1
View File
@@ -1970,7 +1970,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
aGalleryDir = SvtPathOptions().GetGalleryPath();
// Use last token delimited by ';'. copy(lastIndexOf+1) works whether
// string is empty or not and whether ';' is there or not.
INetURLObject aGalleryUserSound( aGalleryDir.copy(aGalleryDir.lastIndexOf(';')+1) );
INetURLObject aGalleryUserSound( aGalleryDir.subView(aGalleryDir.lastIndexOf(';')+1) );
aGalleryUserSound.Append( aRetval );
const auto nRemainingSize = rStCtrl.remainingSize();
sd/source/ui/animations/SlideTransitionPane.cxx
+2 -2
View File
@@ -275,7 +275,7 @@ private:
// returns -1 if no object was found
bool lcl_findSoundInList( const ::std::vector< OUString > & rSoundList,
const OUString & rFileName,
std::u16string_view rFileName,
::std::vector< OUString >::size_type & rOutPosition )
{
INetURLObject aURL(rFileName);
@@ -315,7 +315,7 @@ struct lcl_AppendSoundToListBox
: mrListBox( rListBox )
{}
void operator() ( const OUString & rString ) const
void operator() ( std::u16string_view rString ) const
{
INetURLObject aURL( rString );
mrListBox.append_text( aURL.GetBase() );
sd/source/ui/sidebar/MasterPageDescriptor.cxx
+1 -1
View File
@@ -34,7 +34,7 @@ namespace sd::sidebar {
MasterPageDescriptor::MasterPageDescriptor (
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
const OUString& rsURL,
std::u16string_view rsURL,
const OUString& rsPageName,
const OUString& rsStyleName,
const bool bIsPrecious,
sd/source/ui/sidebar/MasterPageDescriptor.hxx
+1 -1
View File
@@ -42,7 +42,7 @@ public:
MasterPageDescriptor (
MasterPageContainer::Origin eOrigin,
const sal_Int32 nTemplateIndex,
const OUString& rURL,
std::u16string_view rURL,
const OUString& rPageName,
const OUString& rStyleName,
const bool bIsPrecious,

Some files were not shown because too many files have changed in this diff Show More