summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-09-26 09:12:02 +0100
committerMichael Meeks <michael.meeks@novell.com>2011-09-26 09:12:02 +0100
commit3d22598a193130c5bfb0b5f459359a0b66b4424e (patch)
treef40c7935e2ff667e02707990c7e4b12de103fadb
parentFixed DBG_ASSERT broken by recent commit. (diff)
downloadcore-3d22598a193130c5bfb0b5f459359a0b66b4424e.tar.gz
core-3d22598a193130c5bfb0b5f459359a0b66b4424e.zip
more post colortable cleanup
-rw-r--r--cui/source/tabpages/border.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx2
-rw-r--r--svx/inc/svx/ofaitem.hxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d663ffc13512..98d62e95eab8 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -288,7 +288,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
pColorTable = ( (SvxColorListItem*)pItem )->GetColorList();
}
- DBG_ASSERT( pColorTable, "ColorTable not found!" );
+ DBG_ASSERT( pColorTable.is(), "ColorTable not found!" );
if ( pColorTable.is() )
{
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 83144e7d82ba..c86d9c4457c6 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -105,7 +105,7 @@ CopyDlg::CopyDlg(
maBtnSetViewData.SetAccessibleName (maBtnSetViewData.GetQuickHelpText());
// Farbtabellen
- DBG_ASSERT( mpColorList, "Keine gueltige ColorTable uebergeben!" );
+ DBG_ASSERT( mpColorList.is(), "No colortable available !" );
maLbStartColor.Fill( mpColorList );
maLbEndColor.CopyEntries( maLbStartColor );
diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index cc5d813a720b..d4fd9c7ad12e 100644
--- a/svx/inc/svx/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
@@ -74,11 +74,11 @@ public:
{
return new OfaRefItem( *this );
}
- rtl::Reference<reference_type> GetValue() const
+ inline rtl::Reference<reference_type> GetValue() const
{
return mxRef;
}
- void SetValue( const rtl::Reference<reference_type> &xRef )
+ inline void SetValue( const rtl::Reference<reference_type> &xRef )
{
mxRef = xRef;
}