Skip to content

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

com::sun::star->css in xmlhelp 

Change-Id: Iaa57a071f8f0e6945d24f019cb4c06e02d066e0a
Reviewed-on: https://gerrit.libreoffice.org/20147Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 65164923
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 172 deletions
xmlhelp/source/cxxhelp/inc/tvfactory.hxx
Dosyayı görüntüle @ fa452b54
......@@ -39,7 +39,7 @@ class TVFactory: public cppu::WeakImplHelper <
{
public:
TVFactory( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
TVFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~TVFactory();
......@@ -47,57 +47,57 @@ class TVFactory: public cppu::WeakImplHelper <
virtual OUString SAL_CALL
getImplementationName(
void )
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL
supportsService(
const OUString& ServiceName )
throw(com::sun::star::uno::RuntimeException, std::exception ) override;
throw(css::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(
void )
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
// XMultiServiceFactory
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstance(
const OUString& aServiceSpecifier )
throw( com::sun::star::uno::Exception,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::Exception,
css::uno::RuntimeException, std::exception ) override;
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
const OUString& ServiceSpecifier,
const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& Arguments )
throw( com::sun::star::uno::Exception,
com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Sequence< css::uno::Any >& Arguments )
throw( css::uno::Exception,
css::uno::RuntimeException, std::exception) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames( )
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
// Other
static OUString SAL_CALL getImplementationName_static();
static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
createServiceFactory(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr );
const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );
static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL
static css::uno::Reference< css::uno::XInterface > SAL_CALL
CreateInstance(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory );
const css::uno::Reference< css::lang::XMultiServiceFactory >& xMultiServiceFactory );
private:
// Members
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_xHDS;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::uno::XInterface > m_xHDS;
};
}
......
xmlhelp/source/cxxhelp/provider/bufferedinputstream.hxx
Dosyayı görüntüle @ fa452b54
......@@ -30,8 +30,8 @@ namespace chelp {
class BufferedInputStream
: public cppu::OWeakObject,
public com::sun::star::io::XInputStream,
public com::sun::star::io::XSeekable
public css::io::XInputStream,
public css::io::XSeekable
{
private:
......@@ -43,67 +43,67 @@ namespace chelp {
public:
explicit BufferedInputStream(
const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
const css::uno::Reference<css::io::XInputStream>& xInputStream);
virtual ~BufferedInputStream();
virtual com::sun::star::uno::Any SAL_CALL
queryInterface( const com::sun::star::uno::Type& rType )
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type& rType )
throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
virtual sal_Int32 SAL_CALL readBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData,
virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL available()
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL closeInput()
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL seek( sal_Int64 location )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::lang::IllegalArgumentException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getPosition()
throw( com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL getLength()
throw( com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
};
extern com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
extern css::uno::Reference<css::io::XInputStream>
turnToSeekable(
const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream);
const css::uno::Reference<css::io::XInputStream>& xInputStream);
}
......
xmlhelp/source/cxxhelp/provider/content.hxx
Dosyayı görüntüle @ fa452b54
......@@ -43,11 +43,9 @@ namespace chelp
{
public:
Content( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext,
Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
::ucbhelper::ContentProviderImplHelper* pProvider,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier,
Databases* pDatabases );
virtual ~Content();
......@@ -63,36 +61,35 @@ namespace chelp
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL
getImplementationName()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
// XContent
virtual OUString SAL_CALL
getContentType()
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
// XCommandProcessor
virtual com::sun::star::uno::Any SAL_CALL
execute( const com::sun::star::ucb::Command& aCommand,
virtual css::uno::Any SAL_CALL
execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& Environment )
throw( com::sun::star::uno::Exception,
com::sun::star::ucb::CommandAbortedException,
com::sun::star::uno::RuntimeException, std::exception ) override;
const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
throw( css::uno::Exception,
css::ucb::CommandAbortedException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
abort( sal_Int32 CommandId )
throw( com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::uno::RuntimeException, std::exception ) override;
private:
......@@ -103,18 +100,15 @@ namespace chelp
// private methods
virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
getProperties( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
getCommands( const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > & xEnv ) override;
virtual css::uno::Sequence< css::beans::Property >
getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
virtual css::uno::Sequence< css::ucb::CommandInfo >
getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override;
virtual OUString getParentURL() override { return OUString(); }
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProperties );
css::uno::Reference< css::sdbc::XRow >
getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties );
};
}
......
xmlhelp/source/cxxhelp/provider/databases.cxx
Dosyayı görüntüle @ fa452b54
......@@ -1372,7 +1372,7 @@ inline bool isLetter( sal_Unicode c )
}
void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage )
css::uno::Reference< css::deployment::XPackage > xPackage )
{
rv.clear();
OUString aExtensionPath = xPackage->getURL();
......
xmlhelp/source/cxxhelp/provider/db.hxx
Dosyayı görüntüle @ fa452b54
......@@ -58,10 +58,10 @@ namespace helpdatafileproxy {
OUString m_aFileURL;
StringToDataMap* m_pStringToDataMap;
StringToValPosMap* m_pStringToValPosMap;
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 >
css::uno::Reference< css::ucb::XSimpleFileAccess3 >
m_xSFA;
com::sun::star::uno::Sequence< sal_Int8 >
css::uno::Sequence< sal_Int8 >
m_aItData;
const char* m_pItData;
int m_nItRead;
......@@ -74,7 +74,7 @@ namespace helpdatafileproxy {
//SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails
//for example when using long file paths on Windows, which start with "\\?\"
Hdf( const OUString& rFileURL,
com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > xSFA )
css::uno::Reference< css::ucb::XSimpleFileAccess3 > xSFA )
: m_aFileURL( rFileURL )
, m_pStringToDataMap( nullptr )
, m_pStringToValPosMap( nullptr )
......
xmlhelp/source/cxxhelp/provider/inputstream.hxx
Dosyayı görüntüle @ fa452b54
......@@ -33,8 +33,8 @@ namespace chelp {
class XInputStream_impl
: public cppu::OWeakObject,
public com::sun::star::io::XInputStream,
public com::sun::star::io::XSeekable
public css::io::XInputStream,
public css::io::XSeekable
{
public:
......@@ -48,10 +48,10 @@ namespace chelp {
bool SAL_CALL CtorSuccess() { return m_bIsOpen;}
virtual com::sun::star::uno::Any SAL_CALL
virtual css::uno::Any SAL_CALL
queryInterface(
const com::sun::star::uno::Type& rType )
throw( com::sun::star::uno::RuntimeException, std::exception) override;
const css::uno::Type& rType )
throw( css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
acquire(
......@@ -65,62 +65,62 @@ namespace chelp {
virtual sal_Int32 SAL_CALL
readBytes(
com::sun::star::uno::Sequence< sal_Int8 >& aData,
css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception) override;
virtual sal_Int32 SAL_CALL
readSomeBytes(
com::sun::star::uno::Sequence< sal_Int8 >& aData,
css::uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
skipBytes(
sal_Int32 nBytesToSkip )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::BufferSizeExceededException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::BufferSizeExceededException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int32 SAL_CALL
available(
void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
closeInput(
void )
throw( com::sun::star::io::NotConnectedException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::NotConnectedException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL
seek(
sal_Int64 location )
throw( com::sun::star::lang::IllegalArgumentException,
com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::lang::IllegalArgumentException,
css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL
getPosition(
void )
throw( com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
virtual sal_Int64 SAL_CALL
getLength(
void )
throw( com::sun::star::io::IOException,
com::sun::star::uno::RuntimeException, std::exception ) override;
throw( css::io::IOException,
css::uno::RuntimeException, std::exception ) override;
private:
bool m_bIsOpen;
......
xmlhelp/source/cxxhelp/provider/provider.hxx
Dosyayı görüntüle @ fa452b54
......@@ -48,12 +48,12 @@ namespace chelp {
class ContentProvider :
public ::ucbhelper::ContentProviderImplHelper,
public ::com::sun::star::container::XContainerListener,
public ::com::sun::star::lang::XComponent
public css::container::XContainerListener,
public css::lang::XComponent
{
public:
explicit ContentProvider(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
......@@ -99,18 +99,18 @@ namespace chelp {
virtual void SAL_CALL
dispose( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
throw (css::uno::RuntimeException, std::exception) override
{
(void)xListener;
}
virtual void SAL_CALL
removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
throw (css::uno::RuntimeException, std::exception) override
{
(void)aListener;
}
......@@ -118,29 +118,29 @@ namespace chelp {
// XConainerListener ( derive from XEventListener )
virtual void SAL_CALL
disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
disposing( const css::lang::EventObject& /*Source*/ )
throw (css::uno::RuntimeException, std::exception) override
{
m_xContainer.clear();
}
virtual void SAL_CALL
elementInserted( const ::com::sun::star::container::ContainerEvent& Event )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
elementInserted( const css::container::ContainerEvent& Event )
throw (css::uno::RuntimeException, std::exception) override
{
(void)Event;
}
virtual void SAL_CALL
elementRemoved( const ::com::sun::star::container::ContainerEvent& Event )
throw (::com::sun::star::uno::RuntimeException, std::exception) override
elementRemoved( const css::container::ContainerEvent& Event )
throw (css::uno::RuntimeException, std::exception) override
{
(void)Event;
}
virtual void SAL_CALL
elementReplaced( const ::com::sun::star::container::ContainerEvent& Event )
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
elementReplaced( const css::container::ContainerEvent& Event )
throw (css::uno::RuntimeException, std::exception) override;
// Non-interface methods.
......@@ -150,27 +150,26 @@ namespace chelp {
bool isInitialized;
OUString m_aScheme;
Databases* m_pDatabases;
com::sun::star::uno::Reference<com::sun::star::container::XContainer> m_xContainer;
css::uno::Reference<css::container::XContainer> m_xContainer;
// private methods
void init();
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
css::uno::Reference< css::lang::XMultiServiceFactory >
getConfiguration() const;
static ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >
getHierAccess( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& sProvider,
static css::uno::Reference< css::container::XHierarchicalNameAccess >
getHierAccess( const css::uno::Reference< css::lang::XMultiServiceFactory >& sProvider,
const char* file );
static OUString
getKey( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
getKey( const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess,
const char* key );
static bool
getBooleanKey(
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XHierarchicalNameAccess >& xHierAccess,
const css::uno::Reference< css::container::XHierarchicalNameAccess >& xHierAccess,
const char* key);
static void subst( OUString& instpath );
......
xmlhelp/source/cxxhelp/provider/resultset.hxx
Dosyayı görüntüle @ fa452b54
......@@ -32,8 +32,7 @@ namespace chelp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
rtl::Reference< Content > m_xContent;
com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment > m_xEnv;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
ResultSetFactory* m_pFactory;
private:
......@@ -42,12 +41,10 @@ namespace chelp {
public:
DynamicResultSet(
const com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const rtl::Reference< Content >& rxContent,
const com::sun::star::ucb::OpenCommandArgument2& rCommand,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XCommandEnvironment >& rxEnv,
const css::ucb::OpenCommandArgument2& rCommand,
const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory );
virtual ~DynamicResultSet();
......
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
Dosyayı görüntüle @ fa452b54
......@@ -36,10 +36,10 @@ namespace chelp {
{
public:
ResultSetForQuery( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext,
const com::sun::star::uno::Reference<com::sun::star::ucb::XContentProvider>& xProvider,
const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
ResultSetForQuery( const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::ucb::XContentProvider>& xProvider,
const css::uno::Sequence< css::beans::Property >& seq,
const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases );
......
xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
Dosyayı görüntüle @ fa452b54
......@@ -36,10 +36,10 @@ namespace chelp {
{
public:
ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider,
const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq,
const com::sun::star::uno::Sequence< com::sun::star::ucb::NumberedSortingInfo >& seqSort,
ResultSetForRoot( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::ucb::XContentProvider >& xProvider,
const css::uno::Sequence< css::beans::Property >& seq,
const css::uno::Sequence< css::ucb::NumberedSortingInfo >& seqSort,
URLParameter& aURLParameter,
Databases* pDatabases );
......
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
Dosyayı görüntüle @ fa452b54
......@@ -80,7 +80,7 @@ using namespace chelp;
URLParameter::URLParameter( const OUString& aURL,
Databases* pDatabases )
throw( com::sun::star::ucb::IllegalIdentifierException )
throw( css::ucb::IllegalIdentifierException )
: m_pDatabases( pDatabases ),
m_aURL( aURL )
{
......@@ -425,7 +425,7 @@ void URLParameter::open( const Command& aCommand,
}
void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException )
void URLParameter::parse() throw( css::ucb::IllegalIdentifierException )
{
m_aExpr = m_aURL;
......@@ -438,7 +438,7 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio
! query() ||
m_aLanguage.isEmpty() ||
m_aSystem.isEmpty() )
throw com::sun::star::ucb::IllegalIdentifierException();
throw css::ucb::IllegalIdentifierException();
}
......
xmlhelp/source/cxxhelp/provider/urlparameter.hxx
Dosyayı görüntüle @ fa452b54
......@@ -114,7 +114,7 @@ namespace chelp {
URLParameter( const OUString& aURL,
Databases* pDatabases )
throw( com::sun::star::ucb::IllegalIdentifierException );
throw( css::ucb::IllegalIdentifierException );
bool isActive() const { return !m_aActive.isEmpty() && m_aActive == "true"; }
bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); }
......@@ -165,15 +165,15 @@ namespace chelp {
OString getByName( const char* par );
void open( const com::sun::star::ucb::Command& aCommand,
void open( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment,
const com::sun::star::uno::Reference< com::sun::star::io::XActiveDataSink >& xDataSink );
const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment,
const css::uno::Reference< css::io::XActiveDataSink >& xDataSink );
void open( const com::sun::star::ucb::Command& aCommand,
void open( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment,
const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xDataSink );
const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment,
const css::uno::Reference< css::io::XOutputStream >& xDataSink );
private:
......@@ -226,7 +226,7 @@ namespace chelp {
void readHelpDataFile();
void parse() throw( com::sun::star::ucb::IllegalIdentifierException );
void parse() throw( css::ucb::IllegalIdentifierException );
bool scheme();
......
xmlhelp/source/treeview/tvread.cxx
Dosyayı görüntüle @ fa452b54
......@@ -777,7 +777,7 @@ TVChildTarget::getConfiguration(const Reference< XComponentContext >& rxContext)
{
xProvider = theDefaultProvider::get( rxContext );
}
catch( const com::sun::star::uno::Exception& )
catch( const css::uno::Exception& )
{
OSL_ENSURE( xProvider.is(),"can not instantiate configuration" );
}
......@@ -807,7 +807,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider
( sProvider->createInstanceWithArguments( sReaderService,seq ),
UNO_QUERY );
}
catch( const com::sun::star::uno::Exception& )
catch( const css::uno::Exception& )
{
}
}
......@@ -828,7 +828,7 @@ TVChildTarget::getKey( const Reference< XHierarchicalNameAccess >& xHierAccess,
aAny =
xHierAccess->getByHierarchicalName( OUString::createFromAscii( key ) );
}
catch( const com::sun::star::container::NoSuchElementException& )
catch( const css::container::NoSuchElementException& )
{
}
aAny >>= instPath;
......@@ -851,7 +851,7 @@ TVChildTarget::getBooleanKey(const Reference<
xHierAccess->getByHierarchicalName(
OUString::createFromAscii(key));
}
catch( const com::sun::star::container::NoSuchElementException& )
catch( const css::container::NoSuchElementException& )
{
}
aAny >>= ret;
......@@ -1042,7 +1042,7 @@ inline bool isLetter( sal_Unicode c )
}
void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUString > &rv,
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage )
css::uno::Reference< css::deployment::XPackage > xPackage )
{
rv.clear();
OUString aExtensionPath = xPackage->getURL();
......
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