summaryrefslogtreecommitdiff
path: root/desktop/source/deployment/misc
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/deployment/misc')
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx12
-rw-r--r--desktop/source/deployment/misc/dp_identifier.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_interact.cxx4
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx14
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx22
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 48ab6f6a78d7..10d10f292765 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)
{
- assert(dependency.is());
+ OSL_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 470e7726393c..b1762ab7fd87 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)
{
- assert(node.is());
+ OSL_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
}
- assert(xPathName.is());
+ OSL_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
}
- assert(xURL.is());
+ OSL_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
{
- assert(xParent.is());
+ OSL_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
{
- assert(xParent.is());
+ OSL_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
}
- assert(xURL.is());
+ OSL_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 9977d91b2a4c..a0b922c008b1 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)
{
- assert(package.is());
+ OSL_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 9887d258b327..0eda61153da6 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 )
- { assert(
+ { OSL_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 )
{
- assert(
+ OSL_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 1d2ddabbb4ed..2083075a608e 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 ) );
- assert( ret->getHandle() != nullptr );
+ OSL_ASSERT( ret->getHandle() != nullptr );
return ret;
}
};
@@ -198,13 +198,13 @@ bool compareExtensionFolderWithLastSynchronizedFile(
}
else
{
- assert(false);
+ OSL_ASSERT(false);
bNeedsSync = true;
}
}
else
{
- assert(false);
+ OSL_ASSERT(false);
bNeedsSync = true;
}
@@ -227,7 +227,7 @@ bool needToSyncRepository(OUString const & name)
}
else
{
- assert(false);
+ OSL_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 )
{
- assert(segment.indexOf(u'/') == -1);
+ OSL_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 )
{
- assert( url.match( "vnd.sun.star.expand:" ));
+ OSL_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 ) )
{
- assert((dwRead % 2) == 0);
+ OSL_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 2a9459453204..f20da27e0d5a 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)
{
- assert(i->second.extension.is());
+ OSL_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;
- assert(*id2 == id);
+ OSL_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());
- assert(!sDefaultURL.isEmpty());
+ OSL_ASSERT(!sDefaultURL.isEmpty());
Any anyError;
Sequence< Reference< xml::dom::XElement > >
@@ -175,7 +175,7 @@ void getDefaultUpdateInfos(
bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions)
{
- assert(sameIdExtensions.getLength() == 3);
+ OSL_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)
{
- assert(xExtMgr.is());
+ OSL_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)
{
- assert(xExtMgr.is());
+ OSL_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);
- assert(extension.is());
+ OSL_ASSERT(extension.is());
std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
UpdateInfoMap::value_type(
dp_misc::getIdentifier(extension), UpdateInfo(extension)));
- assert(insertRet.second);
+ OSL_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)
{
- assert(i->is());
+ OSL_ASSERT(i->is());
std::pair<UpdateInfoMap::iterator, bool> insertRet = infoMap.insert(
UpdateInfoMap::value_type(
dp_misc::getIdentifier(*i), UpdateInfo(*i)));
- assert(insertRet.second);
+ OSL_ASSERT(insertRet.second);
(void)insertRet;
}
}
@@ -402,7 +402,7 @@ OUString getHighestVersion(
case 1: return sharedVersion;
case 2: return bundledVersion;
case 3: return onlineVersion;
- default: assert(false);
+ default: OSL_ASSERT(false);
}
return OUString();
generated by cgit (git 2.34.1) at 2024-07-31 20:07:46 +0000