writerperfect: astyle -> clang-format

< vmiklos> dtardon: are you strongly attached to astyle usage in
core.git writerperfect/? my problem is that 1) when less regular
contributors touch it, they don't run astyle  2) core.git has git hooks
in place to enforce consistent style for selected files, but that uses
clang-format. i wonder if switching to the standard core.git
clang-format would be an option to stop this reformat game

<@dtardon> vmiklos, clang-format is okay. we started to use astyle years
ago, before there were even any serious talk about automatic formatting
for the whole libreoffice

Change-Id: I844fc9c2e8560e54a49f26064cc0b3c55a5f034c
Reviewed-on: https://gerrit.libreoffice.org/53184
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

1 files changed, 43 insertions, 47 deletions

diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index c59fb9431a47..53029ef32176 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -41,35 +41,31 @@
 
 namespace writerperfect
 {
-
 namespace detail
 {
-
-template<class Generator>
-class ImportFilterImpl : public cppu::WeakImplHelper
-    <
-    css::document::XFilter,
-    css::document::XImporter,
-    css::document::XExtendedFilterDetection,
-    css::lang::XInitialization
-    >
+template <class Generator>
+class ImportFilterImpl
+    : public cppu::WeakImplHelper<css::document::XFilter, css::document::XImporter,
+                                  css::document::XExtendedFilterDetection,
+                                  css::lang::XInitialization>
 {
 public:
-    ImportFilterImpl(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
+    ImportFilterImpl(const css::uno::Reference<css::uno::XComponentContext>& rxContext)
         : mxContext(rxContext)
     {
     }
 
-    const css::uno::Reference< css::uno::XComponentContext > &getXContext() const
+    const css::uno::Reference<css::uno::XComponentContext>& getXContext() const
     {
         return mxContext;
     }
 
     // XFilter
-    virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &rDescriptor) override
+    virtual sal_Bool SAL_CALL
+    filter(const css::uno::Sequence<css::beans::PropertyValue>& rDescriptor) override
     {
         utl::MediaDescriptor aDescriptor(rDescriptor);
-        css::uno::Reference < css::io::XInputStream > xInputStream;
+        css::uno::Reference<css::io::XInputStream> xInputStream;
         aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
         if (!xInputStream.is())
         {
@@ -78,13 +74,14 @@ public:
         }
 
         // An XML import service: what we push sax messages to..
-        css::uno::Reference < css::xml::sax::XDocumentHandler > xInternalHandler(
+        css::uno::Reference<css::xml::sax::XDocumentHandler> xInternalHandler(
             mxContext->getServiceManager()->createInstanceWithContext(
                 DocumentHandlerFor<Generator>::name(), mxContext),
             css::uno::UNO_QUERY_THROW);
 
         // The XImporter sets up an empty target document for XDocumentHandler to write to..
-        css::uno::Reference < css::document::XImporter > xImporter(xInternalHandler, css::uno::UNO_QUERY);
+        css::uno::Reference<css::document::XImporter> xImporter(xInternalHandler,
+                                                                css::uno::UNO_QUERY);
         xImporter->setTargetDocument(mxDoc);
 
         // OO Graphics Handler: abstract class to handle document SAX messages, concrete implementation here
@@ -101,32 +98,29 @@ public:
         return doImportDocument(input, exporter, aDescriptor);
     }
 
-    virtual void SAL_CALL cancel() override
-    {
-    }
+    virtual void SAL_CALL cancel() override {}
 
     // XImporter
-    const css::uno::Reference< css::lang::XComponent > &getTargetDocument() const
-    {
-        return mxDoc;
-    }
-    virtual void SAL_CALL setTargetDocument(const css::uno::Reference< css::lang::XComponent > &xDoc) override
+    const css::uno::Reference<css::lang::XComponent>& getTargetDocument() const { return mxDoc; }
+    virtual void SAL_CALL
+    setTargetDocument(const css::uno::Reference<css::lang::XComponent>& xDoc) override
     {
         mxDoc = xDoc;
     }
 
     //XExtendedFilterDetection
-    virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) override
+    virtual OUString SAL_CALL
+    detect(css::uno::Sequence<css::beans::PropertyValue>& Descriptor) override
     {
         OUString sTypeName;
         sal_Int32 nLength = Descriptor.getLength();
         sal_Int32 location = nLength;
-        const css::beans::PropertyValue *pValue = Descriptor.getConstArray();
-        css::uno::Reference < css::io::XInputStream > xInputStream;
-        for (sal_Int32 i = 0 ; i < nLength; i++)
+        const css::beans::PropertyValue* pValue = Descriptor.getConstArray();
+        css::uno::Reference<css::io::XInputStream> xInputStream;
+        for (sal_Int32 i = 0; i < nLength; i++)
         {
             if (pValue[i].Name == "TypeName")
-                location=i;
+                location = i;
             else if (pValue[i].Name == "InputStream")
                 pValue[i].Value >>= xInputStream;
         }
@@ -142,26 +136,26 @@ public:
 
             if (location == nLength)
             {
-                Descriptor.realloc(nLength+1);
+                Descriptor.realloc(nLength + 1);
                 Descriptor[location].Name = "TypeName";
             }
 
-            Descriptor[location].Value <<=sTypeName;
+            Descriptor[location].Value <<= sTypeName;
         }
 
         return sTypeName;
     }
 
     // XInitialization
-    virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > &aArguments) override
+    virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments) override
     {
-        css::uno::Sequence < css::beans::PropertyValue > aAnySeq;
+        css::uno::Sequence<css::beans::PropertyValue> aAnySeq;
         sal_Int32 nLength = aArguments.getLength();
         if (nLength && (aArguments[0] >>= aAnySeq))
         {
-            const css::beans::PropertyValue *pValue = aAnySeq.getConstArray();
+            const css::beans::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")
                 {
@@ -173,28 +167,30 @@ public:
     }
 
 private:
-    virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0;
-    virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, Generator &rGenerator, utl::MediaDescriptor &rDescriptor) = 0;
-    virtual void doRegisterHandlers(Generator &) {};
-
-    css::uno::Reference< css::uno::XComponentContext > mxContext;
-    css::uno::Reference< css::lang::XComponent > mxDoc;
+    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) = 0;
+    virtual bool doImportDocument(librevenge::RVNGInputStream& rInput, Generator& rGenerator,
+                                  utl::MediaDescriptor& rDescriptor)
+        = 0;
+    virtual void doRegisterHandlers(Generator&){};
+
+    css::uno::Reference<css::uno::XComponentContext> mxContext;
+    css::uno::Reference<css::lang::XComponent> mxDoc;
     OUString msFilterName;
 };
-
 }
 
 /** A base class for import filters.
  */
-template<class Generator>
-struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, css::lang::XServiceInfo>
+template <class Generator>
+struct ImportFilter : public cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>,
+                                                         css::lang::XServiceInfo>
 {
-    ImportFilter(const css::uno::Reference<css::uno::XComponentContext> &rxContext)
-        : cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, css::lang::XServiceInfo>(rxContext)
+    ImportFilter(const css::uno::Reference<css::uno::XComponentContext>& rxContext)
+        : cppu::ImplInheritanceHelper<detail::ImportFilterImpl<Generator>, css::lang::XServiceInfo>(
+              rxContext)
     {
     }
 };
-
 }
 
 #endif // INCLUDED_WRITERPERFECT_INC_WRITERPERFECT_IMPORTFILTER_HXX