summaryrefslogtreecommitdiff
path: root/svtools/source/config
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-11-10 15:06:12 +0000
committerRüdiger Timm <rt@openoffice.org>2008-11-10 15:06:12 +0000
commit7f5f6b548d071d412efb78e9fee21d68ad6700bc (patch)
tree49c7255c440b542ccffd5af0f72387afa34eaa43 /svtools/source/config
parentf00cc0b3ee98e5213707c04fe4e84bc8e4fa9932 (diff)
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info 2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings 2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed 2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const 2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous 2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces 2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous 2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'svtools/source/config')
-rw-r--r--svtools/source/config/apearcfg.cxx2
-rw-r--r--svtools/source/config/cjkoptions.cxx24
-rw-r--r--svtools/source/config/fltrcfg.cxx2
-rw-r--r--svtools/source/config/misccfg.cxx2
-rw-r--r--svtools/source/config/securityoptions.cxx12
5 files changed, 21 insertions, 21 deletions
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 390e240e9fa7..35a07a715dd5 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -80,7 +80,7 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
const Sequence<OUString>& rNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(rNames);
const Any* pValues = aValues.getConstArray();
- DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed")
+ DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed");
if(aValues.getLength() == rNames.getLength())
{
diff --git a/svtools/source/config/cjkoptions.cxx b/svtools/source/config/cjkoptions.cxx
index a7849ec1e206..66d70cd1e2a3 100644
--- a/svtools/source/config/cjkoptions.cxx
+++ b/svtools/source/config/cjkoptions.cxx
@@ -432,55 +432,55 @@ SvtCJKOptions::~SvtCJKOptions()
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsCJKFontEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsCJKFontEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsVerticalTextEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsVerticalTextEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsAsianTypographyEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsAsianTypographyEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsJapaneseFindEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsJapaneseFindEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsRubyEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsRubyEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsChangeCaseMapEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsChangeCaseMapEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsDoubleLinesEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsDoubleLinesEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsEmphasisMarksEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsEmphasisMarksEnabled();
}
// -----------------------------------------------------------------------
sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsVerticalCallOutEnabled();
}
/*-- 20.04.01 14:32:04---------------------------------------------------
@@ -488,7 +488,7 @@ sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const
-----------------------------------------------------------------------*/
void SvtCJKOptions::SetAll(sal_Bool bSet)
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
pCJKOptions->SetAll(bSet);
}
/*-- 20.04.01 14:32:06---------------------------------------------------
@@ -496,7 +496,7 @@ void SvtCJKOptions::SetAll(sal_Bool bSet)
-----------------------------------------------------------------------*/
sal_Bool SvtCJKOptions::IsAnyEnabled() const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsAnyEnabled();
}
/*-- 13.02.2003 12:11---------------------------------------------------
@@ -504,7 +504,7 @@ sal_Bool SvtCJKOptions::IsAnyEnabled() const
-----------------------------------------------------------------------*/
sal_Bool SvtCJKOptions::IsReadOnly(EOption eOption) const
{
- DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded")
+ DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
return pCJKOptions->IsReadOnly(eOption);
}
diff --git a/svtools/source/config/fltrcfg.cxx b/svtools/source/config/fltrcfg.cxx
index 0958e9b01dad..056826bf62ba 100644
--- a/svtools/source/config/fltrcfg.cxx
+++ b/svtools/source/config/fltrcfg.cxx
@@ -378,7 +378,7 @@ void SvtFilterOptions::Load()
const Sequence<OUString>& rNames = GetPropertyNames();
Sequence<Any> aValues = GetProperties(rNames);
const Any* pValues = aValues.getConstArray();
- DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed")
+ DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed");
if(aValues.getLength() == rNames.getLength())
{
for(int nProp = 0; nProp < rNames.getLength(); nProp++)
diff --git a/svtools/source/config/misccfg.cxx b/svtools/source/config/misccfg.cxx
index 332583ebb4db..06cc9b7446c0 100644
--- a/svtools/source/config/misccfg.cxx
+++ b/svtools/source/config/misccfg.cxx
@@ -145,7 +145,7 @@ void SfxMiscCfg::Load()
Sequence<Any> aValues = GetProperties(aNames);
EnableNotification(aNames);
const Any* pValues = aValues.getConstArray();
- DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed")
+ DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
{
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
diff --git a/svtools/source/config/securityoptions.cxx b/svtools/source/config/securityoptions.cxx
index ebd9898b43cd..6fdb314f9c74 100644
--- a/svtools/source/config/securityoptions.cxx
+++ b/svtools/source/config/securityoptions.cxx
@@ -881,7 +881,7 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetSecureURLs() const
void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLList )
{
- DBG_ASSERT(!m_bROSecureURLs, "SvtSecurityOptions_Impl::SetSecureURLs()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROSecureURLs, "SvtSecurityOptions_Impl::SetSecureURLs()\nYou tried to write on a readonly value!\n");
if (!m_bROSecureURLs && m_seqSecureURLs!=seqURLList)
{
m_seqSecureURLs = seqURLList;
@@ -970,7 +970,7 @@ Sequence< SvtSecurityOptions::Certificate > SvtSecurityOptions_Impl::GetTrustedA
void SvtSecurityOptions_Impl::SetTrustedAuthors( const Sequence< SvtSecurityOptions::Certificate >& rAuthors )
{
- DBG_ASSERT(!m_bROTrustedAuthors, "SvtSecurityOptions_Impl::SetTrustedAuthors()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROTrustedAuthors, "SvtSecurityOptions_Impl::SetTrustedAuthors()\nYou tried to write on a readonly value!\n");
if( !m_bROTrustedAuthors && rAuthors != m_seqTrustedAuthors )
{
m_seqTrustedAuthors = rAuthors;
@@ -1208,7 +1208,7 @@ EBasicSecurityMode SvtSecurityOptions_Impl::GetBasicMode() const
void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode )
{
- DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n");
if (!m_bROBasicMode && m_eBasicMode!=eMode)
{
m_eBasicMode = eMode;
@@ -1223,7 +1223,7 @@ sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const
void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet )
{
- DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n");
if (!m_bROExecutePlugins && m_bExecutePlugins!=bSet)
{
m_bExecutePlugins = bSet;
@@ -1238,7 +1238,7 @@ sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const
void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet )
{
- DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n");
if (!m_bROWarning && m_bWarning!=bSet)
{
m_bWarning = bSet;
@@ -1253,7 +1253,7 @@ sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const
void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet )
{
- DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n")
+ DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n");
if (!m_bROConfirmation && m_bConfirmation!=bSet)
{
m_bConfirmation = bSet;