From e8eab43eebecfcaf277d01b1c99ea003199866e4 Mon Sep 17 00:00:00 2001 From: Philipp Riemer Date: Mon, 6 May 2013 19:17:14 +0200 Subject: cleanup whitespaces due to RTL_CONSTASCII_USTRINGPARAM removal In e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 the method was removed automatically leaving several line breaks etc. as visual noise. --- cppuhelper/source/unourl.cxx | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index 3e7f5578cef5..f073ef4ee2a7 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -78,8 +78,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) case STATE_NAME0: if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains bad descriptor name")); + rtl::OUString("UNO URL contains bad descriptor name")); nStart = i; eState = STATE_NAME; break; @@ -93,15 +92,13 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) } else if (!isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains bad descriptor name")); + rtl::OUString("UNO URL contains bad descriptor name")); break; case STATE_KEY0: if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains bad parameter key")); + rtl::OUString("UNO URL contains bad parameter key")); nStart = i; eState = STATE_KEY; break; @@ -115,8 +112,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) } else if (bEnd || !isAlphanum(c)) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains bad parameter key")); + rtl::OUString("UNO URL contains bad parameter key")); break; case STATE_VALUE: @@ -130,8 +126,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & rDescriptor) rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8))).second) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains duplicated parameter")); + rtl::OUString("UNO URL contains duplicated parameter")); eState = STATE_KEY0; } break; @@ -216,14 +211,12 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) { if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0)) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL does not start with \"uno:\"")); + rtl::OUString("UNO URL does not start with \"uno:\"")); sal_Int32 i = RTL_CONSTASCII_LENGTH("uno:"); sal_Int32 j = rUrl.indexOf(';', i); if (j < 0) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL has too few semicolons")); + rtl::OUString("UNO URL has too few semicolons")); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); @@ -232,8 +225,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) j = rUrl.indexOf(0x3B, i); // ';' if (j < 0) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL has too few semicolons")); + rtl::OUString("UNO URL has too few semicolons")); SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); @@ -241,8 +233,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) i = j + 1; if (i == rUrl.getLength()) throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains empty ObjectName")); + rtl::OUString("UNO URL contains empty ObjectName")); for (j = i; j < rUrl.getLength(); ++j) { sal_Unicode c = rUrl.getStr()[j]; @@ -254,8 +245,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) && c != 0x3F && c != 0x40 && c != 0x5F // '?', '@', '_' && c != 0x7E) // '~' throw rtl::MalformedUriException( - rtl::OUString( - "UNO URL contains invalid ObjectName")); + rtl::OUString("UNO URL contains invalid ObjectName")); } return new Impl(xConnection, xProtocol, rUrl.copy(i)); } -- cgit