summaryrefslogtreecommitdiff
path: root/writerperfect/source
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-09-09 10:15:43 +0200
committerDavid Tardon <dtardon@redhat.com>2016-09-09 12:14:04 +0200
commitb42af6cee1d2c8a2bdb37d1a6e7e53704b839ee2 (patch)
tree0cc4ccf67925973886b63bfb0638cc9cf49706e9 /writerperfect/source
parent05adc066ec8cbc0609e26ba0ddb2d8e766549309 (diff)
astyle
Change-Id: Ib237a5f02b64b93bd2994cd98f29938c3a0904ae
Diffstat (limited to 'writerperfect/source')
-rw-r--r--writerperfect/source/calc/StarOfficeCalcImportFilter.cxx2
-rw-r--r--writerperfect/source/common/WPXSvInputStream.cxx10
-rw-r--r--writerperfect/source/draw/StarOfficeDrawImportFilter.cxx2
-rw-r--r--writerperfect/source/draw/ZMFImportFilter.cxx2
-rw-r--r--writerperfect/source/writer/StarOfficeWriterImportFilter.cxx11
5 files changed, 15 insertions, 12 deletions
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
index 5accde1e1cd9..5ed92db46dfc 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
@@ -81,7 +81,7 @@ throw (RuntimeException, std::exception)
Sequence< OUString > SAL_CALL StarOfficeCalcImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
- return Sequence< OUString >{"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
+ return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
}
extern "C"
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index d23fc6c77dad..f6bf5864393b 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -143,7 +143,7 @@ struct OLEStorageImpl
void initialize(SvStream *pStream);
tools::SvRef<SotStorageStream> getStream(const rtl::OUString &rPath);
- tools::SvRef<SotStorageStream> const & getStream(std::size_t nId);
+ tools::SvRef<SotStorageStream> const &getStream(std::size_t nId);
private:
void traverse(const tools::SvRef<SotStorage> &rStorage, const rtl::OUString &rPath);
@@ -202,7 +202,7 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString &rP
return maStreams[aIt->second].stream.ref;
}
-tools::SvRef<SotStorageStream> const & OLEStorageImpl::getStream(const std::size_t nId)
+tools::SvRef<SotStorageStream> const &OLEStorageImpl::getStream(const std::size_t nId)
{
if (!maStreams[nId].stream.ref.Is())
maStreams[nId].stream.ref = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8));
@@ -400,7 +400,7 @@ class WPXSvInputStreamImpl
{
public:
explicit WPXSvInputStreamImpl(css::uno::Reference<
- css::io::XInputStream > const & xStream);
+ css::io::XInputStream > const &xStream);
~WPXSvInputStreamImpl();
bool isStructured();
@@ -442,7 +442,7 @@ public:
unsigned long mnReadBufferPos;
};
-WPXSvInputStreamImpl::WPXSvInputStreamImpl(Reference< XInputStream > const & xStream) :
+WPXSvInputStreamImpl::WPXSvInputStreamImpl(Reference< XInputStream > const &xStream) :
mxStream(xStream),
mxSeekable(xStream, UNO_QUERY),
maData(0),
@@ -809,7 +809,7 @@ void WPXSvInputStreamImpl::ensureZipIsInitialized()
mpZipStorage->initialize();
}
-WPXSvInputStream::WPXSvInputStream(Reference< XInputStream > const & xStream) :
+WPXSvInputStream::WPXSvInputStream(Reference< XInputStream > const &xStream) :
mpImpl(new WPXSvInputStreamImpl(xStream))
{
}
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
index 57dfb7f070b2..bded190f5fda 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
@@ -83,7 +83,7 @@ throw (RuntimeException, std::exception)
Sequence< OUString > SAL_CALL StarOfficeDrawImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
- return Sequence< OUString >{"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
+ return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
}
extern "C"
diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx
index 0eabfc1c5ffb..8c6e0294eb4b 100644
--- a/writerperfect/source/draw/ZMFImportFilter.cxx
+++ b/writerperfect/source/draw/ZMFImportFilter.cxx
@@ -54,7 +54,7 @@ throw (RuntimeException, std::exception)
Sequence< OUString > SAL_CALL ZMFImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
- return Sequence< OUString >{"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
+ return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
}
extern "C"
diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
index e0580dc4d05c..9ee289ee0c04 100644
--- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
+++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx
@@ -40,9 +40,11 @@ bool StarOfficeWriterImportFilter::doImportDocument(librevenge::RVNGInputStream
STOFFDocument::Kind docKind = STOFFDocument::STOFF_K_UNKNOWN;
const STOFFDocument::Confidence confidence = STOFFDocument::isFileFormatSupported(&rInput, docKind);
OString aUtf8Passwd;
- if (confidence==STOFFDocument::STOFF_C_SUPPORTED_ENCRYPTION) {
+ if (confidence==STOFFDocument::STOFF_C_SUPPORTED_ENCRYPTION)
+ {
// try to ask for a password
- try {
+ try
+ {
ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr);
aPasswdDlg->SetMinLen(0);
if (!aPasswdDlg->Execute())
@@ -50,7 +52,8 @@ bool StarOfficeWriterImportFilter::doImportDocument(librevenge::RVNGInputStream
OUString aPasswd = aPasswdDlg->GetPassword();
aUtf8Passwd = OUStringToOString(aPasswd, RTL_TEXTENCODING_UTF8);
}
- catch (...) {
+ catch (...)
+ {
// ok, we will probably guess it
}
}
@@ -101,7 +104,7 @@ throw (RuntimeException, std::exception)
Sequence< OUString > SAL_CALL StarOfficeWriterImportFilter::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
- return Sequence< OUString >{"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
+ return Sequence< OUString > {"com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection"};
}
extern "C"