summaryrefslogtreecommitdiff
path: root/writerperfect/source/draw
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-08-15 08:46:11 +0200
committerDavid Tardon <dtardon@redhat.com>2014-08-15 09:03:51 +0200
commit7de2366a975c22cd77a1a3a64da6b7c642334ae1 (patch)
tree0af883a899a2803f1d74fbdcd96577d4b6d31ca3 /writerperfect/source/draw
parent2c75925a809796e4177e5accaf6dfea566ea91bc (diff)
use consistent style for writerperfect
Change-Id: I47089586094b58c39a128e44e2671d69c2d50177
Diffstat (limited to 'writerperfect/source/draw')
-rw-r--r--writerperfect/source/draw/CDRImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/CDRImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/CMXImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/CMXImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/FreehandImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/FreehandImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/ImportFilterBase.cxx50
-rw-r--r--writerperfect/source/draw/ImportFilterBase.hxx44
-rw-r--r--writerperfect/source/draw/MSPUBImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/MSPUBImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/MWAWDrawImportFilter.cxx28
-rw-r--r--writerperfect/source/draw/MWAWDrawImportFilter.hxx26
-rw-r--r--writerperfect/source/draw/PageMakerImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/PageMakerImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/VisioImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/VisioImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/WPGImportFilter.cxx24
-rw-r--r--writerperfect/source/draw/WPGImportFilter.hxx24
-rw-r--r--writerperfect/source/draw/wpftdraw_genericfilter.cxx89
19 files changed, 301 insertions, 272 deletions
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index e0c1bd8a74e8..c5fa26939b46 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -27,12 +27,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool CDRImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libcdr::CDRDocument::parse(&rInput, &rGenerator);
}
-bool CDRImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool CDRImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libcdr::CDRDocument::isSupported(&rInput))
{
@@ -43,13 +43,13 @@ bool CDRImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUStr
return false;
}
-OUString CDRImportFilter_getImplementationName ()
+OUString CDRImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.CDRImportFilter" );
+ return OUString("com.sun.star.comp.Draw.CDRImportFilter");
}
-Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -59,24 +59,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL CDRImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL CDRImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new CDRImportFilter( rContext );
+ return (cppu::OWeakObject *) new CDRImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL CDRImportFilter::getImplementationName( )
+OUString SAL_CALL CDRImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return CDRImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL CDRImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL CDRImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return CDRImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx
index 3df8ccc36f8f..2b8526af2ac7 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -19,33 +19,33 @@
class CDRImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- CDRImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ CDRImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString CDRImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL CDRImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL CDRImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index f9044f831a46..6b6d5a864d31 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -27,12 +27,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool CMXImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool CMXImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libcdr::CMXDocument::parse(&rInput, &rGenerator);
}
-bool CMXImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool CMXImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libcdr::CMXDocument::isSupported(&rInput))
{
@@ -43,13 +43,13 @@ bool CMXImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUStr
return false;
}
-OUString CMXImportFilter_getImplementationName ()
+OUString CMXImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.CMXImportFilter" );
+ return OUString("com.sun.star.comp.Draw.CMXImportFilter");
}
-Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -59,24 +59,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL CMXImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL CMXImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new CMXImportFilter( rContext );
+ return (cppu::OWeakObject *) new CMXImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL CMXImportFilter::getImplementationName( )
+OUString SAL_CALL CMXImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return CMXImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL CMXImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL CMXImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return CMXImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx
index 43ffe96b5a15..0c7f0b207411 100644
--- a/writerperfect/source/draw/CMXImportFilter.hxx
+++ b/writerperfect/source/draw/CMXImportFilter.hxx
@@ -19,33 +19,33 @@
class CMXImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- CMXImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ CMXImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString CMXImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL CMXImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL CMXImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index db378582248d..86002f3a20ae 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -23,12 +23,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool FreehandImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool FreehandImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libfreehand::FreeHandDocument::parse(&rInput, &rGenerator);
}
-bool FreehandImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool FreehandImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libfreehand::FreeHandDocument::isSupported(&rInput))
{
@@ -39,13 +39,13 @@ bool FreehandImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput,
return false;
}
-OUString FreehandImportFilter_getImplementationName ()
+OUString FreehandImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.FreehandImportFilter" );
+ return OUString("com.sun.star.comp.Draw.FreehandImportFilter");
}
-Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -55,24 +55,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL FreehandImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL FreehandImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new FreehandImportFilter( rContext );
+ return (cppu::OWeakObject *) new FreehandImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL FreehandImportFilter::getImplementationName( )
+OUString SAL_CALL FreehandImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return FreehandImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL FreehandImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL FreehandImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return FreehandImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/FreehandImportFilter.hxx b/writerperfect/source/draw/FreehandImportFilter.hxx
index 0f9e284ba1d1..6b1c94dcb797 100644
--- a/writerperfect/source/draw/FreehandImportFilter.hxx
+++ b/writerperfect/source/draw/FreehandImportFilter.hxx
@@ -16,33 +16,33 @@
class FreehandImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- FreehandImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ FreehandImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString FreehandImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL FreehandImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL FreehandImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL FreehandImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/ImportFilterBase.cxx b/writerperfect/source/draw/ImportFilterBase.cxx
index fc6c8ee223a0..9d2258c79b50 100644
--- a/writerperfect/source/draw/ImportFilterBase.cxx
+++ b/writerperfect/source/draw/ImportFilterBase.cxx
@@ -50,8 +50,8 @@ using com::sun::star::xml::sax::XParser;
using writerperfect::DocumentHandler;
using writerperfect::WPXSvInputStream;
-ImportFilterImpl::ImportFilterImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : mxContext( rxContext )
+ImportFilterImpl::ImportFilterImpl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : mxContext(rxContext)
{
}
@@ -59,20 +59,20 @@ ImportFilterImpl::~ImportFilterImpl()
{
}
-sal_Bool SAL_CALL ImportFilterImpl::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+sal_Bool SAL_CALL ImportFilterImpl::filter(const Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
throw (RuntimeException, std::exception)
{
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
Reference < XInputStream > xInputStream;
- for ( sal_Int32 i = 0 ; i < nLength; i++)
+ for (sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name == "InputStream" )
+ if (pValue[i].Name == "InputStream")
pValue[i].Value >>= xInputStream;
}
- if ( !xInputStream.is() )
+ if (!xInputStream.is())
{
- OSL_ASSERT( false );
+ OSL_ASSERT(false);
return sal_False;
}
@@ -84,13 +84,13 @@ throw (RuntimeException, std::exception)
// The XImporter sets up an empty target document for XDocumentHandler to write to..
Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
- xImporter->setTargetDocument( mxDoc );
+ xImporter->setTargetDocument(mxDoc);
// OO Graphics Handler: abstract class to handle document SAX messages, concrete implementation here
// writes to in-memory target doc
DocumentHandler xHandler(xInternalHandler);
- WPXSvInputStream input( xInputStream );
+ WPXSvInputStream input(xInputStream);
OdgGenerator exporter;
exporter.addDocumentHandler(&xHandler, ODF_FLAT_XML);
@@ -100,45 +100,45 @@ throw (RuntimeException, std::exception)
return doImportDocument(input, exporter);
}
-void SAL_CALL ImportFilterImpl::cancel( )
+void SAL_CALL ImportFilterImpl::cancel()
throw (RuntimeException, std::exception)
{
}
// XImporter
-void SAL_CALL ImportFilterImpl::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc )
+void SAL_CALL ImportFilterImpl::setTargetDocument(const Reference< ::com::sun::star::lang::XComponent > &xDoc)
throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
{
mxDoc = xDoc;
}
// XExtendedFilterDetection
-OUString SAL_CALL ImportFilterImpl::detect( com::sun::star::uno::Sequence< PropertyValue >& Descriptor )
-throw( com::sun::star::uno::RuntimeException, std::exception )
+OUString SAL_CALL ImportFilterImpl::detect(com::sun::star::uno::Sequence< PropertyValue > &Descriptor)
+throw(com::sun::star::uno::RuntimeException, std::exception)
{
OUString sTypeName;
sal_Int32 nLength = Descriptor.getLength();
sal_Int32 location = nLength;
const PropertyValue *pValue = Descriptor.getConstArray();
Reference < XInputStream > xInputStream;
- for ( sal_Int32 i = 0 ; i < nLength; i++)
+ for (sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name == "TypeName" )
+ if (pValue[i].Name == "TypeName")
location=i;
- else if ( pValue[i].Name == "InputStream" )
+ else if (pValue[i].Name == "InputStream")
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return OUString();
- WPXSvInputStream input( xInputStream );
+ WPXSvInputStream input(xInputStream);
- if ( doDetectFormat( input, sTypeName ) )
+ if (doDetectFormat(input, sTypeName))
{
- assert (!sTypeName.isEmpty());
+ assert(!sTypeName.isEmpty());
- if ( location == nLength )
+ if (location == nLength)
{
Descriptor.realloc(nLength+1);
Descriptor[location].Name = "TypeName";
@@ -152,18 +152,18 @@ throw( com::sun::star::uno::RuntimeException, std::exception )
// XInitialization
-void SAL_CALL ImportFilterImpl::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL ImportFilterImpl::initialize(const Sequence< Any > &aArguments)
throw (Exception, RuntimeException, std::exception)
{
Sequence < PropertyValue > aAnySeq;
sal_Int32 nLength = aArguments.getLength();
- if ( nLength && ( aArguments[0] >>= aAnySeq ) )
+ if (nLength && (aArguments[0] >>= aAnySeq))
{
const PropertyValue *pValue = aAnySeq.getConstArray();
nLength = aAnySeq.getLength();
- for ( sal_Int32 i = 0 ; i < nLength; i++)
+ for (sal_Int32 i = 0 ; i < nLength; i++)
{
- if ( pValue[i].Name == "Type" )
+ if (pValue[i].Name == "Type")
{
pValue[i].Value >>= msFilterName;
break;
@@ -172,7 +172,7 @@ throw (Exception, RuntimeException, std::exception)
}
}
-void ImportFilterImpl::doRegisterHandlers( OdgGenerator & )
+void ImportFilterImpl::doRegisterHandlers(OdgGenerator &)
{
}
diff --git a/writerperfect/source/draw/ImportFilterBase.hxx b/writerperfect/source/draw/ImportFilterBase.hxx
index f326d98b3730..4b7e9170f56b 100644
--- a/writerperfect/source/draw/ImportFilterBase.hxx
+++ b/writerperfect/source/draw/ImportFilterBase.hxx
@@ -20,24 +20,34 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx>
-namespace com { namespace sun { namespace star {
+namespace com
+{
+namespace sun
+{
+namespace star
+{
namespace beans
{
- struct PropertyValue;
+struct PropertyValue;
}
namespace lang
{
- class XComponent;
+class XComponent;
}
namespace uno
{
- class XComponentContext;
+class XComponentContext;
+}
+namespace xml
+{
+namespace sax
+{
+class XDocumentHandler;
+}
+}
}
-namespace xml { namespace sax {
- class XDocumentHandler;
}
}
-} } }
class OdgGenerator;
@@ -58,31 +68,31 @@ class ImportFilterImpl : public cppu::WeakImplHelper4
>
{
public:
- ImportFilterImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext );
+ ImportFilterImpl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext);
virtual ~ImportFilterImpl();
// XFilter
- virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+ virtual sal_Bool SAL_CALL filter(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > &aDescriptor)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL cancel( )
+ virtual void SAL_CALL cancel()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XImporter
- virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
+ virtual void SAL_CALL setTargetDocument(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &xDoc)
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//XExtendedFilterDetection
- virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual OUString SAL_CALL detect(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &Descriptor)
+ throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+ virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > &aArguments)
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) = 0;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) = 0;
- virtual void doRegisterHandlers( OdgGenerator &rGenerator );
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) = 0;
+ virtual void doRegisterHandlers(OdgGenerator &rGenerator);
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 99d59413443c..4a09651bb252 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -25,12 +25,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool MSPUBImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool MSPUBImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libmspub::MSPUBDocument::parse(&rInput, &rGenerator);
}
-bool MSPUBImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool MSPUBImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libmspub::MSPUBDocument::isSupported(&rInput))
{
@@ -41,13 +41,13 @@ bool MSPUBImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUS
return false;
}
-OUString MSPUBImportFilter_getImplementationName ()
+OUString MSPUBImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.MSPUBImportFilter" );
+ return OUString("com.sun.star.comp.Draw.MSPUBImportFilter");
}
-Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -57,24 +57,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL MSPUBImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL MSPUBImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new MSPUBImportFilter( rContext );
+ return (cppu::OWeakObject *) new MSPUBImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL MSPUBImportFilter::getImplementationName( )
+OUString SAL_CALL MSPUBImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return MSPUBImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL MSPUBImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL MSPUBImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return MSPUBImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx
index b615af8b3f02..c0e702c8e297 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.hxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.hxx
@@ -16,33 +16,33 @@
class MSPUBImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- MSPUBImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ MSPUBImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString MSPUBImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL MSPUBImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL MSPUBImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index feddcdbdc6cf..96b007f572c3 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -39,12 +39,12 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData
return MWAWDocument::decodeSpreadsheet(data, &exporter);
}
-bool MWAWDrawImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator);
}
-bool MWAWDrawImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
rTypeName = "";
@@ -54,7 +54,7 @@ bool MWAWDrawImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput,
if (confidence == MWAWDocument::MWAW_C_EXCELLENT)
{
- if ( docKind == MWAWDocument::MWAW_K_DRAW || docKind == MWAWDocument::MWAW_K_PAINT )
+ if (docKind == MWAWDocument::MWAW_K_DRAW || docKind == MWAWDocument::MWAW_K_PAINT)
{
switch (docType)
{
@@ -143,19 +143,19 @@ bool MWAWDrawImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput,
return !rTypeName.isEmpty();
}
-void MWAWDrawImportFilter::doRegisterHandlers( OdgGenerator &rGenerator )
+void MWAWDrawImportFilter::doRegisterHandlers(OdgGenerator &rGenerator)
{
rGenerator.registerEmbeddedObjectHandler("image/mwaw-odg", &handleEmbeddedMWAWGraphicObject);
rGenerator.registerEmbeddedObjectHandler("image/mwaw-ods", &handleEmbeddedMWAWSpreadsheetObject);
}
-OUString MWAWDrawImportFilter_getImplementationName ()
+OUString MWAWDrawImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.MWAWDrawImportFilter" );
+ return OUString("com.sun.star.comp.Draw.MWAWDrawImportFilter");
}
-Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -165,24 +165,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL MWAWDrawImportFilter_createInstance( const Reference< XComponentContext > &rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL MWAWDrawImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new MWAWDrawImportFilter( rContext );
+ return (cppu::OWeakObject *) new MWAWDrawImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL MWAWDrawImportFilter::getImplementationName( )
+OUString SAL_CALL MWAWDrawImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return MWAWDrawImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL MWAWDrawImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return MWAWDrawImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
index 173629e2e3b4..2a23e6b36f54 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx
@@ -21,32 +21,32 @@
class MWAWDrawImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- MWAWDrawImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext ) {}
+ MWAWDrawImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext) {}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
- virtual void doRegisterHandlers( OdgGenerator &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
+ virtual void doRegisterHandlers(OdgGenerator &rGenerator) SAL_OVERRIDE;
};
OUString MWAWDrawImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL MWAWDrawImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL MWAWDrawImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL MWAWDrawImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx
index a43cfaeb59e1..bb836d342076 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -25,12 +25,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool PageMakerImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool PageMakerImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libpagemaker::PMDocument::parse(&rInput, &rGenerator);
}
-bool PageMakerImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool PageMakerImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libpagemaker::PMDocument::isSupported(&rInput))
{
@@ -41,13 +41,13 @@ bool PageMakerImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput,
return false;
}
-OUString PageMakerImportFilter_getImplementationName ()
+OUString PageMakerImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString( "org.libreoffice.comp.Draw.PageMakerImportFilter" );
+ return OUString("org.libreoffice.comp.Draw.PageMakerImportFilter");
}
-Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence< OUString > aRet(2);
@@ -57,24 +57,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL PageMakerImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL PageMakerImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new PageMakerImportFilter( rContext );
+ return (cppu::OWeakObject *) new PageMakerImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL PageMakerImportFilter::getImplementationName( )
+OUString SAL_CALL PageMakerImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return PageMakerImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL PageMakerImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL PageMakerImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL PageMakerImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return PageMakerImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/PageMakerImportFilter.hxx b/writerperfect/source/draw/PageMakerImportFilter.hxx
index cc9ef994209d..e69474e1fee5 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.hxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.hxx
@@ -16,33 +16,33 @@
class PageMakerImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- PageMakerImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ PageMakerImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString PageMakerImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL PageMakerImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL PageMakerImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL PageMakerImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 969697b2c822..deae25afcc87 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -23,12 +23,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool VisioImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool VisioImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libvisio::VisioDocument::parse(&rInput, &rGenerator);
}
-bool VisioImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool VisioImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libvisio::VisioDocument::isSupported(&rInput))
{
@@ -39,13 +39,13 @@ bool VisioImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUS
return false;
}
-OUString VisioImportFilter_getImplementationName ()
+OUString VisioImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.VisioImportFilter" );
+ return OUString("com.sun.star.comp.Draw.VisioImportFilter");
}
-Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -55,24 +55,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL VisioImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL VisioImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new VisioImportFilter( rContext );
+ return (cppu::OWeakObject *) new VisioImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL VisioImportFilter::getImplementationName( )
+OUString SAL_CALL VisioImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return VisioImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL VisioImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL VisioImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return VisioImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx
index 2b2346289b6f..5f2120fd98e1 100644
--- a/writerperfect/source/draw/VisioImportFilter.hxx
+++ b/writerperfect/source/draw/VisioImportFilter.hxx
@@ -16,33 +16,33 @@
class VisioImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- VisioImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ VisioImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString VisioImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL VisioImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL VisioImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index 6c0eac03f8d0..7c7ff885b358 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -30,12 +30,12 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface;
-bool WPGImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator )
+bool WPGImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator)
{
return libwpg::WPGraphics::parse(&rInput, &rGenerator);
}
-bool WPGImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName )
+bool WPGImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName)
{
if (libwpg::WPGraphics::isSupported(&rInput))
{
@@ -46,13 +46,13 @@ bool WPGImportFilter::doDetectFormat( librevenge::RVNGInputStream &rInput, OUStr
return false;
}
-OUString WPGImportFilter_getImplementationName ()
+OUString WPGImportFilter_getImplementationName()
throw (RuntimeException)
{
- return OUString ( "com.sun.star.comp.Draw.WPGImportFilter" );
+ return OUString("com.sun.star.comp.Draw.WPGImportFilter");
}
-Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames()
throw (RuntimeException)
{
Sequence < OUString > aRet(2);
@@ -62,24 +62,24 @@ throw (RuntimeException)
return aRet;
}
-Reference< XInterface > SAL_CALL WPGImportFilter_createInstance( const Reference< XComponentContext > & rContext)
-throw( Exception )
+Reference< XInterface > SAL_CALL WPGImportFilter_createInstance(const Reference< XComponentContext > &rContext)
+throw(Exception)
{
- return (cppu::OWeakObject *) new WPGImportFilter( rContext );
+ return (cppu::OWeakObject *) new WPGImportFilter(rContext);
}
// XServiceInfo
-OUString SAL_CALL WPGImportFilter::getImplementationName( )
+OUString SAL_CALL WPGImportFilter::getImplementationName()
throw (RuntimeException, std::exception)
{
return WPGImportFilter_getImplementationName();
}
-sal_Bool SAL_CALL WPGImportFilter::supportsService( const OUString &rServiceName )
+sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString &rServiceName)
throw (RuntimeException, std::exception)
{
- return cppu::supportsService( this, rServiceName );
+ return cppu::supportsService(this, rServiceName);
}
-Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames( )
+Sequence< OUString > SAL_CALL WPGImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return WPGImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx
index 98cc3aaaecc6..b55c9fecfb58 100644
--- a/writerperfect/source/draw/WPGImportFilter.hxx
+++ b/writerperfect/source/draw/WPGImportFilter.hxx
@@ -21,33 +21,33 @@
class WPGImportFilter : public writerperfect::draw::ImportFilterBase
{
public:
- WPGImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
- : writerperfect::draw::ImportFilterBase( rxContext )
+ WPGImportFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext)
+ : writerperfect::draw::ImportFilterBase(rxContext)
{
}
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
+ virtual sal_Bool SAL_CALL supportsService(const OUString &ServiceName)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
- virtual bool doDetectFormat( librevenge::RVNGInputStream &rInput, OUString &rTypeName ) SAL_OVERRIDE;
- virtual bool doImportDocument( librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator ) SAL_OVERRIDE;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
+ virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE;
};
OUString WPGImportFilter_getImplementationName()
-throw ( ::com::sun::star::uno::RuntimeException );
+throw (::com::sun::star::uno::RuntimeException);
-::com::sun::star::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames( )
-throw ( ::com::sun::star::uno::RuntimeException );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames()
+throw (::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
-SAL_CALL WPGImportFilter_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
-throw ( ::com::sun::star::uno::Exception );
+SAL_CALL WPGImportFilter_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext)
+throw (::com::sun::star::uno::Exception);
#endif
diff --git a/writerperfect/source/draw/wpftdraw_genericfilter.cxx b/writerperfect/source/draw/wpftdraw_genericfilter.cxx
index e80014123fdd..920660f8598f 100644
--- a/writerperfect/source/draw/wpftdraw_genericfilter.cxx
+++ b/writerperfect/source/draw/wpftdraw_genericfilter.cxx
@@ -38,47 +38,66 @@
#include "VisioImportFilter.hxx"
#include "WPGImportFilter.hxx"
-namespace {
+namespace
+{
-static cppu::ImplementationEntry const services[] = {
- { &CDRImportFilter_createInstance, &CDRImportFilter_getImplementationName,
- &CDRImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &CMXImportFilter_createInstance, &CMXImportFilter_getImplementationName,
- &CMXImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &FreehandImportFilter_createInstance,
- &FreehandImportFilter_getImplementationName,
- &FreehandImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &PageMakerImportFilter_createInstance,
- &PageMakerImportFilter_getImplementationName,
- &PageMakerImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &MSPUBImportFilter_createInstance,
- &MSPUBImportFilter_getImplementationName,
- &MSPUBImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &MWAWDrawImportFilter_createInstance,
- &MWAWDrawImportFilter_getImplementationName,
- &MWAWDrawImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &VisioImportFilter_createInstance,
- &VisioImportFilter_getImplementationName,
- &VisioImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { &WPGImportFilter_createInstance, &WPGImportFilter_getImplementationName,
- &WPGImportFilter_getSupportedServiceNames,
- &cppu::createSingleComponentFactory, 0, 0 },
- { 0, 0, 0, 0, 0, 0 } };
+static cppu::ImplementationEntry const services[] =
+{
+ {
+ &CDRImportFilter_createInstance, &CDRImportFilter_getImplementationName,
+ &CDRImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &CMXImportFilter_createInstance, &CMXImportFilter_getImplementationName,
+ &CMXImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &FreehandImportFilter_createInstance,
+ &FreehandImportFilter_getImplementationName,
+ &FreehandImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &PageMakerImportFilter_createInstance,
+ &PageMakerImportFilter_getImplementationName,
+ &PageMakerImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &MSPUBImportFilter_createInstance,
+ &MSPUBImportFilter_getImplementationName,
+ &MSPUBImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &MWAWDrawImportFilter_createInstance,
+ &MWAWDrawImportFilter_getImplementationName,
+ &MWAWDrawImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &VisioImportFilter_createInstance,
+ &VisioImportFilter_getImplementationName,
+ &VisioImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ {
+ &WPGImportFilter_createInstance, &WPGImportFilter_getImplementationName,
+ &WPGImportFilter_getSupportedServiceNames,
+ &cppu::createSingleComponentFactory, 0, 0
+ },
+ { 0, 0, 0, 0, 0, 0 }
+};
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wpftdraw_component_getFactory(
- char const * pImplName, void * pServiceManager, void * pRegistryKey)
+extern "C" SAL_DLLPUBLIC_EXPORT void *SAL_CALL wpftdraw_component_getFactory(
+ char const *pImplName, void *pServiceManager, void *pRegistryKey)
{
return cppu::component_getFactoryHelper(
- pImplName, pServiceManager, pRegistryKey, services);
+ pImplName, pServiceManager, pRegistryKey, services);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */