diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 12:54:03 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 12:54:03 +1000 |
commit | fbea669c74f686f5a75aa80384bbfeff98680f8d (patch) | |
tree | 53a8106ad6bf3d9fe9e16224e62936a498db0a40 /desktop/source/deployment/misc | |
parent | tdf#43157: convert svx module away from OSL_ASSERT to assert (diff) | |
download | core-fbea669c74f686f5a75aa80384bbfeff98680f8d.tar.gz core-fbea669c74f686f5a75aa80384bbfeff98680f8d.zip |
tdf#43157: convert desktop module away from OSL_ASSERT to assert
Change-Id: I521042a79cf93a51d84b72554d04715b321dd942
Diffstat (limited to 'desktop/source/deployment/misc')
-rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 12 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_identifier.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_interact.cxx | 4 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 14 | ||||
-rw-r--r-- | desktop/source/deployment/misc/dp_update.cxx | 22 |
6 files changed, 28 insertions, 28 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 10d10f292765..48ab6f6a78d7 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -152,7 +152,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency) { - OSL_ASSERT(dependency.is()); + assert(dependency.is()); if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index b1762ab7fd87..470e7726393c 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -88,7 +88,7 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) OUString getNodeValue( css::uno::Reference< css::xml::dom::XNode > const & node) { - OSL_ASSERT(node.is()); + assert(node.is()); try { return node->getNodeValue(); } catch (const css::xml::dom::DOMException & e) { @@ -583,7 +583,7 @@ std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAnd } catch (const css::xml::xpath::XPathException &) { // ignore } - OSL_ASSERT(xPathName.is()); + assert(xPathName.is()); if (xPathName.is()) sPublisherName = xPathName->getNodeValue(); @@ -594,7 +594,7 @@ std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAnd } catch (const css::xml::xpath::XPathException &) { // ignore } - OSL_ASSERT(xURL.is()); + assert(xURL.is()); if (xURL.is()) sURL = xURL->getNodeValue(); } @@ -711,7 +711,7 @@ css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::matchLanguageTag( css::uno::Reference< css::xml::dom::XNode > const & xParent, OUString const & rTag) const { - OSL_ASSERT(xParent.is()); + assert(xParent.is()); css::uno::Reference<css::xml::dom::XNode> nodeMatch; //first try exact match for lang @@ -741,7 +741,7 @@ css::uno::Reference<css::xml::dom::XNode> DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom::XNode > const & xParent) const { - OSL_ASSERT(xParent.is()); + assert(xParent.is()); if ( xParent->getNodeName() == "simple-license" ) { css::uno::Reference<css::xml::dom::XNode> nodeDefault; @@ -792,7 +792,7 @@ OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( } catch (const css::xml::xpath::XPathException &) { // ignore } - OSL_ASSERT(xURL.is()); + assert(xURL.is()); if (xURL.is()) sURL = xURL->getNodeValue(); } diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index a0b922c008b1..9977d91b2a4c 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -43,7 +43,7 @@ OUString generateIdentifier( OUString getIdentifier( css::uno::Reference< css::deployment::XPackage > const & package) { - OSL_ASSERT(package.is()); + assert(package.is()); css::beans::Optional< OUString > id(package->getIdentifier()); return id.IsPresent ? id.Value : generateLegacyIdentifier(package->getName()); diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 0eda61153da6..9887d258b327 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -46,7 +46,7 @@ public: InteractionContinuationImpl( Type const & type, bool * pselect ) : m_type( type ), m_pselect( pselect ) - { OSL_ASSERT( + { assert( cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(m_type) ); } // XInterface @@ -97,7 +97,7 @@ bool interactContinuation( Any const & request, Reference<XCommandEnvironment> const & xCmdEnv, bool * pcont, bool * pabort ) { - OSL_ASSERT( + assert( cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom( continuation ) ); if (xCmdEnv.is()) { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 2083075a608e..1d2ddabbb4ed 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -81,7 +81,7 @@ struct UnoRc : public rtl::StaticWithInit< ::rtl::Bootstrap::expandMacros( unorc ); std::shared_ptr< ::rtl::Bootstrap > ret( new ::rtl::Bootstrap( unorc ) ); - OSL_ASSERT( ret->getHandle() != nullptr ); + assert( ret->getHandle() != nullptr ); return ret; } }; @@ -198,13 +198,13 @@ bool compareExtensionFolderWithLastSynchronizedFile( } else { - OSL_ASSERT(false); + assert(false); bNeedsSync = true; } } else { - OSL_ASSERT(false); + assert(false); bNeedsSync = true; } @@ -227,7 +227,7 @@ bool needToSyncRepository(OUString const & name) } else { - OSL_ASSERT(false); + assert(false); return true; } ::rtl::Bootstrap::expandMacros(folder); @@ -296,7 +296,7 @@ OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const & segment ) { - OSL_ASSERT(segment.indexOf(u'/') == -1); + assert(segment.indexOf(u'/') == -1); ::rtl::Uri::encode( segment, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, @@ -314,7 +314,7 @@ OUString expandUnoRcTerm( OUString const & term_ ) OUString makeRcTerm( OUString const & url ) { - OSL_ASSERT( url.match( "vnd.sun.star.expand:" )); + assert( url.match( "vnd.sun.star.expand:" )); if (url.match( "vnd.sun.star.expand:" )) { // cut protocol: OUString rcterm( url.copy( sizeof ("vnd.sun.star.expand:") - 1 ) ); @@ -508,7 +508,7 @@ OUString readConsole() //unopkg.com feeds unopkg.exe with wchar_t|s if (ReadFile( GetStdHandle(STD_INPUT_HANDLE), &aBuffer, sizeof(aBuffer), &dwRead, nullptr ) ) { - OSL_ASSERT((dwRead % 2) == 0); + assert((dwRead % 2) == 0); OUString value( aBuffer, dwRead / 2); return value.trim(); } diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index f20da27e0d5a..2a9459453204 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -90,7 +90,7 @@ void getOwnUpdateInfos( bool bAllHaveOwnUpdateInformation = true; for (UpdateInfoMap::iterator i = inout_map.begin(); i != inout_map.end(); ++i) { - OSL_ASSERT(i->second.extension.is()); + assert(i->second.extension.is()); Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs()); if (urls.getLength()) { @@ -113,7 +113,7 @@ void getOwnUpdateInfos( boost::optional< OUString > id2(infoset.getIdentifier()); if (!id2) continue; - OSL_ASSERT(*id2 == id); + assert(*id2 == id); if (*id2 == id) { i->second.version = infoset.getVersion(); @@ -137,7 +137,7 @@ void getDefaultUpdateInfos( std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors) { const OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); - OSL_ASSERT(!sDefaultURL.isEmpty()); + assert(!sDefaultURL.isEmpty()); Any anyError; Sequence< Reference< xml::dom::XElement > > @@ -175,7 +175,7 @@ void getDefaultUpdateInfos( bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions) { - OSL_ASSERT(sameIdExtensions.getLength() == 3); + assert(sameIdExtensions.getLength() == 3); return !sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is(); } @@ -187,7 +187,7 @@ bool onlyBundledExtensions( Reference<deployment::XExtensionManager> const & xExtMgr, std::vector< Reference<deployment::XPackage > > const * extensionList) { - OSL_ASSERT(xExtMgr.is()); + assert(xExtMgr.is()); bool bOnlyBundled = true; if (extensionList) { @@ -341,7 +341,7 @@ UpdateInfoMap getOnlineUpdateInfos( std::vector<Reference<deployment::XPackage > > const * extensionList, std::vector<std::pair< Reference<deployment::XPackage>, uno::Any> > & out_errors) { - OSL_ASSERT(xExtMgr.is()); + assert(xExtMgr.is()); UpdateInfoMap infoMap; if (!xExtMgr.is() || onlyBundledExtensions(xExtMgr, extensionList)) return infoMap; @@ -357,12 +357,12 @@ UpdateInfoMap getOnlineUpdateInfos( uno::Sequence<Reference<deployment::XPackage> > const & seqExt = seqAllExt[pos]; Reference<deployment::XPackage> extension = getExtensionWithHighestVersion(seqExt); - OSL_ASSERT(extension.is()); + assert(extension.is()); std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(extension), UpdateInfo(extension))); - OSL_ASSERT(insertRet.second); + assert(insertRet.second); (void)insertRet; } } @@ -371,11 +371,11 @@ UpdateInfoMap getOnlineUpdateInfos( typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT; for (CIT i = extensionList->begin(); i != extensionList->end(); ++i) { - OSL_ASSERT(i->is()); + assert(i->is()); std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert( UpdateInfoMap::value_type( dp_misc::getIdentifier(*i), UpdateInfo(*i))); - OSL_ASSERT(insertRet.second); + assert(insertRet.second); (void)insertRet; } } @@ -402,7 +402,7 @@ OUString getHighestVersion( case 1: return sharedVersion; case 2: return bundledVersion; case 3: return onlineVersion; - default: OSL_ASSERT(false); + default: assert(false); } return OUString(); |