summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-06-12 14:42:51 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-12 18:10:44 +0000
commit272a8afa60fe9a6b497c69a58b0054ad5b880690 (patch)
tree7ab255dd96cad6ab57b1271559b1d45a1c40baa1 /sfx2
parent29eac0e49e372092cb119898e9f1116ab4e00532 (diff)
convert more DBG_ASSERT(false to SAL_WARN
Change-Id: Ie52f28f28c67a91c4d3d4517d5c6a466890c7a55 Reviewed-on: https://gerrit.libreoffice.org/26195 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/app.cxx2
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/guisaveas.cxx4
-rw-r--r--sfx2/source/doc/objxtor.cxx10
4 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 86197278f3b2..3657c455ded2 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -185,7 +185,7 @@ SfxApplication::SfxApplication()
aStr.append(static_cast<sal_Int32>(GetDdeService()->GetError()));
else
aStr.append('?');
- DBG_ASSERT( false, aStr.getStr() );
+ SAL_WARN( "sfx2.appl", aStr.getStr() );
}
#else
(void)bOk;
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index c3d9d34ecdec..458b4ec2bee1 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -867,12 +867,12 @@ bool SfxDocumentTemplates::CopyFrom
}
else
{
- DBG_ASSERT( false, "CopyFrom(): The content should contain target URL!" );
+ SAL_WARN( "sfx2", "CopyFrom(): The content should contain target URL!" );
}
}
else
{
- DBG_ASSERT( false, "CopyFrom(): The content just was created!" );
+ SAL_WARN( "sfx2", "CopyFrom(): The content just was created!" );
}
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 6f4ac53d4933..4a8e6d075468 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -140,7 +140,7 @@ sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
else if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nResult = SID_SAVEASREMOTE;
else {
- DBG_ASSERT( false, "Unacceptable slot name is provided!\n" );
+ SAL_WARN( "sfx2", "Unacceptable slot name is provided!\n" );
}
return nResult;
@@ -1597,7 +1597,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
else
{
- DBG_ASSERT( false, "This code must be unreachable!\n" );
+ SAL_WARN( "sfx2", "This code must be unreachable!\n" );
throw task::ErrorCodeIOException(
"SfxStoringHelper::GUIStoreModel: ERRCODE_IO_INVALIDPARAMETER",
uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER);
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 1a76d6221283..02aff11b03f2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -1124,7 +1124,7 @@ void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew )
bool SfxObjectShell::IsChangeRecording() const
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}
@@ -1132,7 +1132,7 @@ bool SfxObjectShell::IsChangeRecording() const
bool SfxObjectShell::HasChangeRecordProtection() const
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}
@@ -1140,21 +1140,21 @@ bool SfxObjectShell::HasChangeRecordProtection() const
void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
}
void SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
}
bool SfxObjectShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ )
{
// currently this function needs to be overwritten by Writer and Calc only
- DBG_ASSERT( false, "function not implemented" );
+ SAL_WARN( "sfx2", "function not implemented" );
return false;
}