[Libreoffice-commits] core.git: writerperfect/inc writerperfect/source

[David Tardon]

 writerperfect/inc/DirectoryStream.hxx                 |   16 +++++++++--
 writerperfect/inc/DocumentHandler.hxx                 |   19 +++++++++++--
 writerperfect/inc/WPFTEncodingDialog.hxx              |   14 +++++----
 writerperfect/inc/WPXSvInputStream.hxx                |   26 ++++++++++++------
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |    2 -
 writerperfect/source/writer/MSWorksImportFilter.cxx   |    2 -
 6 files changed, 57 insertions(+), 22 deletions(-)

New commits:
commit acc4c466c35e8ca9ca7ce8bd7b90c505061a0fb3
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 11:08:42 2015 +0200

    astyle
    
    Change-Id: I4e7bf54959b8a9ce6c453cedfd3525aeff5c8e3a

diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index bfa7d57..1107a1d 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -16,9 +16,19 @@
 
 #include <writerperfectdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace ucb {
-    class XContent;
-} } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace ucb
+{
+class XContent;
+}
+}
+}
+}
 
 namespace writerperfect
 {
diff --git a/writerperfect/inc/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx
index 608974b..15cd4a8 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -26,9 +26,22 @@
 
 #include <writerperfectdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace xml { namespace sax {
-    class XDocumentHandler;
-} } } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace xml
+{
+namespace sax
+{
+class XDocumentHandler;
+}
+}
+}
+}
+}
 
 namespace writerperfect
 {
diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx
index e76fb88..2d3a63a 100644
--- a/writerperfect/inc/WPFTEncodingDialog.hxx
+++ b/writerperfect/inc/WPFTEncodingDialog.hxx
@@ -20,17 +20,19 @@
 
 #include <writerperfectdllapi.h>
 
-namespace writerperfect {
+namespace writerperfect
+{
 
 class WRITERPERFECT_DLLPUBLIC WPFTEncodingDialog : public ModalDialog
 {
 public:
-    WPFTEncodingDialog( const OUString& title, const OUString& defEncoding);
+    WPFTEncodingDialog(const OUString &title, const OUString &defEncoding);
 
     virtual ~WPFTEncodingDialog();
 
-    OUString GetEncoding( ) const;
-    bool hasUserCalledCancel() const {
+    OUString GetEncoding() const;
+    bool hasUserCalledCancel() const
+    {
         return m_userHasCancelled;
     }
 private:
@@ -40,8 +42,8 @@ private:
 
     bool m_userHasCancelled;
 private:
-    DECL_LINK( DoubleClickHdl, ListBox* );
-    DECL_LINK(CancelHdl, void*);
+    DECL_LINK(DoubleClickHdl, ListBox *);
+    DECL_LINK(CancelHdl, void *);
 
     void dispose() SAL_OVERRIDE;
 
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index cd87f1b..7382607 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -16,10 +16,20 @@
 
 #include <writerperfectdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace io {
-    class XInputStream;
-    class XSeekable;
-} } } }
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace io
+{
+class XInputStream;
+class XSeekable;
+}
+}
+}
+}
 
 namespace writerperfect
 {
@@ -29,15 +39,15 @@ class WPXSvInputStreamImpl;
 class WRITERPERFECT_DLLPUBLIC WPXSvInputStream : public librevenge::RVNGInputStream
 {
 public:
-    WPXSvInputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream );
+    WPXSvInputStream(::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream);
     virtual ~WPXSvInputStream();
 
     virtual bool isStructured() SAL_OVERRIDE;
     virtual unsigned subStreamCount() SAL_OVERRIDE;
-    virtual const char * subStreamName(unsigned id) SAL_OVERRIDE;
+    virtual const char *subStreamName(unsigned id) SAL_OVERRIDE;
     virtual bool existsSubStream(const char *name) SAL_OVERRIDE;
-    virtual librevenge::RVNGInputStream * getSubStreamByName(const char *name) SAL_OVERRIDE;
-    virtual librevenge::RVNGInputStream * getSubStreamById(unsigned id) SAL_OVERRIDE;
+    virtual librevenge::RVNGInputStream *getSubStreamByName(const char *name) SAL_OVERRIDE;
+    virtual librevenge::RVNGInputStream *getSubStreamById(unsigned id) SAL_OVERRIDE;
 
     virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead) SAL_OVERRIDE;
     virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) SAL_OVERRIDE;
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 2431e79..3ccf2db 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -68,7 +68,7 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp
             else if (pDlg->hasUserCalledCancel())
                 return false;
         }
-        catch (css::uno::Exception & e)
+        catch (css::uno::Exception &e)
         {
             SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
         }
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 96496fe..018f790 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -57,7 +57,7 @@ bool MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput,
                 return false;
         }
     }
-    catch (css::uno::Exception & e)
+    catch (css::uno::Exception &e)
     {
         SAL_WARN("writerperfect", "ignoring Exception " << e.Message);
     }