UnoControls/source/controls/progressmonitor.cxx | 4 +- basctl/source/basicide/baside3.cxx | 7 --- basctl/source/basicide/bastypes.cxx | 2 - chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2 - chart2/source/controller/main/ChartController_Insert.cxx | 10 ++--- chart2/source/controller/main/ChartController_Tools.cxx | 24 ++++++------ cui/source/dialogs/hangulhanjadlg.cxx | 4 +- cui/source/options/optlingu.cxx | 8 ++-- cui/source/options/treeopt.cxx | 4 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 +- dbaccess/source/ui/app/AppDetailView.cxx | 2 - dbaccess/source/ui/browser/dataview.cxx | 2 - dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 +- editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 - editeng/source/editeng/editdoc.cxx | 2 - editeng/source/editeng/editeng.cxx | 4 +- editeng/source/editeng/impedit.cxx | 2 - editeng/source/editeng/impedit3.cxx | 2 - editeng/source/editeng/impedit4.cxx | 2 - editeng/source/items/textitem.cxx | 2 - editeng/source/misc/hangulhanja.cxx | 2 - extensions/source/bibliography/datman.cxx | 2 - extensions/source/propctrlr/selectlabeldialog.cxx | 2 - filter/source/flash/swfwriter1.cxx | 2 - filter/source/svg/svgwriter.cxx | 6 +-- fpicker/source/office/iodlg.cxx | 2 - include/tools/debug.hxx | 14 +------ sc/source/filter/excel/excform.cxx | 16 ++++---- sc/source/filter/xcl97/xcl97rec.cxx | 2 - sc/source/filter/xml/xmlimprt.cxx | 2 - sc/source/ui/view/gridwin.cxx | 6 +-- sc/source/ui/view/output2.cxx | 14 +++---- sd/source/core/drawdoc2.cxx | 4 +- sd/source/filter/eppt/epptso.cxx | 4 +- sd/source/filter/html/htmlex.cxx | 2 - sd/source/filter/ppt/ppt97animations.cxx | 2 - sd/source/ui/annotations/annotationmanager.cxx | 2 - sd/source/ui/dlg/docprev.cxx | 2 - sd/source/ui/func/fupage.cxx | 2 - sd/source/ui/unoidl/unopage.cxx | 4 +- sd/source/ui/view/drviews1.cxx | 2 - sd/source/ui/view/viewshe2.cxx | 4 +- sd/source/ui/view/viewshe3.cxx | 2 - sfx2/source/appl/appcfg.cxx | 2 - sfx2/source/appl/appdde.cxx | 6 +-- sfx2/source/appl/appreg.cxx | 6 +-- sfx2/source/appl/appuno.cxx | 4 +- sfx2/source/appl/childwin.cxx | 2 - sfx2/source/appl/module.cxx | 6 +-- sfx2/source/appl/sfxhelp.cxx | 2 - sfx2/source/appl/workwin.cxx | 2 - sfx2/source/bastyp/frmhtmlw.cxx | 2 - sfx2/source/config/evntconf.cxx | 2 - sfx2/source/control/ctrlitem.cxx | 4 +- sfx2/source/control/shell.cxx | 2 - sfx2/source/control/unoctitm.cxx | 2 - sfx2/source/dialog/tabdlg.cxx | 4 +- sfx2/source/doc/docinf.cxx | 2 - sfx2/source/doc/doctempl.cxx | 2 - sfx2/source/doc/objmisc.cxx | 4 +- sfx2/source/menu/mnuitem.cxx | 2 - sfx2/source/menu/virtmenu.cxx | 2 - sfx2/source/view/viewfrm.cxx | 2 - svl/source/items/cenumitm.cxx | 2 - svl/source/items/flagitem.cxx | 4 +- svl/source/items/poolio.cxx | 4 +- svl/source/items/poolitem.cxx | 20 +++++----- svtools/source/contnr/fileview.cxx | 6 +-- svtools/source/contnr/imivctl2.cxx | 4 +- svtools/source/contnr/treelistbox.cxx | 2 - svtools/source/control/asynclink.cxx | 2 - svtools/source/control/fmtfield.cxx | 2 - svtools/source/misc/transfer.cxx | 8 ++-- svtools/source/svhtml/parhtml.cxx | 2 - svx/source/fmcomp/gridcell.cxx | 2 - svx/source/fmcomp/gridctrl.cxx | 4 +- svx/source/stbctrls/zoomctrl.cxx | 2 - svx/source/svdraw/svdoashp.cxx | 2 - svx/source/tbxctrls/itemwin.cxx | 2 - svx/source/tbxctrls/tbcontrl.cxx | 2 - sw/source/core/text/txtdrop.cxx | 2 - sw/source/filter/ww8/wrtw8esh.cxx | 6 +-- sw/source/uibase/app/appopt.cxx | 3 - toolkit/source/awt/vclxtoolkit.cxx | 2 - tools/source/generic/color.cxx | 4 +- tools/source/generic/gen.cxx | 8 ++-- tools/source/generic/poly.cxx | 4 +- tools/source/generic/poly2.cxx | 8 ++-- tools/source/ref/pstm.cxx | 2 - unotools/source/ucbhelper/ucblockbytes.cxx | 2 - vcl/generic/print/genpspgraphics.cxx | 2 - vcl/osx/salframe.cxx | 2 - vcl/source/app/svdata.cxx | 2 - vcl/source/control/prgsbar.cxx | 2 - vcl/source/gdi/jobset.cxx | 4 +- vcl/source/outdev/map.cxx | 6 +-- vcl/source/outdev/text.cxx | 2 - vcl/source/window/mouse.cxx | 3 - vcl/source/window/status.cxx | 2 - vcl/source/window/winproc.cxx | 2 - xmloff/source/chart/contexts.cxx | 5 +- 101 files changed, 190 insertions(+), 206 deletions(-)
New commits: commit c8479bdc5b007ca5ffe1d553be3d90fb03424526 Author: Noel Grandin <[email protected]> Date: Mon Oct 19 12:22:03 2015 +0200 convert DBG_ASSERTWARNING to SAL_WARN_IF I know the comment in debug.hxx said to use SAL_INFO, but SAL_WARN makes much more sense. Change-Id: I3d81f9db89ef8cebe1e4f2983941d69b4c7e6b7d diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 8ed33c3..203cf4f 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -653,7 +653,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra nLine++; } - DBG_ASSERTWARNING( nStartPos != -1, "CutLines: Startzeile nicht gefunden!" ); + SAL_WARN_IF( nStartPos == -1, "basctl", "CutLines: Startzeile nicht gefunden!" ); if ( nStartPos == -1 ) return; diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 610e754..03bbcd3 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -631,7 +631,7 @@ void ParaPortion::MarkSelectionInvalid( sal_Int32 nStart, sal_Int32 /* nEnd */ ) sal_Int32 ParaPortion::GetLineNumber( sal_Int32 nIndex ) const { - DBG_ASSERTWARNING( aLineList.Count(), "Empty ParaPortion in GetLine!" ); + SAL_WARN_IF( !aLineList.Count(), "editeng", "Empty ParaPortion in GetLine!" ); DBG_ASSERT( bVisible, "Why GetLine() on an invisible paragraph?" ); for ( sal_Int32 nLine = 0; nLine < aLineList.Count(); nLine++ ) diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index f137bb4..30ea23b 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1647,7 +1647,7 @@ void EditEngine::InsertParagraph( sal_Int32 nPara, const EditTextObject& rTxtObj { if ( nPara > GetParagraphCount() ) { - DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); nPara = GetParagraphCount(); } @@ -1669,7 +1669,7 @@ void EditEngine::InsertParagraph(sal_Int32 nPara, const OUString& rTxt) { if ( nPara > GetParagraphCount() ) { - DBG_ASSERTWARNING( nPara == EE_PARA_APPEND, "Paragraph number too large, but not EE_PARA_APPEND!" ); + SAL_WARN_IF( nPara != EE_PARA_APPEND, "editeng", "Paragraph number too large, but not EE_PARA_APPEND!" ); nPara = GetParagraphCount(); } diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 4b41e79..aeb8a68 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -994,7 +994,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, ScrollRangeCheck nRangeCheck ) Rectangle aR( aOutArea ); aR = pOutWin->LogicToPixel( aR ); aR = pOutWin->PixelToLogic( aR ); - DBG_ASSERTWARNING( aR == aOutArea, "OutArea before Scroll not aligned" ); + SAL_WARN_IF( aR != aOutArea, "editeng", "OutArea before Scroll not aligned" ); #endif Rectangle aNewVisArea( GetVisDocArea() ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 3fa08b4f..7138dd8 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4179,7 +4179,7 @@ EditSelection* ImpEditEngine::SelectParagraph( sal_Int32 nPara ) { EditSelection* pSel = 0; ContentNode* pNode = GetEditDoc().GetObject( nPara ); - DBG_ASSERTWARNING( pNode, "Paragraph does not exist: SelectParagraph" ); + SAL_WARN_IF( !pNode, "editeng", "Paragraph does not exist: SelectParagraph" ); if ( pNode ) pSel = new EditSelection( EditPaM( pNode, 0 ), EditPaM( pNode, pNode->Len() ) ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 39e754b..5cda516 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1476,7 +1476,7 @@ SpellInfo * ImpEditEngine::CreateSpellInfo( bool bMultipleDocs ) EESpellState ImpEditEngine::Spell( EditView* pEditView, bool bMultipleDoc ) { - DBG_ASSERTWARNING( xSpeller.is(), "No Spell checker set!" ); + SAL_WARN_IF( !xSpeller.is(), "editeng", "No Spell checker set!" ); if ( !xSpeller.is() ) return EE_SPELL_NOSPELLER; diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index e8a128a..d2748e0 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -32,8 +32,7 @@ Because the assertion macro (DBG_ASSERT) has been used for true assertions as well as to log warnings, it maps to SAL_WARN instead of - standard assert. The warning and error macros (DBG_ASSERTWARNING) all map to - SAL_INFO. + standard assert. */ #ifdef DBG_UTIL @@ -58,18 +57,15 @@ do \ } while(false) #else -// NO DBG_UITL +// NO DBG_UTIL #define DBG_TESTSOLARMUTEX() ((void)0) #endif -#define DBG_ASSERTWARNING( sCon, aWarning ) \ - SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", "%s", aWarning) - #define DBG_ASSERT( sCon, aError ) \ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError) -#endif +#endif // INCLUDED_TOOLS_DEBUG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index dac47fe..f23b9f9 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -231,9 +231,9 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos) pObj->GetObjInventor() == SdrInventor) { // The page object is the preceding page (drawing page) - DBG_ASSERTWARNING(nStartPos, "Position of notes page must not be 0."); + SAL_WARN_IF(!nStartPos, "sd", "Position of notes page must not be 0."); - DBG_ASSERTWARNING(nPage > 1, "Page object must not be a handout."); + SAL_WARN_IF(nPage <= 1, "sd", "Page object must not be a handout."); if (nStartPos > 0 && nPage > 1) static_cast<SdrPageObj*>(pObj)->SetReferencedPage(GetPage(nPage - 1)); diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index ec9e8cb..7881fc8 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -36,7 +36,7 @@ void SfxControllerItem::CheckConfigure_Impl( SfxSlotMode nType ) // is the ID configurable at all in 'nType'? const SfxSlot *pSlot = SFX_SLOTPOOL().GetSlot(nId); - DBG_ASSERTWARNING( pSlot, "SfxControllerItem: binding not existing slot" ); + SAL_WARN_IF( !pSlot, "sfx.control", "SfxControllerItem: binding not existing slot" ); SAL_WARN_IF( pSlot && !pSlot->IsMode(nType), "sfx.control", "SfxControllerItem: slot without ...Config-flag at SID " diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index b7f69f2..f6da7b7 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -2469,7 +2469,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra nLine++; } - DBG_ASSERTWARNING( nStartPos != -1, "CutLines: Start row not found!" ); + SAL_WARN_IF( nStartPos == -1, "sfx", "CutLines: Start row not found!" ); if ( nStartPos != -1 ) { diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index b1e9647..bf5fba8 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -411,7 +411,7 @@ void SfxItemPool_Impl::readTheItems ( if ( 0 != pOldArr ) for ( n = 0; bEmpty && n < pOldArr->size(); ++n ) bEmpty = pOldArr->operator[](n) == 0; - DBG_ASSERTWARNING( bEmpty, "loading non-empty pool" ); + SAL_WARN_IF( !bEmpty, "svl", "loading non-empty pool" ); if ( !bEmpty ) { // See if there's a new one for all old ones diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 3c53308..0c4d1dc 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -1454,7 +1454,7 @@ const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken ) // PlugIns require original token name. Convert to lower case only for searching. nToken = GetHTMLOption( sName.toAsciiLowerCase() ); // Name is ready - DBG_ASSERTWARNING( nToken!=HTML_O_UNKNOWN, + SAL_WARN_IF( nToken==HTML_O_UNKNOWN, "svtools", "GetOption: unknown HTML option" ); bool bStripCRLF = (nToken < HTML_OPTION_SCRIPT_START || nToken >= HTML_OPTION_SCRIPT_END) && diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f97be03..df62e80 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1270,7 +1270,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( pNewWindow = ImplCreateWindow( &pNewComp, rDescriptor, pParent, nWinBits ); DBG_ASSERT( pNewWindow, "createWindow: Unknown Component!" ); - DBG_ASSERTWARNING( pNewComp, "createWindow: No special Interface!" ); + SAL_WARN_IF( !pNewComp, "toolkit", "createWindow: No special Interface!" ); if ( pNewWindow ) { diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index 697de7e..e85cf9d 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -243,7 +243,7 @@ OUString Color::AsRGBHexString() const SvStream& ReadColor( SvStream& rIStream, Color& rColor ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "Color::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Color::>> - Solar-Version not set on rIStream" ); sal_uInt16 nColorName; @@ -335,7 +335,7 @@ void Color::ApplyTintOrShade(sal_Int16 n100thPercent) SvStream& WriteColor( SvStream& rOStream, const Color& rColor ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "Color::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Color::<< - Solar-Version not set on rOStream" ); sal_uInt16 nColorName = COL_NAME_USER; sal_uInt16 nRed = rColor.GetRed(); diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx index cb5b1dc..33a4ae4 100644 --- a/tools/source/generic/gen.cxx +++ b/tools/source/generic/gen.cxx @@ -27,7 +27,7 @@ SvStream& ReadPair( SvStream& rIStream, Pair& rPair ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "Pair::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Pair::>> - Solar-Version not set on rIStream" ); sal_Int32 nTmpA(0), nTmpB(0); rIStream.ReadInt32( nTmpA ).ReadInt32( nTmpB ); @@ -39,7 +39,7 @@ SvStream& ReadPair( SvStream& rIStream, Pair& rPair ) SvStream& WritePair( SvStream& rOStream, const Pair& rPair ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "Pair::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Pair::<< - Solar-Version not set on rOStream" ); rOStream.WriteInt32( rPair.nA ).WriteInt32( rPair.nB ); @@ -173,7 +173,7 @@ bool Rectangle::IsOver( const Rectangle& rRect ) const SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "Rectangle::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Rectangle::>> - Solar-Version not set on rIStream" ); sal_Int32 nTmpL(0), nTmpT(0), nTmpR(0), nTmpB(0); @@ -189,7 +189,7 @@ SvStream& ReadRectangle( SvStream& rIStream, Rectangle& rRect ) SvStream& WriteRectangle( SvStream& rOStream, const Rectangle& rRect ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "Rectangle::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Rectangle::<< - Solar-Version not set on rOStream" ); rOStream.WriteInt32( rRect.nLeft ) .WriteInt32( rRect.nTop ) diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index f5cf0df..f53dbf1 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -1536,7 +1536,7 @@ bool Polygon::IsEqual( const tools::Polygon& rPoly ) const SvStream& ReadPolygon( SvStream& rIStream, tools::Polygon& rPoly ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "Polygon::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools", "Polygon::>> - Solar-Version not set on rIStream" ); sal_uInt16 i; sal_uInt16 nPoints(0); @@ -1587,7 +1587,7 @@ SvStream& ReadPolygon( SvStream& rIStream, tools::Polygon& rPoly ) SvStream& WritePolygon( SvStream& rOStream, const tools::Polygon& rPoly ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "Polygon::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "Polygon::<< - Solar-Version not set on rOStream" ); sal_uInt16 i; sal_uInt16 nPoints = rPoly.GetSize(); diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx index 6d6b3d8..7005a56 100644 --- a/tools/source/generic/poly2.cxx +++ b/tools/source/generic/poly2.cxx @@ -551,7 +551,7 @@ bool PolyPolygon::operator==( const tools::PolyPolygon& rPolyPoly ) const SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools", "PolyPolygon::>> - Solar-Version not set on rIStream" ); tools::Polygon* pPoly; sal_uInt16 nPolyCount(0); @@ -592,7 +592,7 @@ SvStream& ReadPolyPolygon( SvStream& rIStream, tools::PolyPolygon& rPolyPoly ) SvStream& WritePolyPolygon( SvStream& rOStream, const tools::PolyPolygon& rPolyPoly ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "PolyPolygon::<< - Solar-Version not set on rOStream" ); // Write number of polygons sal_uInt16 nPolyCount = rPolyPoly.mpImplPolyPolygon->mnCount; @@ -609,7 +609,7 @@ void PolyPolygon::Read( SvStream& rIStream ) { VersionCompat aCompat( rIStream, StreamMode::READ ); - DBG_ASSERTWARNING( rIStream.GetVersion(), "PolyPolygon::>> - Solar-Version not set on rIStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "tools","PolyPolygon::>> - Solar-Version not set on rIStream" ); tools::Polygon* pPoly; sal_uInt16 nPolyCount(0); @@ -650,7 +650,7 @@ void PolyPolygon::Write( SvStream& rOStream ) const { VersionCompat aCompat( rOStream, StreamMode::WRITE, 1 ); - DBG_ASSERTWARNING( rOStream.GetVersion(), "PolyPolygon::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "tools", "PolyPolygon::<< - Solar-Version not set on rOStream" ); // Write number of polygons sal_uInt16 nPolyCount = mpImplPolyPolygon->mnCount; diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 2e1dce5..c13c14e 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -164,7 +164,7 @@ void ProgressBar::Resize() void ProgressBar::SetValue( sal_uInt16 nNewPercent ) { - DBG_ASSERTWARNING( nNewPercent <= 100, "StatusBar::SetProgressValue(): nPercent > 100" ); + SAL_WARN_IF( nNewPercent > 100, "vcl", "StatusBar::SetProgressValue(): nPercent > 100" ); if ( nNewPercent < mnPercent ) { diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 4d9b499..62049b5 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -217,7 +217,7 @@ bool JobSetup::operator==( const JobSetup& rJobSetup ) const SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ) { - DBG_ASSERTWARNING( rIStream.GetVersion(), "JobSetup::>> - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rIStream.GetVersion(), "vcl", "JobSetup::>> - Solar-Version not set on rOStream" ); { sal_uInt16 nLen = 0; @@ -311,7 +311,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ) SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup ) { - DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" ); + SAL_WARN_IF( !rOStream.GetVersion(), "vcl", "JobSetup::<< - Solar-Version not set on rOStream" ); // We do not have a new FileFormat at this point in time // #define JOBSET_FILEFORMAT2 3780 diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 96d96e4..4e84033 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -708,7 +708,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) mpMetaFile->AddAction( new MetaMapModeAction( rNewMapMode ) ); #ifdef DBG_UTIL if ( GetOutDevType() != OUTDEV_PRINTER ) - DBG_ASSERTWARNING( bRelMap, "Please record only relative MapModes!" ); + SAL_WARN_IF( !bRelMap, "vcl", "Please record only relative MapModes!" ); #endif } @@ -1516,9 +1516,9 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest ) && eUnitDest != MAP_APPFONT && eUnitDest != MAP_RELATIVE, "Destination MapUnit nicht erlaubt" ); - DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL, + SAL_WARN_IF( eUnitSource == MAP_PIXEL, "vcl", "MAP_PIXEL mit 72dpi angenaehert" ); - DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, + SAL_WARN_IF( eUnitDest == MAP_PIXEL, "vcl", "MAP_PIXEL mit 72dpi angenaehert" ); } diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index d8757e0..d03f3cb 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -496,7 +496,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, DrawTextFlags nStyle, const vcl::ITextLayout& _rLayout ) { - DBG_ASSERTWARNING( nWidth >= 0, "ImplGetTextLines: nWidth <= 0!" ); + SAL_WARN_IF( nWidth <= 0, "vcl", "ImplGetTextLines: nWidth <= 0!" ); if ( nWidth <= 0 ) nWidth = 1; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index d0556a9..ad6c460 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -468,7 +468,7 @@ void Window::ReleaseMouse() ImplSVData* pSVData = ImplGetSVData(); - DBG_ASSERTWARNING( pSVData->maWinData.mpCaptureWin.get() == this, + SAL_WARN_IF( pSVData->maWinData.mpCaptureWin.get() != this, "vcl", "Window::ReleaseMouse(): window doesn't have the mouse capture" ); if ( pSVData->maWinData.mpCaptureWin.get() == this ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 472c837..c4a3490 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1374,7 +1374,7 @@ void StatusBar::StartProgressMode( const OUString& rText ) void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) { DBG_ASSERT( mbProgressMode, "StatusBar::SetProgressValue(): no progrss mode" ); - DBG_ASSERTWARNING( nNewPercent <= 100, "StatusBar::SetProgressValue(): nPercent > 100" ); + SAL_WARN_IF( nNewPercent > 100, "vcl", "StatusBar::SetProgressValue(): nPercent > 100" ); if ( mbProgressMode && IsReallyVisible() diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 16696ec..33aa9fb 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -859,7 +859,7 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow ) // system this is often the case when a Lookup Choice Window has // the focus - because this windows send the KeyInput directly to // the window without resetting the focus - DBG_ASSERTWARNING( pChild == pSVData->maWinData.mpFocusWin, + SAL_WARN_IF( pChild != pSVData->maWinData.mpFocusWin, "vcl", "ImplHandleKey: Keyboard-Input is sent to a frame without focus" ); // no keyinput to disabled windows commit 39e63bfac528d8c5c002ee8fef4a1e5d7181b826 Author: Noel Grandin <[email protected]> Date: Mon Oct 19 11:55:44 2015 +0200 convert remaing DBG_WARNING to SAL_INFO and drop the macro Change-Id: I452ca373d0c277166e94928c1bce78bf37e39d7c diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 2eafe91..83493ec 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -336,12 +336,7 @@ void DialogWindow::GetState( SfxItemSet& rSet ) case OBJ_DLG_TREECONTROL: nObj = SVX_SNAP_TREECONTROL; break; default: nObj = 0; } -#ifdef DBG_UTIL - if( !nObj ) - { - DBG_WARNING( "SID_CHOOSE_CONTROLS: Unbekannt!" ); - } -#endif + SAL_INFO_IF( !nObj, "basctl.basicide", "SID_CHOOSE_CONTROLS: Unbekannt!" ); aItem.SetValue( nObj ); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c8a1a8d..1a8092b 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1567,7 +1567,7 @@ namespace svx } else { - DBG_WARNING( "+HangulHanjaEditDictDialog::NewPBPushHdl(): dictionary faded away..." ); + SAL_INFO( "cui.dialogs", "dictionary faded away..." ); } } @@ -1650,7 +1650,7 @@ namespace svx } else { - DBG_WARNING( "+HangulHanjaEditDictDialog::UpdateOriginalLB(): dictionary faded away..." ); + SAL_INFO( "cui.dialogs", "dictionary faded away..." ); } } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 41c1422..814d5d8 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2122,7 +2122,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2166,7 +2166,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2210,7 +2210,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); @@ -2254,7 +2254,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox) const bool bHasLang = rTable.count( eCurLanguage ); if (!bHasLang) { - DBG_WARNING( "language entry missing" ); // only relevant if all languages found should be supported + SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported } const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0; lcl_SetCheckButton( pNewEntry, bCheck ); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 34e370b..e8cdeb4 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1493,7 +1493,7 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) } catch ( css::frame::UnknownModuleException& ) { - DBG_WARNING( "getActiveModule_Impl(): unknown module" ); + SAL_INFO( "cui.options", "unknown module" ); } catch ( Exception& ) { @@ -1847,7 +1847,7 @@ OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& r } catch ( css::frame::UnknownModuleException& ) { - DBG_WARNING( "OfaTreeOptionsDialog::GetModuleIdentifier(): unknown module" ); + SAL_INFO( "cui.options", "unknown module" ); } catch ( Exception& ) { diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 1544ab0..6332468 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -197,7 +197,7 @@ namespace accessibility void AccessibleEditableTextPara::implGetParagraphBoundary( css::i18n::Boundary& rBoundary, sal_Int32 /*nIndex*/ ) { - DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" ); + SAL_INFO( "editeng", "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" ); rBoundary.startPos = 0; //rBoundary.endPos = GetTextLen(); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 3e35828..b00d7ab 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -353,7 +353,7 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const if ( ePitch != rItem.ePitch || eTextEncoding != rItem.eTextEncoding ) { bRet = false; - DBG_WARNING( "FontItem::operator==(): only pitch or rtl_TextEncoding different "); + SAL_INFO( "editeng", "FontItem::operator==(): only pitch or rtl_TextEncoding different "); } } return bRet; diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 34cee4a..b3d6390 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -638,7 +638,7 @@ namespace editeng // hangul or hanja character in the first text if ( !implRetrieveNextPortion() ) { - DBG_WARNING( "HangulHanjaConversion_Impl::DoDocumentConversion: why did you call me if you do have nothing to convert?" ); + SAL_INFO( "editeng", "HangulHanjaConversion_Impl::DoDocumentConversion: why did you call me if you do have nothing to convert?" ); // nothing to do return; } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 818713a..728359d 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -138,7 +138,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe xConn = Reference< XConnection > (*static_cast<Reference< XInterface > const *>(xFormProps->getPropertyValue("ActiveConnection").getValue()), UNO_QUERY); if (!xConn.is()) { - DBG_WARNING("no active connection"); + SAL_INFO("extensions", "no active connection"); } } catch (const Exception&) diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index feeeaa2..7d0b939 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -179,7 +179,7 @@ namespace pcr xContainer->getByIndex(i) >>= xAsSet; if (!xAsSet.is()) { - DBG_WARNING("OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !"); + SAL_INFO("extensions", "OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !"); continue; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 5eb5f8e..d76d89b 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -224,7 +224,7 @@ namespace } catch( const css::uno::Exception& ) { - DBG_WARNING( "Exception in lcl_autoUpdateFileExtension" ); + SAL_INFO( "fpicker", "Exception in lcl_autoUpdateFileExtension" ); } } } diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx index 3dfafab..e8a128a 100644 --- a/include/tools/debug.hxx +++ b/include/tools/debug.hxx @@ -32,8 +32,7 @@ Because the assertion macro (DBG_ASSERT) has been used for true assertions as well as to log warnings, it maps to SAL_WARN instead of - standard assert. The warning and error macros (DBG_ASSERTWARNING, - DBG_WARNING) all map to + standard assert. The warning and error macros (DBG_ASSERTWARNING) all map to SAL_INFO. */ @@ -71,9 +70,6 @@ do \ #define DBG_ASSERT( sCon, aError ) \ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError) -#define DBG_WARNING( aWarning ) \ - SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", "%s", aWarning) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index f965021..c5b52d3 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -413,10 +413,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case EXC_BIFF3: case EXC_BIFF4: aIn.Ignore( 10 ); break; case EXC_BIFF5: - DBG_WARNING( "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); //fall-through default: - DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1B: // End External Reference [330 ] @@ -426,10 +426,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case EXC_BIFF3: case EXC_BIFF4: aIn.Ignore( 4 ); break; case EXC_BIFF5: - DBG_WARNING( "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); //fall-through default: - DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1C: // Error Value [314 266] @@ -1027,9 +1027,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case EXC_BIFF2: nIgnore = 7; break; case EXC_BIFF3: case EXC_BIFF4: nIgnore = 10; break; - case EXC_BIFF5: DBG_WARNING( "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); + case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" ); //fall-through - default: DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1B: // End External Reference [330 ] @@ -1038,9 +1038,9 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case EXC_BIFF2: nIgnore = 3; break; case EXC_BIFF3: case EXC_BIFF4: nIgnore = 4; break; - case EXC_BIFF5: DBG_WARNING( "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); + case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" ); //fall-through - default: DBG_WARNING( "-ExcelToSc::Convert(): A little oblivious?" ); + default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" ); } break; case 0x1C: // Error Value [314 266] diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 70a1443..5d03cea 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -367,7 +367,7 @@ SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix xAttrList ); break; case XML_TOK_DOC_META: - DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); + SAL_INFO("sc", "XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); break; case XML_TOK_DOC_SCRIPTS: if (GetScImport().getImportFlags() & SvXMLImportFlags::SCRIPTS) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 5e41972..e423703 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1785,7 +1785,7 @@ bool HtmlExport::CreateHtmlForPresPages() default: { - DBG_WARNING("unknown IMAP_OBJ_type"); + SAL_INFO("sd", "unknown IMAP_OBJ_type"); } break; } diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 1278444..e216cbf 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -198,7 +198,7 @@ void Ppt97Animation::SetAnimateAssociatedShape( bool bAnimate ) { //this case is not 100% correct -> feel free to complete //i consider this case as seldom and not that problematic and a simple correct fix is not in sight - DBG_WARNING("you tried to deselect the animation of the form for random animation-> this has been refused"); + SAL_INFO("sd", "you tried to deselect the animation of the form for random animation-> this has been refused"); return; } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 5d79a3e..7ed8a97 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -379,7 +379,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( break; default: - DBG_WARNING("wrong slot id given to CreateOrDuplicatePage"); + SAL_INFO("sd", "wrong slot id given to CreateOrDuplicatePage"); // Try to handle another slot id gracefully. } SdPage* pNewPage = 0; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 2f84831..bd2b6d8 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -480,7 +480,7 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet ) break; default: - DBG_WARNING( "W1:Wrong ID while getting Options!" ); + SAL_INFO( "sfx", "W1:Wrong ID while getting Options!" ); break; } #ifdef DBG_UTIL diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 91abb167..c457103 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -92,15 +92,15 @@ namespace } catch( const ucb::CommandAbortedException& ) { - DBG_WARNING( "CommandAbortedException" ); + SAL_INFO( "sfx2.appl", "CommandAbortedException" ); } catch( const ucb::IllegalIdentifierException& ) { - DBG_WARNING( "IllegalIdentifierException" ); + SAL_INFO( "sfx2.appl", "IllegalIdentifierException" ); } catch( const ucb::ContentCreationException& ) { - DBG_WARNING( "IllegalIdentifierException" ); + SAL_INFO( "sfx2.appl", "IllegalIdentifierException" ); } catch( const uno::Exception& ) { diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 0b618ce..ee82f24 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -81,7 +81,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController registration is not clearly defined!"); + SAL_INFO("sfx", "TbxController registration is not clearly defined!"); } } #endif @@ -106,7 +106,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("StbController registration is not clearly defined!"); + SAL_INFO("sfx", "StbController registration is not clearly defined!"); } } #endif @@ -131,7 +131,7 @@ void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFacto if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("MenuController register is not clearly defined!"); + SAL_INFO("sfx", "MenuController register is not clearly defined!"); } } #endif diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 5f1a86a..0055cea 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -247,7 +247,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert { OStringBuffer aStr("MacroPlayer: wrong number of parameters for slot: "); aStr.append(static_cast<sal_Int32>(nSlotId)); - DBG_WARNING(aStr.getStr()); + SAL_INFO("sfx2.appl", aStr.getStr()); } #endif // complex property; collect sub items from the parameter set and reconstruct complex item @@ -908,7 +908,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert // except for the "special" slots: assure that every argument was convertible OStringBuffer aStr("MacroPlayer: Some properties didn't match to any formal argument for slot: "); aStr.append(pSlot->pUnoName); - DBG_WARNING( aStr.getStr() ); + SAL_INFO( "sfx2.appl", aStr.getStr() ); } #endif } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4834fd8..e678f4e 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -290,7 +290,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, if ( pChild && !pChild->pWindow ) { DELETEZ(pChild); - DBG_WARNING("ChildWindow has no Window!"); + SAL_INFO("sfx2.appl", "ChildWindow has no Window!"); } return pChild; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 63b7290..b551fb4 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -246,7 +246,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!"); } } #endif @@ -268,7 +268,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("TbxController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!"); } } #endif @@ -290,7 +290,7 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact ) if ( pF->nTypeId && pF->nTypeId == pFact->nTypeId && (pF->nSlotId == pFact->nSlotId || pF->nSlotId == 0) ) { - DBG_WARNING("MenuController-Registering is not clearly defined!"); + SAL_INFO("sfx2.appl", "MenuController-Registering is not clearly defined!"); } } #endif diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 35a6cc6..b80f5a5 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -279,7 +279,7 @@ OUString getCurrentModuleIdentifier_Impl() } catch (const ::com::sun::star::frame::UnknownModuleException&) { - DBG_WARNING( "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); + SAL_INFO( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" ); } catch (const Exception&) { diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 5d4f1ad..568c380 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -226,7 +226,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, catch (const uno::Exception&) { // may happen with concurrent modification... - DBG_WARNING("SfxFrameHTMLWriter::Out_DocInfo: exception"); + SAL_INFO("sfx", "SfxFrameHTMLWriter::Out_DocInfo: exception"); } } } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index ced9245..04388e7 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -255,7 +255,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, const OUString& aEventName, cons } } else { - DBG_WARNING( "PropagateEvents_Impl: Got unknown event" ); + SAL_INFO( "sfx.config", "PropagateEvents_Impl: Got unknown event" ); } } } diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index aa4dbde..ec9e8cb 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -369,7 +369,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const } } - DBG_WARNING( "W1: Can not find ItemPool!" ); + SAL_INFO( "sfx.control", "W1: Can not find ItemPool!" ); return SFX_MAPUNIT_100TH_MM; } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 2faa75c..8b63eaa 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -291,7 +291,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ) while ( pIF ); - DBG_WARNING( "W3: invalidating slot-id unknown in shell" ); + SAL_INFO( "sfx.control", "W3: invalidating slot-id unknown in shell" ); } } diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index f38e7f1..4a243ca 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -850,7 +850,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util } #ifdef DBG_UTIL else - DBG_WARNING("MacroPlayer: Unknown slot dispatched!"); + SAL_INFO("sfx.control", "MacroPlayer: Unknown slot dispatched!"); #endif } } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 38d53bc..285dabc 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -361,7 +361,7 @@ SfxTabDialog::SfxTabDialog , pExampleSet(0) { Init_Impl(bEditFmt); - DBG_WARNING( "Please use the Construtor with the ViewFrame" ); + SAL_INFO( "sfx.config", "Please use the Construtor with the ViewFrame" ); } @@ -1234,7 +1234,7 @@ IMPL_LINK_TYPED( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl, bool ) DBG_ASSERT( pDataObject, "no Data structure for current page" ); if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand ) { - DBG_WARNING( "Data exchange in ItemsOnDemand is not desired!" ); + SAL_INFO( "sfx.config", "Data exchange in ItemsOnDemand is not desired!" ); } #endif diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index ec18c6d..3a5d8b9 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -293,7 +293,7 @@ bool SaveOlePropertySet( catch (const uno::Exception &) { // may happen with concurrent modification... - DBG_WARNING("SavePropertySet: exception"); + SAL_INFO("sfx", "SavePropertySet: exception"); } } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 5a1b04c..1b12c33 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -278,7 +278,7 @@ void SfxObjectShell::EnableSetModified( bool bEnable ) { #ifdef DBG_UTIL if ( bEnable == pImp->m_bEnableSetModified ) - DBG_WARNING( "SFX_PERSIST: EnableSetModified 2x called with the same value" ); + SAL_INFO( "sfx", "SFX_PERSIST: EnableSetModified 2x called with the same value" ); #endif pImp->m_bEnableSetModified = bEnable; } @@ -339,7 +339,7 @@ void SfxObjectShell::SetModified( bool bModifiedP ) { #ifdef DBG_UTIL if ( !bModifiedP && !IsEnableSetModified() ) - DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); + SAL_INFO( "sfx", "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); #endif if( !IsEnableSetModified() ) diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 5a94cd3..eabf1aa 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -188,7 +188,7 @@ void SfxMenuControl::StateChanged if ( pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() ) { - DBG_WARNING("Title of menu item changed - please check if this needs correction!"); + SAL_INFO("sfx", "Title of menu item changed - please check if this needs correction!"); } return; } diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 9670094..68bbca3 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -900,7 +900,7 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) bool bRet = pMenu && Bind_Impl(pMenu); #ifdef DBG_UTIL if ( !bRet) - DBG_WARNING( "W1: Virtual menu could not be created!" ); + SAL_INFO( "sfx", "W1: Virtual menu could not be created!" ); #endif return bRet; } diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 595c80e..695132e 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -71,7 +71,7 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal, OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { - DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); + SAL_INFO("svl", "SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); return OUString(); } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index 02dcdaf..e08bc41 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -69,7 +69,7 @@ bool SfxFlagItem::GetPresentation sal_uInt8 SfxFlagItem::GetFlagCount() const { - DBG_WARNING("calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); + SAL_INFO("svl", "calling GetValueText(sal_uInt16) on SfxFlagItem -- override!"); return 0; } @@ -77,7 +77,7 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const { - DBG_WARNING("calling Create() on SfxFlagItem -- override!"); + SAL_INFO("svl", "calling Create() on SfxFlagItem -- override!"); return 0; } diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 85e7b13..b1e9647 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -480,7 +480,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) for( size_t n = (*itrItemArr)->size(); n; --n, ++ppHtArr ) if (*ppHtArr) { - DBG_WARNING( "loading non-empty ItemPool" ); + SAL_INFO( "svl", "loading non-empty ItemPool" ); AddRef( **ppHtArr ); } diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index f55d7a2..3212f0d 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -50,27 +50,27 @@ SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) ++nItemCount; if ( pw1 && nItemCount>=10000 ) { - DBG_WARNING( pw1 ); + SAL_INFO( "svl", pw1 ); pw1 = NULL; } if ( pw2 && nItemCount>=100000 ) { - DBG_WARNING( pw2 ); + SAL_INFO( "svl", pw2 ); pw2 = NULL; } if ( pw3 && nItemCount>=1000000 ) { - DBG_WARNING( pw3 ); + SAL_INFO( "svl", pw3 ); pw3 = NULL; } if ( pw4 && nItemCount>=5000000 ) { - DBG_WARNING( pw4 ); + SAL_INFO( "svl", pw4 ); pw4 = NULL; } if ( pw5 && nItemCount>=10000000 ) { - DBG_WARNING( pw5 ); + SAL_INFO( "svl", pw5 ); pw5 = NULL; } #endif @@ -86,27 +86,27 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy ) ++nItemCount; if ( pw1 && nItemCount>=10000 ) { - DBG_WARNING( pw1 ); + SAL_INFO( "svl", pw1 ); pw1 = NULL; } if ( pw2 && nItemCount>=100000 ) { - DBG_WARNING( pw2 ); + SAL_INFO( "svl", pw2 ); pw2 = NULL; } if ( pw3 && nItemCount>=1000000 ) { - DBG_WARNING( pw3 ); + SAL_INFO( "svl", pw3 ); pw3 = NULL; } if ( pw4 && nItemCount>=5000000 ) { - DBG_WARNING( pw4 ); + SAL_INFO( "svl", pw4 ); pw4 = NULL; } if ( pw5 && nItemCount>=10000000 ) { - DBG_WARNING( pw5 ); + SAL_INFO( "svl", pw5 ); pw5 = NULL; } #endif diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index b8d6ec1..7c84374 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -956,12 +956,12 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) } catch( ::com::sun::star::ucb::CommandAbortedException const & ) { - DBG_WARNING( "CommandAbortedException" ); + SAL_INFO( "svtools", "CommandAbortedException" ); bRet = false; } catch( Exception const & ) { - DBG_WARNING( "Any other exception" ); + SAL_INFO( "svtools", "Any other exception" ); bRet = false; } @@ -2034,7 +2034,7 @@ bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl* co bEqual = true; break; default: - DBG_WARNING( "CompareSortingData_Impl: Compare unknown type!" ); + SAL_INFO( "svtools", "CompareSortingData_Impl: Compare unknown type!" ); bRet = false; } } diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 9ca2278..da90bfe 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -473,12 +473,12 @@ void IcnCursor_Impl::SetDeltas() if( !nDeltaHeight ) { nDeltaHeight = 1; - DBG_WARNING("SetDeltas:Bad height"); + SAL_INFO("svtools", "SetDeltas:Bad height"); } if( !nDeltaWidth ) { nDeltaWidth = 1; - DBG_WARNING("SetDeltas:Bad width"); + SAL_INFO("svctools", "SetDeltas:Bad width"); } } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index fe4035f..4aaf9f4 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3817,7 +3817,7 @@ std::unique_ptr<PopupMenu> SvTreeListBox::CreateContextMenu() void SvTreeListBox::ExcecuteContextMenuAction( sal_uInt16 ) { - DBG_WARNING( "SvTreeListBox::ExcecuteContextMenuAction(): now there's happening nothing!" ); + SAL_INFO( "svtools", "SvTreeListBox::ExcecuteContextMenuAction(): now there's happening nothing!" ); } void SvTreeListBox::EnableContextMenuHandling() diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 5b4d6a9..1ce6f44 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -37,7 +37,7 @@ void AsynchronLink::Call( void* pObj, bool bAllowDoubles, bool bUseTimer ) { #ifdef DBG_UTIL if ( bUseTimer || !_bInCall ) - DBG_WARNING( "Recursives Call. Eher ueber Timer. TLX Fragen" ); + SAL_INFO( "svtools", "Recursives Call. Eher ueber Timer. TLX Fragen" ); #endif if( _aLink.IsSet() ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index df0c0cd..84bc9d7 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -348,7 +348,7 @@ void FormattedField::SetTextFormatted(const OUString& rStr) #if defined DBG_UTIL if (ImplGetFormatter()->IsTextFormat(m_nFormatKey)) - DBG_WARNING("FormattedField::SetTextFormatted : valid only with text formats !"); + SAL_INFO("svtools", "FormattedField::SetTextFormatted : valid only with text formats !"); #endif m_sCurrentTextValue = rStr; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9d23b09..3a166ed 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1917,11 +1917,11 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf if( !nLen && aString[ 0 ] != '0' ) { - DBG_WARNING( "SOLK: 1. len=0" ); + SAL_INFO( "svtools", "SOLK: 1. len=0" ); } if( nStart == -1 || nLen > aString.getLength() - nStart - 3 ) { - DBG_WARNING( "SOLK: 1. illegal start or wrong len" ); + SAL_INFO( "svtools", "SOLK: 1. illegal start or wrong len" ); } aURL = aString.copy( nStart + 1, nLen ); @@ -1931,11 +1931,11 @@ bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransf if( !nLen && aString[ 0 ] != '0' ) { - DBG_WARNING( "SOLK: 2. len=0" ); + SAL_INFO( "svtools", "SOLK: 2. len=0" ); } if( nStart == -1 || nLen > aString.getLength() - nStart - 1 ) { - DBG_WARNING( "SOLK: 2. illegal start or wrong len" ); + SAL_INFO( "svtools", "SOLK: 2. illegal start or wrong len" ); } aDesc = aString.copy( nStart+1, nLen ); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 5fcf31d..5c85ac7 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1310,7 +1310,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } else { - DBG_WARNING("DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); + SAL_INFO("svx", "DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); // the OFormattedModel which we usually are working with ensures that the model has a format key // as soon as the form is loaded. Unfortunally this method here is called from within loaded, too. // So if our LoadListener is called before the LoadListener of the model, this "else case" is diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index fdc80be..d7c43f2 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2258,14 +2258,14 @@ sal_Int32 DbGridControl::AlignSeekCursor() if ( m_pDataCursor->isBeforeFirst() ) { // this is somewhat strange, but can nevertheless happen - DBG_WARNING( "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); + SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); m_pSeekCursor->first(); m_pSeekCursor->previous(); m_nSeekPos = -1; } else if ( m_pDataCursor->isAfterLast() ) { - DBG_WARNING( "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); + SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); m_pSeekCursor->last(); m_pSeekCursor->next(); m_nSeekPos = -1; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 19dc048..f1d8adb 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -128,7 +128,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, } else { - DBG_WARNING( "use SfxZoomItem for SID_ATTR_ZOOM" ); + SAL_INFO( "svx", "use SfxZoomItem for SID_ATTR_ZOOM" ); nValueSet = SvxZoomEnableFlags::ALL; } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d100e11..c60f81a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2373,7 +2373,7 @@ void SvxStyleToolBoxControl::Update() if ( !pItem ) { - DBG_WARNING( "Unknown Family" ); // can happen + SAL_INFO( "svx", "Unknown Family" ); // can happen } } else if ( pPool != pStyleSheetPool ) diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index ab0f951..06ad8e5 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -501,7 +501,7 @@ sal_uInt32 SvPersistStream::ReadObj OStringBuffer aStr("no class with id: " ); aStr.append(static_cast<sal_Int32>(nClassId)); aStr.append(" registered"); - DBG_WARNING(aStr.getStr()); + SAL_INFO("tools", aStr.getStr()); #else (void)nObjLen; #endif diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index e0b486f..140a902 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1318,7 +1318,7 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize) nSize = 0; } else { - DBG_WARNING("Not truncatable!"); + SAL_INFO("unotools", "Not truncatable!"); } } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index a3ebd0e..1ff761c 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -524,7 +524,7 @@ void GenPspGraphics::drawMask( const SalTwoRect&, SalBitmap* GenPspGraphics::getBitmap( long, long, long, long ) { - DBG_WARNING ("Warning: PrinterGfx::GetBitmap() not implemented"); + SAL_INFO("vcl", "Warning: PrinterGfx::GetBitmap() not implemented"); return NULL; } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 4cc145f..45a6c02 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -134,7 +134,7 @@ vcl::Window* ImplGetDefaultWindow() if ( !pSVData->mpDefaultWin && !pSVData->mbDeInit ) { - DBG_WARNING( "ImplGetDefaultWindow(): No AppWindow" ); + SAL_INFO( "vcl", "ImplGetDefaultWindow(): No AppWindow" ); pSVData->mpDefaultWin = VclPtr<WorkWindow>::Create( nullptr, WB_DEFAULTWIN ); pSVData->mpDefaultWin->SetText( OUString( "VCL ImplGetDefaultWindow" ) ); diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 16bb316..d0556a9 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -306,7 +306,6 @@ void Window::ImplGrabFocus( GetFocusFlags nFlags ) { // here we already switch focus as ToTop() // should not give focus to another window - //DBG_WARNING( "Window::GrabFocus() - Frame doesn't have the focus" ); mpWindowImpl->mpFrame->ToTop( SAL_FRAME_TOTOP_GRABFOCUS | SAL_FRAME_TOTOP_GRABFOCUS_ONLY ); return; } diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 8c37b3a..e2ec978 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -112,9 +112,8 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( pContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_META: - // we come here in the flat ODF file format, - // if XDocumentPropertiesSupplier is not supported at the model -// DBG_WARNING("XML_TOK_DOC_META: should not have come here, maybe document is invalid?"); + // we come here in the flat ODF file format, + // if XDocumentPropertiesSupplier is not supported at the model pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_BODY: commit 367105e0248c7b80b60b2554d04f5f248b4259b3 Author: Noel Grandin <[email protected]> Date: Mon Oct 19 10:37:58 2015 +0200 cleanup some local var declarations found with git grep -nP '(\w+)\s+=\s+\g1\(' | lots-of-hand-filtering Change-Id: I598b0cfa6607823eaef09d95e610e05145c727f7 diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 5c0e5a7..d3add99 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -419,8 +419,8 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std: Size aTopicSize_Top = xTopicLayout_Top->getPreferredSize (); Size aTopicSize_Bottom = xTopicLayout_Bottom->getPreferredSize (); Size aButtonSize = xButtonLayout->getPreferredSize (); - Rectangle aTempRectangle = m_xProgressBar->getPosSize(); - Size aProgressBarSize = Size( aTempRectangle.Width, aTempRectangle.Height ); + Rectangle aTempRectangle = m_xProgressBar->getPosSize(); + Size aProgressBarSize( aTempRectangle.Width, aTempRectangle.Height ); aGuard.clear (); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index da032cc..be031a0 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -235,7 +235,7 @@ void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProv void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */) { svtools::ColorConfig aColorConfig; - Color aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); + Color aFillColor( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); this->SetApplicationBackgroundColor(aFillColor); this->E3dView::CompleteRedraw( pOut, rReg ); } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 5ca647f..ca09dce 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -532,7 +532,7 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) if( xEqProp.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -549,7 +549,7 @@ void ChartController::executeDispatch_InsertR2Value() ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xEqProp.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -564,7 +564,7 @@ void ChartController::executeDispatch_DeleteR2Value() ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xEqProp.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -639,7 +639,7 @@ void ChartController::executeDispatch_InsertDataLabels() ObjectIdentifier::getDataSeriesForCID( m_aSelection.getSelectedCID(), getModel() ), uno::UNO_QUERY ); if( xSeries.is() ) { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_DATALABELS )), m_xUndoManager ); DataSeriesHelper::insertDataLabelsToSeriesAndAllPoints( xSeries ); @@ -649,7 +649,7 @@ void ChartController::executeDispatch_InsertDataLabels() void ChartController::executeDispatch_InsertDataLabel() { - UndoGuard aUndoGuard = UndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::INSERT, SCH_RESSTR( STR_OBJECT_LABEL )), m_xUndoManager ); DataSeriesHelper::insertDataLabelToPoint( ObjectIdentifier::getObjectPropertySet( m_aSelection.getSelectedCID(), getModel() ) ); diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 2240eae..c6e01a8 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -136,7 +136,7 @@ bool lcl_deleteDataCurve( if( xRegressionCurveContainer.is()) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE )), xUndoManager ); @@ -179,7 +179,7 @@ void ChartController::executeDispatch_NewArrangement() if( xDiagram.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_REARRANGE_CHART ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( xModel ); @@ -235,7 +235,7 @@ void ChartController::executeDispatch_ScaleText() { SolarMutexGuard aSolarGuard; // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_SCALE_TEXT ), m_xUndoManager ); ControllerLockGuardUNO aCtlLockGuard( getModel() ); @@ -616,7 +616,7 @@ bool ChartController::executeDispatch_Delete() case OBJECTTYPE_TITLE: { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_TITLE )), m_xUndoManager ); @@ -635,7 +635,7 @@ bool ChartController::executeDispatch_Delete() if( xLegendProp.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_LEGEND )), m_xUndoManager ); @@ -682,7 +682,7 @@ bool ChartController::executeDispatch_Delete() if( xRegCurveCnt.is()) { // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_AVERAGE_LINE )), m_xUndoManager ); @@ -708,7 +708,7 @@ bool ChartController::executeDispatch_Delete() { uno::Reference< frame::XModel > xModel( getModel() ); // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); @@ -742,7 +742,7 @@ bool ChartController::executeDispatch_Delete() uno::Reference< frame::XModel > xModel( getModel() ); // using assignment for broken gcc 3.3 - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( nId )), m_xUndoManager ); @@ -765,7 +765,7 @@ bool ChartController::executeDispatch_Delete() ObjectIdentifier::getObjectPropertySet( aCID, getModel() ); if( xObjectProperties.is() ) { - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( ActionDescriptionProvider::createDescription( ActionDescriptionProvider::DELETE, SCH_RESSTR( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )), @@ -832,7 +832,7 @@ bool ChartController::executeDispatch_Delete() void ChartController::executeDispatch_ToggleLegend() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_LEGEND ), m_xUndoManager ); ChartModel& rModel = dynamic_cast<ChartModel&>(*xModel.get()); Reference< beans::XPropertySet > xLegendProp( LegendHelper::getLegend(rModel), uno::UNO_QUERY ); @@ -867,7 +867,7 @@ void ChartController::executeDispatch_ToggleLegend() void ChartController::executeDispatch_ToggleGridHorizontal() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_GRID_HORZ ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) @@ -901,7 +901,7 @@ void ChartController::executeDispatch_ToggleGridHorizontal() void ChartController::executeDispatch_ToggleGridVertical() { Reference< frame::XModel > xModel( getModel() ); - UndoGuard aUndoGuard = UndoGuard( + UndoGuard aUndoGuard( SCH_RESSTR( STR_ACTION_TOGGLE_GRID_VERTICAL ), m_xUndoManager ); Reference< chart2::XDiagram > xDiagram( ChartModelHelper::findDiagram( getModel() )); if( xDiagram.is()) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 73e00db..f6b7314 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -727,7 +727,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine { pEntry = pList->InsertEntry( *pIter, _pParent ); - Image aImage = Image( ModuleRes( _nImageId ) ); + Image aImage{ ModuleRes( _nImageId ) }; pList->SetExpandedEntryBmp( pEntry, aImage ); pList->SetCollapsedEntryBmp( pEntry, aImage ); } @@ -857,7 +857,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS { pRet = pTreeView->InsertEntry( _rName, pEntry ); - Image aImage = Image( ModuleRes( nImageId ) ); + Image aImage{ ModuleRes( nImageId ) }; pTreeView->SetExpandedEntryBmp( pRet, aImage ); pTreeView->SetCollapsedEntryBmp( pRet, aImage ); } diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 8651666..7e2cdf6 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -500,7 +500,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) SvTreeListEntry* pEntry = m_aCreation->InsertEntry( pTask->sTitle ); pEntry->SetUserData( new TaskEntry( *pTask ) ); - Image aImage = Image( *pImages ); + Image aImage( *pImages ); m_aCreation->SetExpandedEntryBmp( pEntry, aImage ); m_aCreation->SetCollapsedEntryBmp( pEntry, aImage ); } diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 00002a8..a722433 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -92,7 +92,7 @@ namespace dbaui Rectangle aPlayground( _rPlayground ); // position the separator - const Size aSeparatorSize = Size( aPlayground.GetWidth(), 2 ); + const Size aSeparatorSize( aPlayground.GetWidth(), 2 ); m_aSeparator->SetPosSizePixel( aPlayground.TopLeft(), aSeparatorSize ); aPlayground.Top() += aSeparatorSize.Height() + 1; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index e9b9512..64c59f9 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2603,8 +2603,8 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) } // normalize the split pos - Point aSplitPos = Point( _rPlayground.Left(), nSplitPos ); - Size aSplitSize = Size( _rPlayground.GetSize().Width(), m_aSplitter->GetSizePixel().Height() ); + Point aSplitPos( _rPlayground.Left(), nSplitPos ); + Size aSplitSize( _rPlayground.GetSize().Width(), m_aSplitter->GetSizePixel().Height() ); if( ( aSplitPos.Y() + aSplitSize.Height() ) > ( aPlaygroundSize.Height() )) aSplitPos.Y() = aPlaygroundSize.Height() - aSplitSize.Height(); diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index ac7f94d..996db16 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -450,7 +450,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon nOff += 6; Color aTextColor( mpVDev->GetTextColor() ); - Color aShadowColor = Color( COL_BLACK ); + Color aShadowColor( COL_BLACK ); if ( (aTextColor.GetColor() == COL_BLACK) || (aTextColor.GetLuminance() < 8) ) aShadowColor = Color( COL_LIGHTGRAY ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 249791e..44cdef2 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -2360,7 +2360,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText, nOff += 6; Color aTextColor( mpVDev->GetTextColor() ); - Color aShadowColor = Color( COL_BLACK ); + Color aShadowColor( COL_BLACK ); if ( (aTextColor.GetColor() == COL_BLACK) || (aTextColor.GetLuminance() < 8) ) aShadowColor = Color( COL_LIGHTGRAY ); @@ -2591,8 +2591,8 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx, { if( !!rBmpEx ) { - BitmapEx aBmpEx( rBmpEx ); - Point aPoint = Point(); + BitmapEx aBmpEx( rBmpEx ); + Point aPoint; const Rectangle aBmpRect( aPoint, rBmpEx.GetSizePixel() ); const Rectangle aSrcRect( rSrcPt, rSrcSz ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 189574c..904ce23 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -512,7 +512,7 @@ static void lcl_FillProps( EscherPropertyContainer& rPropOpt, SdrObject* pCaptio // If the Colour is the same as the 'ToolTip' System colour then // use the default rather than the explicit colour value. This will // be incorrect where user has chosen to use this colour explicity. - Color aColor = Color( (sal_uInt8)nValue, (sal_uInt8)( nValue >> 8 ), (sal_uInt8)( nValue >> 16 ) ); + Color aColor( (sal_uInt8)nValue, (sal_uInt8)( nValue >> 8 ), (sal_uInt8)( nValue >> 16 ) ); const StyleSettings& rSett = Application::GetSettings().GetStyleSettings(); if( aColor == rSett.GetHelpColor().GetColor() ) { diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 32b69d0..676cb06 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5381,7 +5381,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, MapMode aEditMode = pViewData->GetLogicMode(eWhich); // without draw scaleing Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode ); long nThisColLogic = aLogicEdit.Right() - aLogicEdit.Left() + 1; - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); if (aCell.meType == CELLTYPE_FORMULA) { long nSizeX = 0; @@ -5484,7 +5484,7 @@ bool ScGridWindow::IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCROW nRow std::shared_ptr<ScFieldEditEngine> pEngine = createEditEngine(pDocSh, *pPattern); - Size aPaperSize = Size(1000000, 1000000); + Size aPaperSize(1000000, 1000000); pEngine->SetPaperSize(aPaperSize); if (aCell.meType == CELLTYPE_EDIT) @@ -6212,7 +6212,7 @@ void ScGridWindow::UpdateAutoFillOverlay() sal_Int32 nScale = GetDPIScaleFactor(); // Size should be even - Size aFillHandleSize = Size(6 * nScale, 6 * nScale); + Size aFillHandleSize(6 * nScale, 6 * nScale); Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, true ); long nSizeXPix; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index c2690f9..f3c878a 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2803,7 +2803,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); if (rParam.mbBreak) { // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3298,7 +3298,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); if (rParam.mbBreak) { // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3558,7 +3558,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); if (rParam.hasLineBreak()) { // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3825,7 +3825,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width //! handle nArrY == 0 @@ -4179,7 +4179,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width //! handle nArrY == 0 @@ -4864,7 +4864,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) } } - Size aPaperSize = Size( 1000000, 1000000 ); + Size aPaperSize( 1000000, 1000000 ); if (eOrient==SVX_ORIENTATION_STACKED) aPaperSize.Width() = nOutWidth; // to center else if (bBreak) @@ -5000,7 +5000,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (!bHidden) { bool bClip = false; - Size aClipSize = Size( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY ); + Size aClipSize( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY ); // go on writing diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 37ac0ec..3b00337 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -834,7 +834,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { case ::com::sun::star::drawing::FillStyle_GRADIENT : { - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) ); EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); aPropOpt.CreateGradientProperties( mXPropSet ); @@ -857,7 +857,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) { case ::com::sun::star::drawing::FillStyle_GRADIENT : { - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect( aEmptyPoint, Size( 28000, 21000 ) ); EscherPropertyContainer aPropOpt( mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aRect ); aPropOpt.CreateGradientProperties( mXBackgroundPropSet ); diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index da82d3c..166b8c1 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -152,7 +152,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio com::sun::star::util::DateTime aDateTime( xAnnotation->getDateTime() ); Date aSysDate( Date::SYSTEM ); - Date aDate = Date( aDateTime.Day, aDateTime.Month, aDateTime.Year ); + Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); if (aDate==aSysDate) sRet = SdResId(STR_ANNOTATION_TODAY); else if (aDate == Date(aSysDate-1)) diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 38ded5a9..11935c8 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -274,7 +274,7 @@ void SdDocPreviewWin::updateViewSettings() // Use new StandardCheckVisisbilityRedirector StandardCheckVisisbilityRedirector aRedirector; - const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize ); + const Rectangle aRedrawRectangle( Point(), aNewSize ); vcl::Region aRedrawRegion(aRedrawRectangle); pView->SdrPaintView::CompleteRedraw(pVDev,aRedrawRegion,&aRedirector); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 2fcf881..6108d77 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -624,7 +624,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) // Objects can not be bigger than ViewSize Size aPageSize = mpDoc->GetSdPage(0, ePageKind)->GetSize(); - Size aViewSize = Size(aPageSize.Width() * 3, aPageSize.Height() * 2); + Size aViewSize(aPageSize.Width() * 3, aPageSize.Height() * 2); mpDoc->SetMaxObjSize(aViewSize); // if necessary, we tell Preview the new context diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 6261bb6..32c8c79 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1789,8 +1789,8 @@ static void refreshpage( SdDrawDocument* pDoc, const PageKind ePageKind ) const long nWidth = aPageSize.Width(); const long nHeight = aPageSize.Height(); - Point aPageOrg = Point(nWidth, nHeight / 2); - Size aViewSize = Size(nWidth * 3, nHeight * 2); + Point aPageOrg(nWidth, nHeight / 2); + Size aViewSize(nWidth * 3, nHeight * 2); pDoc->SetMaxObjSize(aViewSize); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index da93cdd..77f3df7 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -380,7 +380,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) } svtools::ColorConfig aColorConfig; - Color aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor ); + Color aFillColor( aColorConfig.GetColorValue( svtools::APPBACKGROUND ).nColor ); if (comphelper::LibreOfficeKit::isActive()) aFillColor = COL_TRANSPARENT; diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 5d39817..62f55be 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -583,8 +583,8 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nWidth = pPage->GetSize().Width(); long nHeight = pPage->GetSize().Height(); - Point aPageOrg = Point(nWidth, nHeight / 2); - Size aViewSize = Size(nWidth * 3, nHeight * 2); + Point aPageOrg(nWidth, nHeight / 2); + Size aViewSize(nWidth * 3, nHeight * 2); InitWindows(aPageOrg, aViewSize, Point(-1, -1), true); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b03c12d..d77c181 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -2489,7 +2489,7 @@ void SfxWorkWindow::EndAutoShow_Impl( Point aPos ) if ( p && p->IsAutoHide() ) { Point aLocalPos = p->ScreenToOutputPixel( aPos ); - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect( aEmptyPoint, p->GetSizePixel() ); if ( !aRect.IsInside( aLocalPos ) ) p->FadeOut(); diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index a62ca78..402db40 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -1643,7 +1643,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) OUString aTitle( xRow->getString( 1 ) ); OUString aId = xContentAccess->queryContentIdentifierString(); - Content aContent = Content( aId, aCmdEnv, comphelper::getProcessComponentContext() ); + Content aContent( aId, aCmdEnv, comphelper::getProcessComponentContext() ); AddRegion( aTitle, aContent ); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 72b86ac..b15e66b 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -3041,7 +3041,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, } // build and set BaseRect (use scale) - Point aPoint = Point(); + Point aPoint; Size aSize(FRound(aScale.getX()), FRound(aScale.getY())); // fdo#47434 We need a valid rectangle here if( !aSize.Height() ) aSize.setHeight( 1 ); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index cabc114..bbd4556 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -253,7 +253,7 @@ SvxMetricField::SvxMetricField( , ePoolUnit(SFX_MAPUNIT_CM) , mxFrame(rFrame) { - Size aSize = Size(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); + Size aSize(GetTextWidth( OUString("99,99mm") ),GetTextHeight()); aSize.Width() += 20; aSize.Height() += 6; SetSizePixel( aSize ); diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx index 553719a..3cbe907 100644 --- a/sw/source/core/text/txtdrop.cxx +++ b/sw/source/core/text/txtdrop.cxx @@ -769,7 +769,7 @@ void SwDropCapCache::CalcFontSize( SwDropPortion* pDrop, SwTextFormatInfo &rInf // Get without proportion const sal_uInt8 nOldProp = rFnt.GetPropr(); rFnt.SetProportion( 100 ); - Size aOldSize = Size( 0, rFnt.GetHeight( rFnt.GetActual() ) ); + Size aOldSize( 0, rFnt.GetHeight( rFnt.GetActual() ) ); Size aNewSize( 0, ( nFactor * nCurrHeight ) / 1000 ); rFnt.SetSize( aNewSize, rFnt.GetActual() ); diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 06f82d9..281278e 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -1632,7 +1632,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfBullet(const Graphic& rGrf) { aSize = OutputDevice::LogicToLogic( aSize,rGrf.GetPrefMapMode(), aMap100mm ); } - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect( aEmptyPoint, aSize ); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *(mxGlobal->QueryPictureStream()), aUniqueId,aRect, NULL, 0 ); if (nBlibId) @@ -1722,7 +1722,7 @@ sal_Int32 SwBasicEscherEx::WriteGrfFlyFrame(const SwFrameFormat& rFormat, sal_uI aGraphic.GetPrefMapMode(), aMap100mm ); } - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect( aEmptyPoint, aSize ); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), @@ -1928,7 +1928,7 @@ void SwBasicEscherEx::WriteBrushAttr(const SvxBrushItem &rBrush, rGraphic.GetPrefMapMode(), aMap100mm); } - Point aEmptyPoint = Point(); + Point aEmptyPoint; Rectangle aRect(aEmptyPoint, aSize); sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 7a30295..b674737 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -355,8 +355,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) aViewOpt.SetSynchronize(pGridItem->GetSynchronize()); if( aViewOpt.IsGridVisible() != pGridItem->GetGridVisible() ) aViewOpt.SetGridVisible( pGridItem->GetGridVisible()); - Size aSize = Size( pGridItem->GetFieldDrawX() , - pGridItem->GetFieldDrawY() ); + Size aSize( pGridItem->GetFieldDrawX(), pGridItem->GetFieldDrawY() ); if( aViewOpt.GetSnapSize() != aSize ) aViewOpt.SetSnapSize( aSize ); short nDiv = (short)pGridItem->GetFieldDivisionX() ; diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 275ba89..c4f0319 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1136,7 +1136,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) StyleSettings aStyleSettings = rSettings.GetStyleSettings(); // Background Color - Color aBackgroundColor = Color( 0xEC, 0xEC, 0xEC ); + Color aBackgroundColor( 0xEC, 0xEC, 0xEC ); aStyleSettings.Set3DColors( aBackgroundColor ); aStyleSettings.SetFaceColor( aBackgroundColor ); Color aInactiveTabColor( aBackgroundColor ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
