Kaydet (Commit) 506be190 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

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

Change-Id: Ief642571ddccbf016fa1625b5859b4889a4a3e8e
Reviewed-on: https://gerrit.libreoffice.org/17366Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst fb6fc47b
This diff is collapsed.
...@@ -48,40 +48,32 @@ public: ...@@ -48,40 +48,32 @@ public:
Broadcaster() {} Broadcaster() {}
void addDisposeNotification( void addDisposeNotification(
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > css::uno::Reference< css::lang::XEventListener > const & listener,
const & listener, css::lang::EventObject const & event);
com::sun::star::lang::EventObject const & event);
void addContainerElementInsertedNotification( void addContainerElementInsertedNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::container::XContainerListener > const & listener,
com::sun::star::container::XContainerListener > const & listener, css::container::ContainerEvent const & event);
com::sun::star::container::ContainerEvent const & event);
void addContainerElementRemovedNotification( void addContainerElementRemovedNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::container::XContainerListener > const & listener,
com::sun::star::container::XContainerListener > const & listener, css::container::ContainerEvent const & event);
com::sun::star::container::ContainerEvent const & event);
void addContainerElementReplacedNotification( void addContainerElementReplacedNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::container::XContainerListener > const & listener,
com::sun::star::container::XContainerListener > const & listener, css::container::ContainerEvent const & event);
com::sun::star::container::ContainerEvent const & event);
void addPropertyChangeNotification( void addPropertyChangeNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertyChangeListener > const & listener,
com::sun::star::beans::XPropertyChangeListener > const & listener, css::beans::PropertyChangeEvent const & event);
com::sun::star::beans::PropertyChangeEvent const & event);
void addPropertiesChangeNotification( void addPropertiesChangeNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertiesChangeListener > const & listener,
com::sun::star::beans::XPropertiesChangeListener > const & listener, css::uno::Sequence< css::beans::PropertyChangeEvent > const & event);
com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyChangeEvent > const & event);
void addChangesNotification( void addChangesNotification(
com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > css::uno::Reference< css::util::XChangesListener > const & listener,
const & listener, css::util::ChangesEvent const & event);
com::sun::star::util::ChangesEvent const & event);
void send(); void send();
...@@ -90,63 +82,48 @@ private: ...@@ -90,63 +82,48 @@ private:
Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION; Broadcaster& operator=(const Broadcaster&) SAL_DELETED_FUNCTION;
struct DisposeNotification { struct DisposeNotification {
com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > css::uno::Reference< css::lang::XEventListener > listener;
listener; css::lang::EventObject event;
com::sun::star::lang::EventObject event;
DisposeNotification( DisposeNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::lang::XEventListener > const & theListener,
com::sun::star::lang::XEventListener > const & theListener, css::lang::EventObject const & theEvent);
com::sun::star::lang::EventObject const & theEvent);
}; };
struct ContainerNotification { struct ContainerNotification {
com::sun::star::uno::Reference< css::uno::Reference< css::container::XContainerListener > listener;
com::sun::star::container::XContainerListener > listener; css::container::ContainerEvent event;
com::sun::star::container::ContainerEvent event;
ContainerNotification( ContainerNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::container::XContainerListener > const & theListener,
com::sun::star::container::XContainerListener > const & css::container::ContainerEvent const & theEvent);
theListener,
com::sun::star::container::ContainerEvent const & theEvent);
}; };
struct PropertyChangeNotification { struct PropertyChangeNotification {
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertyChangeListener > listener;
com::sun::star::beans::XPropertyChangeListener > listener; css::beans::PropertyChangeEvent event;
com::sun::star::beans::PropertyChangeEvent event;
PropertyChangeNotification( PropertyChangeNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertyChangeListener > const & theListener,
com::sun::star::beans::XPropertyChangeListener > const & css::beans::PropertyChangeEvent const & theEvent);
theListener,
com::sun::star::beans::PropertyChangeEvent const & theEvent);
}; };
struct PropertiesChangeNotification { struct PropertiesChangeNotification {
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertiesChangeListener > listener;
com::sun::star::beans::XPropertiesChangeListener > listener; css::uno::Sequence< css::beans::PropertyChangeEvent > event;
com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyChangeEvent > event;
PropertiesChangeNotification( PropertiesChangeNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::beans::XPropertiesChangeListener > const & theListener,
com::sun::star::beans::XPropertiesChangeListener > const & css::uno::Sequence< css::beans::PropertyChangeEvent > const & theEvent);
theListener,
com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyChangeEvent > const & theEvent);
}; };
struct ChangesNotification { struct ChangesNotification {
com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > css::uno::Reference< css::util::XChangesListener > listener;
listener; css::util::ChangesEvent event;
com::sun::star::util::ChangesEvent event;
ChangesNotification( ChangesNotification(
com::sun::star::uno::Reference< css::uno::Reference< css::util::XChangesListener > const & theListener,
com::sun::star::util::XChangesListener > const & theListener, css::util::ChangesEvent const & theEvent);
com::sun::star::util::ChangesEvent const & theEvent);
}; };
typedef std::vector< DisposeNotification > DisposeNotifications; typedef std::vector< DisposeNotification > DisposeNotifications;
......
...@@ -51,11 +51,11 @@ class Node; ...@@ -51,11 +51,11 @@ class Node;
class RootAccess; class RootAccess;
class ChildAccess: class ChildAccess:
public Access, public com::sun::star::container::XChild, public Access, public css::container::XChild,
public com::sun::star::lang::XUnoTunnel public css::lang::XUnoTunnel
{ {
public: public:
static com::sun::star::uno::Sequence< sal_Int8 > getTunnelId(); static css::uno::Sequence< sal_Int8 > getTunnelId();
ChildAccess( ChildAccess(
Components & components, rtl::Reference< RootAccess > const & root, Components & components, rtl::Reference< RootAccess > const & root,
...@@ -82,20 +82,19 @@ public: ...@@ -82,20 +82,19 @@ public:
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
virtual void SAL_CALL release() throw () SAL_OVERRIDE; virtual void SAL_CALL release() throw () SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > virtual css::uno::Reference< css::uno::XInterface >
SAL_CALL getParent() SAL_CALL getParent()
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setParent( virtual void SAL_CALL setParent(
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > css::uno::Reference< css::uno::XInterface > const &)
const &)
throw ( throw (
com::sun::star::lang::NoSupportException, css::lang::NoSupportException,
com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Int64 SAL_CALL getSomething( virtual sal_Int64 SAL_CALL getSomething(
com::sun::star::uno::Sequence< sal_Int8 > const & aIdentifier) css::uno::Sequence< sal_Int8 > const & aIdentifier)
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
void bind( void bind(
rtl::Reference< RootAccess > const & root, rtl::Reference< RootAccess > const & root,
...@@ -109,7 +108,7 @@ public: ...@@ -109,7 +108,7 @@ public:
void setNode(rtl::Reference< Node > const & node); void setNode(rtl::Reference< Node > const & node);
void setProperty( void setProperty(
com::sun::star::uno::Any const & value, css::uno::Any const & value,
Modifications * localModifications); Modifications * localModifications);
css::uno::Any asValue(); css::uno::Any asValue();
...@@ -123,20 +122,20 @@ private: ...@@ -123,20 +122,20 @@ private:
virtual ~ChildAccess(); virtual ~ChildAccess();
virtual void addTypes( virtual void addTypes(
std::vector< com::sun::star::uno::Type > * types) const SAL_OVERRIDE; std::vector< css::uno::Type > * types) const SAL_OVERRIDE;
virtual void addSupportedServiceNames( virtual void addSupportedServiceNames(
std::vector< OUString > * services) SAL_OVERRIDE; std::vector< OUString > * services) SAL_OVERRIDE;
virtual com::sun::star::uno::Any SAL_CALL queryInterface( virtual css::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & aType) css::uno::Type const & aType)
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
rtl::Reference< RootAccess > root_; rtl::Reference< RootAccess > root_;
rtl::Reference< Access > parent_; // null if free node rtl::Reference< Access > parent_; // null if free node
OUString name_; OUString name_;
rtl::Reference< Node > node_; rtl::Reference< Node > node_;
std::unique_ptr< com::sun::star::uno::Any > changedValue_; std::unique_ptr< css::uno::Any > changedValue_;
bool inTransaction_; bool inTransaction_;
// to determine if a free node can be inserted underneath some root // to determine if a free node can be inserted underneath some root
std::shared_ptr<osl::Mutex> lock_; std::shared_ptr<osl::Mutex> lock_;
......
...@@ -53,8 +53,7 @@ class RootAccess; ...@@ -53,8 +53,7 @@ class RootAccess;
class Components { class Components {
public: public:
static Components & getSingleton( static Components & getSingleton(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext > const & context);
const & context);
static bool allLocales(OUString const & locale); static bool allLocales(OUString const & locale);
...@@ -101,7 +100,7 @@ public: ...@@ -101,7 +100,7 @@ public:
std::set< OUString > const & excludedPaths, std::set< OUString > const & excludedPaths,
Modifications * modifications); Modifications * modifications);
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
getExternalValue(OUString const & descriptor); getExternalValue(OUString const & descriptor);
private: private:
...@@ -113,8 +112,7 @@ private: ...@@ -113,8 +112,7 @@ private:
Additions *); Additions *);
public: public:
explicit Components( explicit Components(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext > const & context);
const & context);
~Components(); ~Components();
private: private:
...@@ -151,13 +149,13 @@ private: ...@@ -151,13 +149,13 @@ private:
typedef typedef
config_map< config_map<
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::beans::XPropertySet > > css::beans::XPropertySet > >
ExternalServices; ExternalServices;
class WriteThread; class WriteThread;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
context_; context_;
Data data_; Data data_;
WeakRootSet roots_; WeakRootSet roots_;
......
...@@ -37,19 +37,19 @@ namespace com { namespace sun { namespace star { ...@@ -37,19 +37,19 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace configuration_provider { namespace configmgr { namespace configuration_provider {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > createDefault( css::uno::Reference< css::uno::XInterface > createDefault(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const & context); const & context);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory > css::uno::Reference< css::lang::XSingleComponentFactory >
SAL_CALL createFactory( SAL_CALL createFactory(
cppu::ComponentFactoryFunc, OUString const &, cppu::ComponentFactoryFunc, OUString const &,
com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *); css::uno::Sequence< OUString > const &, rtl_ModuleCount *);
} } } }
......
...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { ...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace configuration_registry { namespace configmgr { namespace configuration_registry {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL css::uno::Reference< css::uno::XInterface > SAL_CALL
create( create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const & context); const & context);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
} } } }
......
...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { ...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace default_provider { namespace configmgr { namespace default_provider {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL css::uno::Reference< css::uno::XInterface > SAL_CALL
create( create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const & context); const & context);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
} } } }
......
...@@ -33,20 +33,20 @@ namespace configmgr { ...@@ -33,20 +33,20 @@ namespace configmgr {
class LocalizedValueNode: public Node { class LocalizedValueNode: public Node {
public: public:
explicit LocalizedValueNode(int layer); explicit LocalizedValueNode(int layer);
LocalizedValueNode(int layer, com::sun::star::uno::Any const & value); LocalizedValueNode(int layer, css::uno::Any const & value);
virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE;
virtual OUString getTemplateName() const SAL_OVERRIDE; virtual OUString getTemplateName() const SAL_OVERRIDE;
com::sun::star::uno::Any getValue() const { return value_;} css::uno::Any getValue() const { return value_;}
com::sun::star::uno::Any *getValuePtr(int layer) css::uno::Any *getValuePtr(int layer)
{ {
setLayer(layer); setLayer(layer);
return &value_; return &value_;
} }
void setValue(int layer, com::sun::star::uno::Any const & value); void setValue(int layer, css::uno::Any const & value);
private: private:
LocalizedValueNode(LocalizedValueNode const & other); LocalizedValueNode(LocalizedValueNode const & other);
...@@ -55,7 +55,7 @@ private: ...@@ -55,7 +55,7 @@ private:
virtual Kind kind() const SAL_OVERRIDE; virtual Kind kind() const SAL_OVERRIDE;
com::sun::star::uno::Any value_; css::uno::Any value_;
}; };
} }
......
...@@ -70,7 +70,7 @@ void PropertyNode::setValue(int layer, css::uno::Any const & value) { ...@@ -70,7 +70,7 @@ void PropertyNode::setValue(int layer, css::uno::Any const & value) {
externalDescriptor_.clear(); externalDescriptor_.clear();
} }
com::sun::star::uno::Any *PropertyNode::getValuePtr(int layer) css::uno::Any *PropertyNode::getValuePtr(int layer)
{ {
setLayer(layer); setLayer(layer);
externalDescriptor_.clear(); externalDescriptor_.clear();
......
...@@ -37,7 +37,7 @@ class PropertyNode: public Node { ...@@ -37,7 +37,7 @@ class PropertyNode: public Node {
public: public:
PropertyNode( PropertyNode(
int layer, Type staticType, bool nillable, int layer, Type staticType, bool nillable,
com::sun::star::uno::Any const & value, bool extension); css::uno::Any const & value, bool extension);
virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE; virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE;
...@@ -45,10 +45,10 @@ public: ...@@ -45,10 +45,10 @@ public:
bool isNillable() const { return nillable_;} bool isNillable() const { return nillable_;}
com::sun::star::uno::Any getValue(Components & components); css::uno::Any getValue(Components & components);
void setValue(int layer, com::sun::star::uno::Any const & value); void setValue(int layer, css::uno::Any const & value);
com::sun::star::uno::Any *getValuePtr(int layer); css::uno::Any *getValuePtr(int layer);
void setExternal(int layer, OUString const & descriptor); void setExternal(int layer, OUString const & descriptor);
...@@ -67,7 +67,7 @@ private: ...@@ -67,7 +67,7 @@ private:
bool nillable_; bool nillable_;
bool extension_; bool extension_;
OUString externalDescriptor_; OUString externalDescriptor_;
com::sun::star::uno::Any value_; css::uno::Any value_;
}; };
} }
......
...@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star { ...@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace read_only_access { namespace configmgr { namespace read_only_access {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL css::uno::Reference< css::uno::XInterface > SAL_CALL
create( create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const &); const &);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
} } } }
......
...@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star { ...@@ -23,14 +23,14 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace read_write_access { namespace configmgr { namespace read_write_access {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL css::uno::Reference< css::uno::XInterface > SAL_CALL
create( create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const &); const &);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
} } } }
......
...@@ -54,8 +54,8 @@ class Components; ...@@ -54,8 +54,8 @@ class Components;
class Node; class Node;
class RootAccess: class RootAccess:
public Access, public com::sun::star::util::XChangesNotifier, public Access, public css::util::XChangesNotifier,
public com::sun::star::util::XChangesBatch public css::util::XChangesBatch
{ {
public: public:
RootAccess( RootAccess(
...@@ -80,26 +80,26 @@ public: ...@@ -80,26 +80,26 @@ public:
void setAlive(bool b); void setAlive(bool b);
virtual void SAL_CALL addChangesListener( virtual void SAL_CALL addChangesListener(
com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > css::uno::Reference< css::util::XChangesListener >
const & aListener) const & aListener)
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeChangesListener( virtual void SAL_CALL removeChangesListener(
com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > css::uno::Reference< css::util::XChangesListener >
const & aListener) const & aListener)
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL commitChanges() virtual void SAL_CALL commitChanges()
throw ( throw (
com::sun::star::lang::WrappedTargetException, css::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException, css::uno::RuntimeException,
std::exception) SAL_OVERRIDE; std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasPendingChanges() virtual sal_Bool SAL_CALL hasPendingChanges()
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual com::sun::star::util::ChangesSet SAL_CALL getPendingChanges() virtual css::util::ChangesSet SAL_CALL getPendingChanges()
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: private:
virtual ~RootAccess(); virtual ~RootAccess();
...@@ -118,7 +118,7 @@ private: ...@@ -118,7 +118,7 @@ private:
virtual rtl::Reference< Access > getParentAccess() SAL_OVERRIDE; virtual rtl::Reference< Access > getParentAccess() SAL_OVERRIDE;
virtual void addTypes(std::vector< com::sun::star::uno::Type > * types) virtual void addTypes(std::vector< css::uno::Type > * types)
const SAL_OVERRIDE; const SAL_OVERRIDE;
virtual void addSupportedServiceNames( virtual void addSupportedServiceNames(
...@@ -128,17 +128,17 @@ private: ...@@ -128,17 +128,17 @@ private:
virtual void clearListeners() throw () SAL_OVERRIDE; virtual void clearListeners() throw () SAL_OVERRIDE;
virtual com::sun::star::uno::Any SAL_CALL queryInterface( virtual css::uno::Any SAL_CALL queryInterface(
com::sun::star::uno::Type const & aType) css::uno::Type const & aType)
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getImplementationName() virtual OUString SAL_CALL getImplementationName()
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
typedef typedef
std::multiset< std::multiset<
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::util::XChangesListener > > css::util::XChangesListener > >
ChangesListeners; ChangesListeners;
OUString pathRepresentation_; OUString pathRepresentation_;
......
...@@ -39,9 +39,9 @@ bool isListType(Type type); ...@@ -39,9 +39,9 @@ bool isListType(Type type);
Type elementType(Type type); Type elementType(Type type);
com::sun::star::uno::Type mapType(Type type); css::uno::Type mapType(Type type);
Type getDynamicType(com::sun::star::uno::Any const & value); Type getDynamicType(css::uno::Any const & value);
} }
......
...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star { ...@@ -35,14 +35,14 @@ namespace com { namespace sun { namespace star {
namespace configmgr { namespace update { namespace configmgr { namespace update {
com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL css::uno::Reference< css::uno::XInterface > SAL_CALL
create( create(
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext >
const &); const &);
OUString SAL_CALL getImplementationName(); OUString SAL_CALL getImplementationName();
com::sun::star::uno::Sequence< OUString > SAL_CALL css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames(); getSupportedServiceNames();
} } } }
......
...@@ -71,7 +71,7 @@ private: ...@@ -71,7 +71,7 @@ private:
ValueParser(const ValueParser&) SAL_DELETED_FUNCTION; ValueParser(const ValueParser&) SAL_DELETED_FUNCTION;
ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION; ValueParser& operator=(const ValueParser&) SAL_DELETED_FUNCTION;
template< typename T > com::sun::star::uno::Any convertItems(); template< typename T > css::uno::Any convertItems();
enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE }; enum State { STATE_TEXT, STATE_TEXT_UNICODE, STATE_IT, STATE_IT_UNICODE };
...@@ -80,7 +80,7 @@ private: ...@@ -80,7 +80,7 @@ private:
OUString localizedName_; OUString localizedName_;
State state_; State state_;
xmlreader::Pad pad_; xmlreader::Pad pad_;
std::vector< com::sun::star::uno::Any > items_; std::vector< css::uno::Any > items_;
}; };
} }
......
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