diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 16:13:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 16:14:08 +0000 |
| commit | 2b76184892ddaeebaf8603f62c54dee17922f274 (patch) | |
| tree | 7ead69b8f130309eccf65e623d0e64a2d8ab658c /include/vcl/graphicfilter.hxx | |
| parent | 79ab9d7b6ede19bc494770bba6cc59bd4618d5ae (diff) | |
Revert "Doxygen warnings corrected"
This reverts commit ff8036df5c5575503dc30d255dfbe99cc637c510.
multiple build failures with namespace collisions etc
Change-Id: Ie8ac08feff518af3584a26957f07a60d95932c76
Reviewed-on: https://gerrit.libreoffice.org/7855
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl/graphicfilter.hxx')
| -rw-r--r-- | include/vcl/graphicfilter.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index ba02c306b71a..db129e1135ec 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -30,8 +30,6 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> -using namespace ::com::sun::star; - class FilterConfigCache; struct WMF_EXTERNALHEADER; struct ConvertData; @@ -172,14 +170,14 @@ public: /** Ctor to set a filename - Detect() must be called to identify the file + ::Detect() must be called to identify the file If the file has no unique header (Mtf's), the format is determined from the extension */ GraphicDescriptor( const INetURLObject& rPath ); /** Ctor using a stream - Detect() must be called to identify the file + ::Detect() must be called to identify the file As some formats (Mtf's) do not have a unique header, it makes sense to supply the file name (incl. ext.), so that the format can be derived from the extension */ @@ -280,10 +278,10 @@ public: sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - const uno::Sequence< beans::PropertyValue >* pFilterData = NULL ); + const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); sal_uInt16 ExportGraphic( const Graphic& rGraphic, const OUString& rPath, SvStream& rOStm, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, - const uno::Sequence< beans::PropertyValue >* pFilterData = NULL ); + const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); long GetExportGraphicHint() const { return nExpGraphHint; } sal_uInt16 CanImportGraphic( const INetURLObject& rPath, |