mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o3tl::string_view -> std::string_view (in embedserv)

Browse Source 
Change-Id: I32bba8f45ff3b77084aa2d416126f96c051022f4
Reviewed-on: https://gerrit.libreoffice.org/66073
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-01-10 11:21:45 +01:00
parent f0856d3c61
commit 6856da3066
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
embedserv/source/embed/ed_ipersiststr.cxx
View File

@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <sal/config.h>
#include <string_view>
#include <embeddoc.hxx> #include <embeddoc.hxx>
#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -34,7 +38,6 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <o3tl/char16_t2wchar_t.hxx> #include <o3tl/char16_t2wchar_t.hxx>
#include <o3tl/string_view.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <sal/types.h> #include <sal/types.h>
@@ -397,7 +400,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
if ( m_xFactory.is() && pStg ) if ( m_xFactory.is() && pStg )
{ {
uno::Reference< frame::XModel > aDocument( uno::Reference< frame::XModel > aDocument(
m_xFactory->createInstance( o3tl::toOUString(getServiceNameFromGUID_Impl( &m_guid )) ), m_xFactory->createInstance( getServiceNameFromGUID_Impl( &m_guid ) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( aDocument.is() ) if ( aDocument.is() )
{ {
@@ -532,7 +535,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg )
if ( xTempIn.is() ) if ( xTempIn.is() )
{ {
uno::Reference< frame::XModel > aDocument( uno::Reference< frame::XModel > aDocument(
m_xFactory->createInstance( o3tl::toOUString(getServiceNameFromGUID_Impl( &m_guid )) ), m_xFactory->createInstance( getServiceNameFromGUID_Impl( &m_guid ) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( aDocument.is() ) if ( aDocument.is() )
{ {
@@ -739,7 +742,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL; if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL;
o3tl::u16string_view aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? std::u16string_view aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
CLIPFORMAT cf = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" )); CLIPFORMAT cf = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
hr = WriteFmtUserTypeStg( m_pMasterStorage, hr = WriteFmtUserTypeStg( m_pMasterStorage,
cf, // ??? cf, // ???
@@ -765,7 +768,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
uno::Reference< frame::XModel > aDocument( uno::Reference< frame::XModel > aDocument(
m_xFactory->createInstance( o3tl::toOUString(getServiceNameFromGUID_Impl( &m_guid )) ), m_xFactory->createInstance( getServiceNameFromGUID_Impl( &m_guid ) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
if ( aDocument.is() ) if ( aDocument.is() )
{ {

2
embedserv/source/embed/guid.cxx
View File

@@ -58,7 +58,7 @@ wchar_t const * getStorageTypeFromGUID_Impl( GUID const * guid )
return L""; return L"";
} }
o3tl::u16string_view getServiceNameFromGUID_Impl( GUID const * guid ) std::u16string_view getServiceNameFromGUID_Impl( GUID const * guid )
{ {
if ( *guid == OID_WriterTextServer ) if ( *guid == OID_WriterTextServer )
return u"com.sun.star.comp.Writer.TextDocument"; return u"com.sun.star.comp.Writer.TextDocument";

5
embedserv/source/embed/guid.hxx
View File

@@ -22,14 +22,15 @@
#include <sal/config.h> #include <sal/config.h>
#include <o3tl/string_view.hxx> #include <string_view>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <common.h> #include <common.h>
OUString getFilterNameFromGUID_Impl( GUID const * ); OUString getFilterNameFromGUID_Impl( GUID const * );
o3tl::u16string_view getServiceNameFromGUID_Impl( GUID const * ); std::u16string_view getServiceNameFromGUID_Impl( GUID const * );
wchar_t const * getStorageTypeFromGUID_Impl( GUID const * guid ); wchar_t const * getStorageTypeFromGUID_Impl( GUID const * guid );

11
include/rtl/ustring.hxx
View File

@@ -24,6 +24,7 @@
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
#include <limits>
#include <new> #include <new>
#include <ostream> #include <ostream>
#include <utility> #include <utility>
@@ -410,6 +411,16 @@ public:
} }
#endif #endif
#if defined LIBO_INTERNAL_ONLY
OUString(std::u16string_view sv) {
if (sv.size() > sal_uInt32(std::numeric_limits<sal_Int32>::max())) {
throw std::bad_alloc();
}
pData = nullptr;
rtl_uString_newFromStr_WithLength(&pData, sv.data(), sv.size());
}
#endif
/** /**
Release the string data. Release the string data.
*/ */