sc/source/filter/xml/xmlsubti.cxx | 2 +- vcl/source/window/decoview.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 6bd0f40d346a36d8b3d454fd0cf087d1ca126ee4 Author: Ivan Timofeev <[email protected]> Date: Sat Jun 2 10:36:23 2012 +0400 no need for "> 0" Change-Id: Ie7d4eaffd8e80b6b5c5d11b4e2f255ee7786b5e7 diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 4d93a21..f760d76 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -811,7 +811,7 @@ void ScMyTables::SetMatrix(const ScRange& rScRange, const rtl::OUString& rFormul aMark.SelectTable( rScRange.aStart.Tab(), sal_True ); ScTokenArray* pCode = new ScTokenArray; pCode->AddStringXML( rFormula ); - if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && (!rFormulaNmsp.isEmpty() > 0) ) + if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && !rFormulaNmsp.isEmpty() ) pCode->AddStringXML( rFormulaNmsp ); pDoc->InsertMatrixFormula( rScRange.aStart.Col(), rScRange.aStart.Row(), commit 402c3c08f4fce12008873510bed47e4f44779a91 Author: Ruslan Kabatsayev <[email protected]> Date: Sat Jun 2 01:35:42 2012 +0400 Fix operator precedence error Change-Id: I8806f17aaf9fe2c209b917259dfd1d17e530e170 diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 7dfc301..381043e 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -666,8 +666,8 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, if( pWin && pWin->IsNativeControlSupported(CTRL_FRAME, PART_BORDER) ) { ImplControlValue aControlValue( nStyle | - (pWin->GetType()==WINDOW_BORDERWINDOW) ? - FRAME_DRAW_BORDERWINDOWBORDER : 0 ); + (pWin->GetType()==WINDOW_BORDERWINDOW ? + FRAME_DRAW_BORDERWINDOWBORDER : 0) ); Rectangle aBound, aContent; Rectangle aNatRgn( rRect ); if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
