Skip to content

C
core
Kaydet (Commit) 10e4396d authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in sal,sax 

Change-Id: I24e202b1f8071fe918e4e164b5fa1c08a561cb24
Reviewed-on: https://gerrit.libreoffice.org/19626Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst d95a27f9
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
sal/workben/clipboardwben/testcopy/XTDataObject.hxx
Dosyayı görüntüle @ 10e4396d
......@@ -70,8 +70,8 @@ public:
private:
LONG m_nRefCnt;
//CWinClipboard& m_rCWinClipboard;
//const const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& m_rXClipboardOwner;
//const const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& m_rXTDataSource;
//const const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& m_rXClipboardOwner;
//const const css::uno::Reference< css::datatransfer::XTransferable >& m_rXTDataSource;
//friend class CWinClipboard;
friend class CEnumFormatEtc;
......
sax/inc/xml2utf.hxx
Dosyayı görüntüle @ 10e4396d
......@@ -31,7 +31,7 @@ public:
Text2UnicodeConverter( const OString & sEncoding );
~Text2UnicodeConverter();
::com::sun::star::uno::Sequence < sal_Unicode > convert( const ::com::sun::star::uno::Sequence<sal_Int8> & );
css::uno::Sequence < sal_Unicode > convert( const css::uno::Sequence<sal_Int8> & );
bool canContinue() { return m_bCanContinue; }
private:
......@@ -42,7 +42,7 @@ private:
bool m_bCanContinue;
bool m_bInitialized;
rtl_TextEncoding m_rtlEncoding;
::com::sun::star::uno::Sequence<sal_Int8> m_seqSource;
css::uno::Sequence<sal_Int8> m_seqSource;
};
/*----------------------------------------
......@@ -56,7 +56,7 @@ public:
Unicode2TextConverter( rtl_TextEncoding encoding );
~Unicode2TextConverter();
::com::sun::star::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32 nLength );
css::uno::Sequence<sal_Int8> convert( const sal_Unicode * , sal_Int32 nLength );
bool canContinue() { return m_bCanContinue; }
private:
......@@ -67,7 +67,7 @@ private:
bool m_bCanContinue;
bool m_bInitialized;
rtl_TextEncoding m_rtlEncoding;
::com::sun::star::uno::Sequence<sal_Unicode> m_seqSource;
css::uno::Sequence<sal_Unicode> m_seqSource;
};
......@@ -88,39 +88,39 @@ public:
~XMLFile2UTFConverter();
void setInputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > &r ) { m_in = r; }
void setInputStream( css::uno::Reference< css::io::XInputStream > &r ) { m_in = r; }
void setEncoding( const OString &s ) { m_sEncoding = s; }
// @param nMaxToRead The number of chars, that should be read. Note that this is no exact number. There
// may be returned less or more bytes than ordered.
sal_Int32 readAndConvert( ::com::sun::star::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead )
throw ( ::com::sun::star::io::IOException,
::com::sun::star::io::NotConnectedException ,
::com::sun::star::io::BufferSizeExceededException ,
::com::sun::star::uno::RuntimeException );
sal_Int32 readAndConvert( css::uno::Sequence<sal_Int8> &seq , sal_Int32 nMaxToRead )
throw ( css::io::IOException,
css::io::NotConnectedException ,
css::io::BufferSizeExceededException ,
css::uno::RuntimeException );
private:
// Called only on first Sequence of bytes. Tries to figure out file format and encoding information.
// @return TRUE, when encoding information could be retrieved
// @return FALSE, when no encoding information was found in file
bool scanForEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
bool scanForEncoding( css::uno::Sequence<sal_Int8> &seq );
// Called only on first Sequence of bytes. Tries to figure out
// if enough data is available to scan encoding
// @return TRUE, when encoding is retrievable
// @return FALSE, when more data is needed
static bool isEncodingRecognizable( const ::com::sun::star::uno::Sequence< sal_Int8 > & seq );
static bool isEncodingRecognizable( const css::uno::Sequence< sal_Int8 > & seq );
// When encoding attribute is within the text (in the first line), it is removed.
static void removeEncoding( ::com::sun::star::uno::Sequence<sal_Int8> &seq );
static void removeEncoding( css::uno::Sequence<sal_Int8> &seq );
// Initializes decoding depending on m_sEncoding setting
void initializeDecoding();
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_in;
css::uno::Reference< css::io::XInputStream > m_in;
bool m_bStarted;
OString m_sEncoding;
......
sax/source/expatwrap/attrlistimpl.hxx
Dosyayı görüntüle @ 10e4396d
......@@ -34,8 +34,8 @@ struct AttributeList_impl;
//FIXME
class AttributeList :
public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XAttributeList,
::com::sun::star::util::XCloneable >
css::xml::sax::XAttributeList,
css::util::XCloneable >
{
public:
AttributeList();
......@@ -48,21 +48,21 @@ public:
public:
// XAttributeList
virtual sal_Int16 SAL_CALL getLength()
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getTypeByName(const OUString& aName)
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
throw(css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getValueByName(const OUString& aName)
throw( ::com::sun::star::uno::RuntimeException, std::exception) override;
throw( css::uno::RuntimeException, std::exception) override;
// XCloneable
virtual ::com::sun::star::uno::Reference< XCloneable > SAL_CALL
createClone() throw(::com::sun::star::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< XCloneable > SAL_CALL
createClone() throw(css::uno::RuntimeException, std::exception) override;
private:
struct AttributeList_impl *m_pImpl;
......
sax/source/expatwrap/sax_expat.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -80,12 +80,12 @@ namespace {
pThis->rDocumentLocator->getColumnNumber()\
) );\
}\
catch( const com::sun::star::uno::RuntimeException &e ) {\
catch( const css::uno::RuntimeException &e ) {\
pThis->bExceptionWasThrown = true; \
pThis->bRTExceptionWasThrown = true; \
pImpl->rtexception = e; \
}\
catch( const com::sun::star::uno::Exception &e ) {\
catch( const css::uno::Exception &e ) {\
pThis->bExceptionWasThrown = true; \
pThis->bRTExceptionWasThrown = true; \
pImpl->rtexception = WrappedTargetRuntimeException("Non-runtime UNO exception caught during parse", e.Context, makeAny(e)); \
......@@ -107,7 +107,7 @@ public:
SaxExpatParser();
virtual ~SaxExpatParser();
// ::com::sun::star::lang::XInitialization:
// css::lang::XInitialization:
virtual void SAL_CALL initialize(css::uno::Sequence<css::uno::Any> const& rArguments)
throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
......@@ -317,7 +317,7 @@ extern "C"
// LocatorImpl
class LocatorImpl :
public WeakImplHelper< XLocator, com::sun::star::io::XSeekable >
public WeakImplHelper< XLocator, css::io::XSeekable >
// should use a different interface for stream positions!
{
public:
......@@ -386,7 +386,7 @@ SaxExpatParser::~SaxExpatParser()
delete m_pImpl;
}
// ::com::sun::star::lang::XInitialization:
// css::lang::XInitialization:
void SAL_CALL
SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments)
throw (css::uno::RuntimeException, css::uno::Exception, std::exception)
......
sax/source/fastparser/fastparser.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -116,12 +116,12 @@ struct SaxContext
struct ParserData
{
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler > mxDocumentHandler;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxTokenHandler;
FastTokenHandlerBase *mpTokenHandler;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler > mxErrorHandler;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver > mxEntityResolver;
::com::sun::star::lang::Locale maLocale;
css::uno::Reference< css::xml::sax::XFastDocumentHandler > mxDocumentHandler;
css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler;
FastTokenHandlerBase* mpTokenHandler;
css::uno::Reference< css::xml::sax::XErrorHandler > mxErrorHandler;
css::uno::Reference< css::xml::sax::XEntityResolver > mxEntityResolver;
css::lang::Locale maLocale;
ParserData();
~ParserData();
......@@ -162,14 +162,14 @@ struct Entity : public ParserData
// Allow to disable threading for small documents:
bool mbEnableThreads;
::com::sun::star::xml::sax::InputSource maStructSource;
css::xml::sax::InputSource maStructSource;
xmlParserCtxtPtr mpParser;
::sax_expatwrap::XMLFile2UTFConverter maConverter;
// Exceptions cannot be thrown through the C-XmlParser (possible
// resource leaks), therefore any exception thrown by a UNO callback
// must be saved somewhere until the C-XmlParser is stopped.
::com::sun::star::uno::Any maSavedException;
css::uno::Any maSavedException;
void saveException( const Any & e );
void throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumentLocator,
bool mbDuringParse );
......@@ -204,14 +204,14 @@ public:
~FastSaxParserImpl();
// XFastParser
void parseStream( const ::com::sun::star::xml::sax::InputSource& aInputSource ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
void setFastDocumentHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastDocumentHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException);
void setTokenHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException);
void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
OUString getNamespaceURL( const OUString& rPrefix ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
void setErrorHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XErrorHandler >& Handler ) throw (::com::sun::star::uno::RuntimeException);
void setEntityResolver( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XEntityResolver >& Resolver ) throw (::com::sun::star::uno::RuntimeException);
void setLocale( const ::com::sun::star::lang::Locale& rLocale ) throw (::com::sun::star::uno::RuntimeException);
void parseStream( const css::xml::sax::InputSource& aInputSource ) throw (css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException, std::exception);
void setFastDocumentHandler( const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& Handler ) throw (css::uno::RuntimeException);
void setTokenHandler( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& Handler ) throw (css::uno::RuntimeException);
void registerNamespace( const OUString& NamespaceURL, sal_Int32 NamespaceToken ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
OUString getNamespaceURL( const OUString& rPrefix ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException);
void setErrorHandler( const css::uno::Reference< css::xml::sax::XErrorHandler >& Handler ) throw (css::uno::RuntimeException);
void setEntityResolver( const css::uno::Reference< css::xml::sax::XEntityResolver >& Resolver ) throw (css::uno::RuntimeException);
void setLocale( const css::lang::Locale& rLocale ) throw (css::uno::RuntimeException);
// called by the C callbacks of the expat parser
void callbackStartElement( const xmlChar *localName , const xmlChar* prefix, const xmlChar* URI,
......@@ -241,8 +241,8 @@ private:
void sendPendingCharacters();
sal_Int32 GetToken( const xmlChar* pName, sal_Int32 nameLen );
sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen ) throw (::com::sun::star::xml::sax::SAXException);
OUString GetNamespaceURL( const OString& rPrefix ) throw (::com::sun::star::xml::sax::SAXException);
sal_Int32 GetTokenWithPrefix( const xmlChar* pPrefix, int prefixLen, const xmlChar* pName, int nameLen ) throw (css::xml::sax::SAXException);
OUString GetNamespaceURL( const OString& rPrefix ) throw (css::xml::sax::SAXException);
sal_Int32 GetNamespaceToken( const OUString& rNamespaceURL );
sal_Int32 GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const xmlChar* pName, int nNameLen );
void DefineNamespace( const OString& rPrefix, const OUString& namespaceURL );
......
sax/source/tools/converter.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -1297,7 +1297,7 @@ void Converter::convertDate(
static void convertTime(
OUStringBuffer& i_rBuffer,
const com::sun::star::util::DateTime& i_rDateTime)
const css::util::DateTime& i_rDateTime)
{
if (i_rDateTime.Hours < 10) {
i_rBuffer.append('0');
......@@ -1326,7 +1326,7 @@ static void convertTime(
static void convertTimeZone(
OUStringBuffer& i_rBuffer,
const com::sun::star::util::DateTime& i_rDateTime,
const css::util::DateTime& i_rDateTime,
sal_Int16 const* pTimeZoneOffset)
{
if (pTimeZoneOffset)
......@@ -1342,7 +1342,7 @@ static void convertTimeZone(
/** convert util::DateTime to ISO "time" or "dateTime" string */
void Converter::convertTimeOrDateTime(
OUStringBuffer& i_rBuffer,
const com::sun::star::util::DateTime& i_rDateTime,
const css::util::DateTime& i_rDateTime,
sal_Int16 const* pTimeZoneOffset)
{
if (i_rDateTime.Year == 0 ||
......@@ -1361,7 +1361,7 @@ void Converter::convertTimeOrDateTime(
/** convert util::DateTime to ISO "date" or "dateTime" string */
void Converter::convertDateTime(
OUStringBuffer& i_rBuffer,
const com::sun::star::util::DateTime& i_rDateTime,
const css::util::DateTime& i_rDateTime,
sal_Int16 const*const pTimeZoneOffset,
bool i_bAddTimeIf0AM )
{
......@@ -2530,7 +2530,7 @@ sal_Int16 Converter::GetUnitFromString(const OUString& rString, sal_Int16 nDefau
bool Converter::convertAny(OUStringBuffer& rsValue,
OUStringBuffer& rsType ,
const com::sun::star::uno::Any& rValue)
const css::uno::Any& rValue)
{
bool bConverted = false;
......@@ -2539,11 +2539,11 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
switch (rValue.getValueTypeClass())
{
case com::sun::star::uno::TypeClass_BYTE :
case com::sun::star::uno::TypeClass_SHORT :
case com::sun::star::uno::TypeClass_UNSIGNED_SHORT :
case com::sun::star::uno::TypeClass_LONG :
case com::sun::star::uno::TypeClass_UNSIGNED_LONG :
case css::uno::TypeClass_BYTE :
case css::uno::TypeClass_SHORT :
case css::uno::TypeClass_UNSIGNED_SHORT :
case css::uno::TypeClass_LONG :
case css::uno::TypeClass_UNSIGNED_LONG :
{
sal_Int32 nTempValue = 0;
if (rValue >>= nTempValue)
......@@ -2555,7 +2555,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
case com::sun::star::uno::TypeClass_BOOLEAN :
case css::uno::TypeClass_BOOLEAN :
{
bool bTempValue = false;
if (rValue >>= bTempValue)
......@@ -2567,8 +2567,8 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
case com::sun::star::uno::TypeClass_FLOAT :
case com::sun::star::uno::TypeClass_DOUBLE :
case css::uno::TypeClass_FLOAT :
case css::uno::TypeClass_DOUBLE :
{
double fTempValue = 0.0;
if (rValue >>= fTempValue)
......@@ -2580,7 +2580,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
case com::sun::star::uno::TypeClass_STRING :
case css::uno::TypeClass_STRING :
{
OUString sTempValue;
if (rValue >>= sTempValue)
......@@ -2592,17 +2592,17 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
}
break;
case com::sun::star::uno::TypeClass_STRUCT :
case css::uno::TypeClass_STRUCT :
{
com::sun::star::util::Date aDate ;
com::sun::star::util::Time aTime ;
com::sun::star::util::DateTime aDateTime;
css::util::Date aDate ;
css::util::Time aTime ;
css::util::DateTime aDateTime;
if (rValue >>= aDate)
{
rsType.append("date");
bConverted = true;
com::sun::star::util::DateTime aTempValue;
css::util::DateTime aTempValue;
aTempValue.Day = aDate.Day;
aTempValue.Month = aDate.Month;
aTempValue.Year = aDate.Year;
......@@ -2617,7 +2617,7 @@ bool Converter::convertAny(OUStringBuffer& rsValue,
{
rsType.append("time");
bConverted = true;
com::sun::star::util::Duration aTempValue;
css::util::Duration aTempValue;
aTempValue.Days = 0;
aTempValue.Months = 0;
aTempValue.Years = 0;
......
sax/source/tools/fastattribs.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -52,7 +52,7 @@ void UnknownAttribute::FillAttribute( Attribute* pAttrib ) const
}
}
FastAttributeList::FastAttributeList( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler >& xTokenHandler,
FastAttributeList::FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler,
sax_fastparser::FastTokenHandlerBase *pTokenHandler)
: mxTokenHandler( xTokenHandler ),
mpTokenHandler( pTokenHandler )
......
sax/source/tools/fastserializer.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -268,7 +268,7 @@ namespace sax_fastparser {
writeBytes(sSlashAndClosingBracket, N_CHARS(sSlashAndClosingBracket));
}
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > FastSaxSerializer::getOutputStream()
css::uno::Reference< css::io::XOutputStream > FastSaxSerializer::getOutputStream()
{
return maCachedOutputStream.getOutputStream();
}
......
sax/source/tools/fastserializer.hxx
Dosyayı görüntüle @ 10e4396d
......@@ -44,14 +44,14 @@ typedef std::vector<TokenValue> TokenValueList;
/// Receives notification of sax document events to write into an XOutputStream.
class FastSaxSerializer
{
typedef ::com::sun::star::uno::Sequence< ::sal_Int8 > Int8Sequence;
typedef ::com::sun::star::uno::Sequence< ::sal_Int32 > Int32Sequence;
typedef css::uno::Sequence< ::sal_Int8 > Int8Sequence;
typedef css::uno::Sequence< ::sal_Int32 > Int32Sequence;
public:
FastSaxSerializer( const css::uno::Reference< css::io::XOutputStream >& xOutputStream );
~FastSaxSerializer();
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > getOutputStream();
css::uno::Reference< css::io::XOutputStream > getOutputStream();
/// called by FSHelper to put data in for writeTokenValueList
TokenValueList& getTokenValueList() { return maTokenValues; }
......@@ -158,7 +158,7 @@ private:
* to ensure correct order of ForSort methods.
*/
CachedOutputStream maCachedOutputStream;
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastTokenHandler > mxFastTokenHandler;
css::uno::Reference< css::xml::sax::XFastTokenHandler > mxFastTokenHandler;
class ForMerge : public ForMergeBase
{
......@@ -241,7 +241,7 @@ private:
The latter in the case that we are inside a mark().
*/
void writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData );
void writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData );
void writeBytes( const char* pStr, size_t nLen );
};
......
sax/source/tools/fshelper.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -148,7 +148,7 @@ FastSerializerHelper* FastSerializerHelper::writeId(sal_Int32 tokenId)
return this;
}
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > FastSerializerHelper::getOutputStream()
css::uno::Reference< css::io::XOutputStream > FastSerializerHelper::getOutputStream()
{
return mpSerializer->getOutputStream();
}
......
sax/test/saxdemo.cxx
Dosyayı görüntüle @ 10e4396d
......@@ -76,7 +76,7 @@ public:
return nBytesToRead;
}
virtual sal_Int32 SAL_CALL readSomeBytes(
::com::sun::star::uno::Sequence< sal_Int8 >& aData,
css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment