diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 16:05:18 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-18 17:11:23 +0200 |
| commit | 1f6017f758b4caa6138ccc1e74b6d2e5b924469d (patch) | |
| tree | bb7feb6b6b825ec08d0368c1f0579de5e1098864 /writerfilter/inc/dmapper | |
| parent | f6f41960fa7171ca52da1668862cf3accfc81421 (diff) | |
writerfilter: drop global 'using css' from WW8ResourceModel.hxx
Change-Id: I2196a1df09a6f35e4de3ab3cc84bc1e149cd8f61
Diffstat (limited to 'writerfilter/inc/dmapper')
| -rw-r--r-- | writerfilter/inc/dmapper/DomainMapper.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index cb65fe269819..9266f0834478 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -124,9 +124,9 @@ public: /// Enable storing of seen tokens in a named grab bag. void enableInteropGrabBag(const OUString& aName); /// Get the stored tokens and clear the internal storage. - beans::PropertyValue getInteropGrabBag(); + css::beans::PropertyValue getInteropGrabBag(); - uno::Sequence<beans::PropertyValue> GetThemeFontLangProperties() const; + css::uno::Sequence<css::beans::PropertyValue> GetThemeFontLangProperties() const; css::uno::Sequence<css::beans::PropertyValue> GetCompatSettings() const; void HandleRedline( Sprm& rSprm ); @@ -150,7 +150,7 @@ private: writerfilter::Reference<Table>::Pointer_t ref) SAL_OVERRIDE; virtual void lcl_substream(Id name, ::writerfilter::Reference<Stream>::Pointer_t ref) SAL_OVERRIDE; - virtual void lcl_info(const string & info) SAL_OVERRIDE; + virtual void lcl_info(const std::string & info) SAL_OVERRIDE; // Properties virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE; |