[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Nov 10 01:57:02 PST 2012
sw/source/filter/ww8/docxattributeoutput.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit e2a54eb75c6d754d48a546fda4df65fdcc19111e
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat Nov 10 10:56:12 2012 +0100
DocxAttributeOutput::FlyFrameGraphic: add assert to avoid misuse of the API
Change-Id: I5d09e297294439fafad94177d8e87ccdf829b18d
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 9a9b30f..45abbf6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1991,6 +1991,8 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16 nStyle )
void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode )
{
OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt, SwOLENode* pOLENode ) - some stuff still missing" );
+ // detect mis-use of the API
+ assert(pGrfNode || (pOLEFrmFmt && pOLENode));
const SwFrmFmt* pFrmFmt = pGrfNode ? pGrfNode->GetFlyFmt() : pOLEFrmFmt;
// create the relation ID
OString aRelId;
More information about the Libreoffice-commits
mailing list