[Libreoffice-commits] core.git: odk/examples pyuno/source xmloff/source xmlsecurity/source
Thomas Arnhold
thomas at arnhold.org
Sat Jun 29 09:38:39 PDT 2013
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 6 ++----
odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx | 6 ++----
pyuno/source/module/pyuno_adapter.cxx | 8 ++------
xmloff/source/text/txtparai.cxx | 6 ++----
xmlsecurity/source/helper/documentsignaturehelper.cxx | 3 +--
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 7 ++-----
xmlsecurity/source/helper/xsecparser.cxx | 10 ++++------
7 files changed, 15 insertions(+), 31 deletions(-)
New commits:
commit b6d97514cdca32129142cd937ac0cbda3113f562
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Jun 29 18:30:34 2013 +0200
reduce some spacing
Change-Id: I72d494b1c0ff5ed3c52ae6a078815f497e4dd647
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
index a5cad0e..86d4da0 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
@@ -60,8 +60,7 @@ Sequence< OUString > SAL_CALL getSupportedServiceNames_MyService1Impl()
OUString SAL_CALL getImplementationName_MyService1Impl()
{
- return OUString(
- "my_module.my_sc_implementation.MyService1");
+ return OUString("my_module.my_sc_implementation.MyService1");
}
@@ -222,8 +221,7 @@ OUString MyService1Impl::getImplementationName()
throw (RuntimeException)
{
// unique implementation name
- return OUString(
- "my_module.my_sc_implementation.MyService1");
+ return OUString("my_module.my_sc_implementation.MyService1");
}
sal_Bool MyService1Impl::supportsService( OUString const & serviceName )
throw (RuntimeException)
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
index ac86ea1..e3c4459 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx
@@ -66,8 +66,7 @@ static Sequence< OUString > getSupportedServiceNames_MyService2Impl()
static OUString getImplementationName_MyService2Impl()
{
- return OUString(
- "my_module.my_sc_implementation.MyService2");
+ return OUString("my_module.my_sc_implementation.MyService2");
}
class MyService2Impl : public ::cppu::WeakImplHelper3<
@@ -148,8 +147,7 @@ OUString MyService2Impl::getImplementationName()
throw (RuntimeException)
{
// unique implementation name
- return OUString(
- "my_module.my_sc_implementation.MyService2");
+ return OUString("my_module.my_sc_implementation.MyService2");
}
sal_Bool MyService2Impl::supportsService( OUString const & serviceName )
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index b51bc06..41a2e24 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -132,9 +132,7 @@ Sequence< sal_Int16 > Adapter::getOutIndexes( const OUString & functionName )
if( ! method.is( ) )
{
throw RuntimeException(
- (OUString(
- "pyuno bridge: Couldn't get reflection for method ")
- + functionName),
+ "pyuno bridge: Couldn't get reflection for method " + functionName,
Reference< XInterface > () );
}
@@ -265,9 +263,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
if( ! ( ret >>= seq ) )
{
throw RuntimeException(
- (OUString("pyuno bridge: Couldn't extract out"
- " parameters for method ")
- + aFunctionName),
+ "pyuno bridge: Couldn't extract out parameters for method " + aFunctionName,
Reference< XInterface > () );
}
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index df7faff..a8a9d33 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -899,8 +899,7 @@ void XMLMetaImportContext::InsertMeta(
const uno::Reference<rdf::XMetadatable> xMeta(
XMLTextMarkImportContext::CreateAndInsertMark(
GetImport(),
- OUString(
- "com.sun.star.text.InContentMetadata"),
+ OUString("com.sun.star.text.InContentMetadata"),
OUString(),
i_xInsertionRange, m_XmlId),
uno::UNO_QUERY);
@@ -978,8 +977,7 @@ void XMLMetaFieldImportContext::InsertMeta(
const Reference<XPropertySet> xPropertySet(
XMLTextMarkImportContext::CreateAndInsertMark(
GetImport(),
- OUString(
- "com.sun.star.text.textfield.MetadataField"),
+ OUString("com.sun.star.text.textfield.MetadataField"),
OUString(),
i_xInsertionRange, m_XmlId),
UNO_QUERY);
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 7d1fdd5..2cb069a 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -102,8 +102,7 @@ void ImplFillElementList(
pNames[n], rtl_UriCharClassRelSegment,
rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8);
if (sEncName.isEmpty() && !pNames[n].isEmpty())
- throw css::uno::Exception(OUString(
- "Failed to encode element name of XStorage"), 0);
+ throw css::uno::Exception("Failed to encode element name of XStorage", 0);
if ( rxStore->isStreamElement( pNames[n] ) )
{
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index d8b3586..663ba8a 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -195,8 +195,7 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno
const OUString sName = ::rtl::Uri::decode(
rURI, rtl_UriDecodeStrict, rtl_UriCharClassRelSegment);
if (sName.isEmpty() && !rURI.isEmpty())
- throw uno::Exception(OUString(
- "Could not decode URI for stream element."), 0);
+ throw uno::Exception("Could not decode URI for stream element.", 0);
uno::Reference< io::XStream > xStream;
xStream = rxStore->cloneStreamElement( sName );
@@ -209,9 +208,7 @@ uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno
const OUString aStoreName = ::rtl::Uri::decode(
rURI.copy( 0, nSepPos ), rtl_UriDecodeStrict, rtl_UriCharClassRelSegment);
if (aStoreName.isEmpty() && !rURI.isEmpty())
- throw uno::Exception(
- OUString(
- "Could not decode URI for stream element."), 0);
+ throw uno::Exception("Could not decode URI for stream element.", 0);
OUString aElement = rURI.copy( nSepPos+1 );
uno::Reference < embed::XStorage > xSubStore = rxStore->openStorageElement( aStoreName, embed::ElementModes::READ );
diff --git a/xmlsecurity/source/helper/xsecparser.cxx b/xmlsecurity/source/helper/xsecparser.cxx
index 230789c..da91549 100644
--- a/xmlsecurity/source/helper/xsecparser.cxx
+++ b/xmlsecurity/source/helper/xsecparser.cxx
@@ -181,14 +181,13 @@ void SAL_CALL XSecParser::startElement(
{//getCaughtException MUST be the first line in the catch block
cssu::Any exc = cppu::getCaughtException();
throw cssxs::SAXException(
- OUString(
- "xmlsecurity: Exception in XSecParser::startElement"),
+ "xmlsecurity: Exception in XSecParser::startElement",
0, exc);
}
catch (...)
{
throw cssxs::SAXException(
- OUString("xmlsecurity: unexpected exception in XSecParser::startElement"), 0,
+ "xmlsecurity: unexpected exception in XSecParser::startElement", 0,
cssu::Any());
}
}
@@ -254,14 +253,13 @@ void SAL_CALL XSecParser::endElement( const OUString& aName )
{//getCaughtException MUST be the first line in the catch block
cssu::Any exc = cppu::getCaughtException();
throw cssxs::SAXException(
- OUString(
- "xmlsecurity: Exception in XSecParser::endElement"),
+ "xmlsecurity: Exception in XSecParser::endElement",
0, exc);
}
catch (...)
{
throw cssxs::SAXException(
- OUString("xmlsecurity: unexpected exception in XSecParser::endElement"), 0,
+ "xmlsecurity: unexpected exception in XSecParser::endElement", 0,
cssu::Any());
}
}
More information about the Libreoffice-commits
mailing list