[Libreoffice-commits] core.git: include/unotools oox/source sw/qa unotools/source
include/unotools/docinfohelper.hxx |3 +
oox/source/core/xmlfilterbase.cxx |5 +-
sw/qa/extras/ooxmlexport/data/tdf89790.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |7 +++
unotools/source/config/docinfohelper.cxx| 50 ++--
5 files changed, 45 insertions(+), 20 deletions(-)
New commits:
commit 480ca7434a330b2678f9ef287cffd6d9cf27bed5
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sat Apr 4 19:03:35 2015 +0300
tdf#89790 - DOCX: saving LO version number in correct tag in app.xml
Converted existing method that provides application name and version in two
functions
Change-Id: I93b70da7c78ee5db3d6eb710a2a2a9f4b7b4fb86
Reviewed-on: https://gerrit.libreoffice.org/15151
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/unotools/docinfohelper.hxx
b/include/unotools/docinfohelper.hxx
index ddc28b0..320b3b5 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -29,7 +29,8 @@ class UNOTOOLS_DLLPUBLIC DocInfoHelper
{
public:
static OUString GetGeneratorString();
-
+static OUString GetApplicationString();
+static OUString GetVersionString();
};
} // namespace utl
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 4ff011a..772142b 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -58,6 +58,7 @@
#include tools/datetime.hxx
#include com/sun/star/util/Duration.hpp
#include sax/tools/converter.hxx
+#include unotools/configmgr.hxx
using ::com::sun::star::xml::dom::DocumentBuilder;
using ::com::sun::star::xml::dom::XDocument;
@@ -692,9 +693,9 @@ writeAppProperties( XmlFilterBase rSelf, Reference
XDocumentProperties xProp
writeElement( pAppProps, XML_HyperlinksChanged, hyperlinks changed );
writeElement( pAppProps, XML_DigSig,digital signature );
#endif /* def OOXTODO */
-writeElement( pAppProps, XML_Application,
utl::DocInfoHelper::GetGeneratorString() );
+writeElement( pAppProps, XML_Application,
utl::ConfigManager::getProductName() );
+writeElement( pAppProps, XML_AppVersion,
utl::DocInfoHelper::GetVersionString() );
#ifdef OOXTODO
-writeElement( pAppProps, XML_AppVersion,app version );
writeElement( pAppProps, XML_DocSecurity, doc security );
#endif /* def OOXTODO */
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89790.docx
b/sw/qa/extras/ooxmlexport/data/tdf89790.docx
new file mode 100644
index 000..180951e
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89790.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 6964c90..89a1502 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -795,6 +795,13 @@ DECLARE_OOXMLEXPORT_TEST(testSectionHeader,
sectionprot.odt)
}
}
+DECLARE_OOXMLEXPORT_TEST(testTdf89790, tdf89790.docx)
+{
+if (xmlDocPtr pXmlDoc = parseExport(docProps/app.xml))
+
+ assertXPath(pXmlDoc,
/extended-properties:Properties/extended-properties:AppVersion);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/docinfohelper.cxx
b/unotools/source/config/docinfohelper.cxx
index b5d0cf9..0ea143cf 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -41,30 +41,45 @@ OUString DocInfoHelper::GetGeneratorString()
{
aResult.append( aValue.replace( ' ', '_' ) );
aResult.append( '/' );
+}
+
+aValue = GetVersionString();
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue );
+}
+
+return aResult.makeStringAndClear();
+}
+
+
+OUString DocInfoHelper::GetVersionString()
+{
+OUStringBuffer aResult;
-aValue = utl::ConfigManager::getProductVersion();
+// version is product_versions_product_extension$platform
+OUString aValue( utl::ConfigManager::getProductVersion() );
+if ( !aValue.isEmpty() )
+{
+aResult.append( aValue.replace( ' ', '_' ) );
+
+aValue = utl::ConfigManager::getProductExtension();
if ( !aValue.isEmpty() )
{
aResult.append( aValue.replace( ' ', '_' ) );
-
-aValue = utl::ConfigManager::getProductExtension();
-if ( !aValue.isEmpty() )
-{
-aResult.append( aValue.replace( ' ', '_' ) );
-}
}
-
-OUString os( $_OS );
-OUString arch( $_ARCH );
-::rtl::Bootstrap::expandMacros(os);
-::rtl::Bootstrap::expandMacros(arch);
-aResult.append( '$' );
-aResult.append( os );
-aResult.append( '_' );
-aResult.append( arch );
-aResult.append
[Libreoffice-commits] core.git: basctl/source basegfx/source basic/source canvas/workben chart2/source connectivity/source
basctl/source/dlged/dlgedfunc.cxx |4 -
basegfx/source/polygon/b2dpolygontools.cxx|1
basic/source/runtime/basrdll.cxx |7 +-
basic/source/runtime/ddectrl.cxx |1
basic/source/runtime/runtime.cxx |3 -
canvas/workben/canvasdemo.cxx |4 -
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx |2
chart2/source/controller/dialogs/DataBrowser.cxx | 11 ++-
chart2/source/controller/main/ChartController_Window.cxx |4 -
chart2/source/tools/ThreeDHelper.cxx |3 -
connectivity/source/drivers/file/fcomp.cxx|2
connectivity/source/drivers/jdbc/CallableStatement.cxx|4 +
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx |9 +--
connectivity/source/drivers/jdbc/JConnection.cxx | 10 ++-
connectivity/source/drivers/jdbc/JStatement.cxx |6 +-
connectivity/source/drivers/jdbc/PreparedStatement.cxx| 28
++
connectivity/source/drivers/jdbc/Timestamp.cxx| 18 --
17 files changed, 66 insertions(+), 51 deletions(-)
New commits:
commit a8e6f0bea0e8bc028ee64d0b4d9046e52de94eda
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sat Feb 14 00:31:54 2015 +0200
tdf#39440 - cppcheck cleanliness
Fixed some cppcheck defects
Change-Id: I25fd6aba9d76df98d20b9a1bb4c9d3c1bf6f84bb
Reviewed-on: https://gerrit.libreoffice.org/14487
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/basctl/source/dlged/dlgedfunc.cxx
b/basctl/source/dlged/dlgedfunc.cxx
index 7beccb6..3937b20 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -459,8 +459,6 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent
rMEvt )
if ( rMEvt.IsLeft() rMEvt.GetClicks() == 1 )
{
SdrHdl* pHdl = rView.PickHandle(aMDPos);
-SdrObject* pObj;
-SdrPageView* pPV;
// hit selected object?
if ( pHdl!=NULL || rView.IsMarkedHit(aMDPos, nHitLog) )
@@ -474,6 +472,8 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent
rMEvt )
rView.UnmarkAll();
else
{
+SdrObject* pObj;
+SdrPageView* pPV;
if( rView.PickObj( aMDPos, nHitLog, pObj, pPV ) )
{
//if (dynamic_castDlgEdForm*(pObj))
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index 03c298e..09cb226 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1088,7 +1088,6 @@ namespace basegfx
// inside parameter range edge2, too
if(fTools::more(fCut2, fZero)
fTools::less(fCut2, fOne))
{
-bFinished = true;
aRetval = CUTFLAG_LINE;
}
}
diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx
index 85fe736..a1ad75a 100644
--- a/basic/source/runtime/basrdll.cxx
+++ b/basic/source/runtime/basrdll.cxx
@@ -86,14 +86,13 @@ void BasicDLL::SetDebugMode( bool bDebugMode )
void BasicDLL::BasicBreak()
{
-// bJustStopping: if there's someone pressing STOP like crazy umpteen
times,
-// but the Basic doesn't stop early enough, the box might appear more
often...
-static bool bJustStopping = false;
-
BasicDLL* pThis = BASIC_DLL();
DBG_ASSERT( pThis, BasicDLL::EnableBreak: No instance yet! );
if ( pThis )
{
+// bJustStopping: if there's someone pressing STOP like crazy umpteen
times,
+// but the Basic doesn't stop early enough, the box might appear more
often...
+static bool bJustStopping = false;
if (StarBASIC::IsRunning() !bJustStopping
(pThis-m_xImpl-bBreakEnabled || pThis-m_xImpl-bDebugMode))
{
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 2557c9e..232008a 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -133,7 +133,6 @@ SbError SbiDdeControl::Terminate( size_t nChannel )
return SbERR_DDE_NO_CHANNEL;
}
delete pConv;
-pConv = DDE_FREECHANNEL;
return 0L;
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 4dc9979..21d1cb8 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1397,12 +1397,13 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
}
static SbxVariable* pTRUE = NULL
[Libreoffice-commits] core.git: cui/source include/svx sd/source svx/source
cui/source/tabpages/tphatch.cxx|8
include/svx/xenum.hxx |1 -
include/svx/xhatch.hxx | 12 ++--
sd/source/ui/view/drviews9.cxx |6 +++---
svx/source/sdr/primitive2d/sdrattributecreator.cxx |8
svx/source/svdraw/svdfmtf.cxx |8
svx/source/unodraw/XPropertyTable.cxx |2 +-
svx/source/xoutdev/xattr.cxx | 10 +-
svx/source/xoutdev/xtabhtch.cxx| 12 ++--
9 files changed, 33 insertions(+), 34 deletions(-)
New commits:
commit 3c77eba67b61b4f78f2c8ccec6c78622ee173b61
Author: Radu Ioan ioan.rad...@gmail.com
Date: Thu Dec 11 23:45:38 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XHatchStyle
Change-Id: I89e7edadc4f408e5a50840aaa1a13965b8503afb
Reviewed-on: https://gerrit.libreoffice.org/13442
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index a08bcbf..2f988e4 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -299,7 +299,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
else
{
pXHatch.reset(new XHatch(
m_pLbLineColor-GetSelectEntryColor(),
- (XHatchStyle)
m_pLbLineType-GetSelectEntryPos(),
+ (css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() *
10) ));
}
@@ -366,7 +366,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
}
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle) m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() * 10) );
@@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
if( !nError )
{
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle) m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() * 10) );
XHatchEntry* pEntry = new XHatchEntry( aXHatch, aName );
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
{
bLoop = false;
XHatch aXHatch( m_pLbLineColor-GetSelectEntryColor(),
-(XHatchStyle)
m_pLbLineType-GetSelectEntryPos(),
+(css::drawing::HatchStyle)
m_pLbLineType-GetSelectEntryPos(),
GetCoreValue( *m_pMtrDistance, ePoolUnit ),
static_castlong(m_pMtrAngle-GetValue() *
10) );
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index 52f7a4f..a849bc5 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XENUM_HXX
-enum XHatchStyle{ XHATCH_SINGLE, XHATCH_DOUBLE, XHATCH_TRIPLE };
enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
XFT_NONE };
enum XFormTextAdjust{ XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER };
diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 9dc725d..52010cd 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_SVX_XHATCH_HXX
#define INCLUDED_SVX_XHATCH_HXX
-#include svx/xenum.hxx
#include tools/color.hxx
#include svx/svxdllapi.h
+#include com/sun/star/drawing/HatchStyle.hpp
// class XHatch
@@ -31,24 +31,24 @@
class SVX_DLLPUBLIC XHatch
{
protected:
-XHatchStyle eStyle;
+css::drawing::HatchStyle eStyle;
Color aColor;
longnDistance;
longnAngle;
public:
-XHatch() : eStyle(XHATCH_SINGLE), nDistance(0), nAngle(0)
{}
-XHatch(const Color rCol, XHatchStyle eStyle =
XHATCH_SINGLE,
+XHatch() : eStyle(css::drawing::HatchStyle_SINGLE),
nDistance(0), nAngle(0) {}
+XHatch(const Color rCol, css::drawing::HatchStyle eStyle
= css::drawing::HatchStyle_SINGLE,
long nDistance = 20, long nAngle = 0);
bool operator==(const XHatch rHatch) const;
-voidSetHatchStyle(XHatchStyle eNewStyle) { eStyle
[Libreoffice-commits] core.git: cui/source filter/source include/svx sd/source svx/source sw/source
cui/source/inc/cuitabarea.hxx |4
cui/source/tabpages/tparea.cxx | 26 ++--
cui/source/tabpages/tpgradnt.cxx| 28 ++--
filter/source/msfilter/msdffimp.cxx |8 -
include/svx/xenum.hxx |2
include/svx/xgrad.hxx | 15 +-
sd/source/ui/view/drviews9.cxx |6 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 14 +-
svx/source/sidebar/area/AreaPropertyPanel.cxx | 68 ++--
svx/source/sidebar/area/AreaPropertyPanel.hxx |2
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 19 +--
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx |3
svx/source/svdraw/gradtrns.cxx | 28 ++--
svx/source/svdraw/svdfmtf.cxx | 24 ++--
svx/source/unodraw/XPropertyTable.cxx |2
svx/source/xoutdev/xattr.cxx| 12 +-
svx/source/xoutdev/xtabgrdt.cxx | 24 ++--
sw/source/filter/ww8/docxattributeoutput.cxx| 14 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 14 +-
19 files changed, 168 insertions(+), 145 deletions(-)
New commits:
commit c69f481d792c7b121479d024cf675f6ddb747422
Author: Radu Ioan ioan.rad...@gmail.com
Date: Fri Dec 5 20:09:01 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XGradientStyle
Reviewed on:
https://gerrit.libreoffice.org/13320
Change-Id: Iff662c05105c3a939104f658f2d0be7d8cb57995
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 20d4ed2..09ff336 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -153,7 +153,7 @@ class SvxTransparenceTabPage : public SvxTabPage
void ActivateLinear(bool bActivate);
void ActivateGradient(bool bActivate);
-void SetControlState_Impl(XGradientStyle eXGS);
+void SetControlState_Impl(css::awt::GradientStyle eXGS);
bool InitPreview ( const SfxItemSet rSet );
void InvalidatePreview (bool bEnable = true );
@@ -430,7 +430,7 @@ private:
DECL_LINK( ClickSaveHdl_Impl, void * );
long CheckChanges_Impl();
-void SetControlState_Impl( XGradientStyle eXGS );
+void SetControlState_Impl( css::awt::GradientStyle eXGS );
public:
SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet rInAttrs );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 020c0b1..f129b4a 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -139,7 +139,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl,
void *, pControl)
{
if(pControl == m_pLbTrgrGradientType || pControl == this)
{
-XGradientStyle eXGS =
(XGradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos();
+css::awt::GradientStyle eXGS =
(css::awt::GradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos();
SetControlState_Impl( eXGS );
}
@@ -149,7 +149,7 @@ IMPL_LINK(SvxTransparenceTabPage, ModifiedTrgrHdl_Impl,
void *, pControl)
XGradient aTmpGradient(
Color(nStartCol, nStartCol, nStartCol),
Color(nEndCol, nEndCol, nEndCol),
-(XGradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos(),
+
(css::awt::GradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos(),
(sal_uInt16)m_pMtrTrgrAngle-GetValue() * 10,
(sal_uInt16)m_pMtrTrgrCenterX-GetValue(),
(sal_uInt16)m_pMtrTrgrCenterY-GetValue(),
@@ -170,7 +170,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool
bActivate)
if(bActivate)
{
-XGradientStyle eXGS =
(XGradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos();
+css::awt::GradientStyle eXGS =
(css::awt::GradientStyle)m_pLbTrgrGradientType-GetSelectEntryPos();
SetControlState_Impl( eXGS );
}
}
@@ -180,12 +180,12 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage,
ChangeTrgrTypeHdl_Impl)
return( 0L );
}
-void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
+void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS)
{
switch(eXGS)
{
-case XGRAD_LINEAR:
-case XGRAD_AXIAL:
+case css::awt::GradientStyle_LINEAR:
+case css::awt::GradientStyle_AXIAL:
m_pFtTrgrCenterX-Disable();
m_pMtrTrgrCenterX-Disable();
m_pFtTrgrCenterY-Disable();
@@ -194,7 +194,7 @@ void
SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS)
m_pMtrTrgrAngle-Enable();
break;
-case XGRAD_RADIAL:
+case css::awt::GradientStyle_RADIAL:
m_pFtTrgrCenterX
[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/tpline.cxx|2 -
cui/source/tabpages/tplnedef.cxx | 14 +-
filter/source/msfilter/msdffimp.cxx |2 -
include/svx/xdash.hxx | 39 +++---
include/svx/xenum.hxx |3 --
sc/source/filter/excel/xiescher.cxx |8 +++---
sd/source/ui/animations/motionpathtag.cxx |2 -
sd/source/ui/view/drviews9.cxx|4 +--
svx/source/svdraw/svdfmtf.cxx |8 +++---
svx/source/unodraw/XPropertyTable.cxx |2 -
svx/source/xoutdev/xattr.cxx | 12 -
svx/source/xoutdev/xtabdash.cxx |6 ++--
sw/source/filter/ww8/ww8graf.cxx |2 -
13 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 09b1c24dc971323e4b9bb4bd80517e1480cc7069
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sat Nov 29 12:50:37 2014 +0200
fdo#85486 - Clean up unnecessary enumerations from xenum.hxx
Removed XDashStyle
Change-Id: Id14802a007a90508ee033e1dc964c57d3d5ef582
Reviewed-on: https://gerrit.libreoffice.org/13213
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 5bf1028..7d1fd99 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -102,7 +102,7 @@ SvxLineTabPage::SvxLineTabPage
pXPool ( static_castXOutdevItemPool*(rInAttrs.GetPool()) ),
aXLStyle( drawing::LineStyle_DASH ),
aXWidth ( 1 ),
-aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_LIGHTRED ),
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ),
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index c31c811..3b45fd90 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -65,7 +65,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
pXPool ( static_castXOutdevItemPool*(rInAttrs.GetPool()) ),
aXLStyle( drawing::LineStyle_DASH ),
aXWidth ( XOUT_WIDTH ),
-aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_BLACK ),
aXLineAttr ( pXPool ),
rXLSet ( aXLineAttr.GetItemSet() ),
@@ -209,7 +209,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxLineDefTabPage::CheckChanges_Impl()
{
// is here used to NOT lose changes
-//XDashStyle eXDS;
+//css::drawing::DashStyle eXDS;
if( m_pNumFldNumber1-IsValueChangedFromSaved() ||
m_pMtrLength1-IsValueChangedFromSaved() ||
@@ -844,12 +844,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
void SvxLineDefTabPage::FillDash_Impl()
{
-XDashStyle eXDS;
+css::drawing::DashStyle eXDS;
if( m_pCbxSynchronize-IsChecked() )
-eXDS = XDASH_RECTRELATIVE;
+eXDS = css::drawing::DashStyle_RECTRELATIVE;
else
-eXDS = XDASH_RECT;
+eXDS = css::drawing::DashStyle_RECT;
aDash.SetDashStyle( eXDS );
aDash.SetDots( (sal_uInt8) m_pNumFldNumber1-GetValue() );
@@ -868,8 +868,8 @@ void SvxLineDefTabPage::FillDash_Impl()
void SvxLineDefTabPage::FillDialog_Impl()
{
-XDashStyle eXDS = aDash.GetDashStyle(); // XDASH_RECT, XDASH_ROUND
-if( eXDS == XDASH_RECTRELATIVE )
+css::drawing::DashStyle eXDS = aDash.GetDashStyle(); //
css::drawing::DashStyle_RECT, css::drawing::DashStyle_ROUND
+if( eXDS == css::drawing::DashStyle_RECTRELATIVE )
m_pCbxSynchronize-Check();
else
m_pCbxSynchronize-Check( false );
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 22eda40..f62cc97 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -925,7 +925,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet
rSet, const MSO_SPT eSh
rSet.Put(XLineStyleItem( drawing::LineStyle_SOLID ) );
else
{
-XDashStyle eDash = XDASH_RECT;
+css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT;
sal_uInt16 nDots = 1;
sal_uInt32 nDotLen = nLineWidth / 360;
sal_uInt16 nDashes = 0;
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index 837f64a..4b0ef84 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -26,39 +26,40 @@
#include svx/xenum.hxx
#include svx/svxdllapi.h
+#include com/sun/star/drawing/DashStyle.hpp
#include vector
class SVX_DLLPUBLIC XDash
{
protected
[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/source svx/source sw/source
cui/source/tabpages/tpline.cxx| 27 +- cui/source/tabpages/tplnedef.cxx | 15 ++ cui/source/tabpages/tplneend.cxx |2 - filter/source/msfilter/msdffimp.cxx |6 ++-- filter/source/msfilter/svdfppt.cxx| 15 +- include/svx/xenum.hxx |1 include/svx/xlineit0.hxx |5 ++- sc/source/filter/excel/xiescher.cxx | 18 ++-- sd/source/core/drawdoc4.cxx | 27 +- sd/source/core/stlpool.cxx| 12 sd/source/filter/ppt/pptin.cxx|5 ++- sd/source/ui/animations/motionpathtag.cxx |2 - sd/source/ui/dlg/morphdlg.cxx |7 ++-- sd/source/ui/func/fucon3d.cxx |6 ++-- sd/source/ui/func/fuexpand.cxx|2 - sd/source/ui/func/fumorph.cxx | 13 sd/source/ui/func/fusumry.cxx |2 - sd/source/ui/view/DocumentRenderer.cxx|6 ++-- sd/source/ui/view/drviews9.cxx|7 ++-- svx/source/customshapes/EnhancedCustomShape2d.cxx | 10 +++--- svx/source/customshapes/EnhancedCustomShape3d.cxx | 12 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |2 - svx/source/dialog/dlgctl3d.cxx| 12 svx/source/dialog/dlgctrl.cxx |7 ++-- svx/source/engine3d/extrud3d.cxx |2 - svx/source/engine3d/float3d.cxx |6 ++-- svx/source/engine3d/lathe3d.cxx |2 - svx/source/engine3d/view3d.cxx|8 ++--- svx/source/engine3d/view3d1.cxx |3 +- svx/source/sdr/attribute/sdrformtextattribute.cxx |5 ++- svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx |2 - svx/source/sdr/primitive2d/sdrattributecreator.cxx|6 ++-- svx/source/sdr/properties/measureproperties.cxx |3 -- svx/source/sdr/properties/textproperties.cxx |4 +- svx/source/sidebar/line/LinePropertyPanel.cxx | 18 ++-- svx/source/svdraw/svdcrtv.cxx |6 ++-- svx/source/svdraw/svdedtv2.cxx| 10 +++--- svx/source/svdraw/svdfmtf.cxx | 26 - svx/source/svdraw/svdibrow.cxx|6 ++-- svx/source/svdraw/svdoashp.cxx|4 +- svx/source/svdraw/svdoattr.cxx|4 +- svx/source/svdraw/svdobj.cxx | 16 +- svx/source/svdraw/svdocirc.cxx|6 ++-- svx/source/svdraw/svdograf.cxx|2 - svx/source/svdraw/svdoole2.cxx|4 +- svx/source/svdraw/svdotxtr.cxx|4 +- svx/source/svdraw/svdxcgv.cxx |4 +- svx/source/tbxctrls/colrctrl.cxx |8 ++--- svx/source/tbxctrls/itemwin.cxx |8 ++--- svx/source/tbxctrls/linectrl.cxx | 13 svx/source/unodraw/UnoGraphicExporter.cxx |2 - svx/source/unodraw/unoshape.cxx |2 - svx/source/xoutdev/xattr.cxx |6 ++-- sw/source/filter/ww8/docxattributeoutput.cxx |5 ++- sw/source/filter/ww8/ww8graf.cxx |8 ++--- 55 files changed, 221 insertions(+), 203 deletions(-) New commits: commit 7528b498b634f0d96a710afc7faf20299cc5792d Author: Radu Ioan ioan.rad...@gmail.com Date: Fri Nov 21 20:48:11 2014 +0200 fdo#85486 - Clean up unnecessary enumerations from xenum.hxx Removed XLineStyle Reviewed on: https://gerrit.libreoffice.org/13029 Change-Id: I583575a04988ccf932374e411672ba14a3f3cb2f diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index ae9395d..5bf1028 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -62,6 +62,7 @@ #define MN_SYMBOLS_AUTO2 #define MN_GALLERY_ENTRY 100 +using namespace com::sun::star; // static @@ -99,7 +100,7 @@ SvxLineTabPage::SvxLineTabPage bObjSelected( false ), pXPool ( static_castXOutdevItemPool*(rInAttrs.GetPool()) ), -aXLStyle( XLINE_DASH ), +aXLStyle( drawing::LineStyle_DASH ), aXWidth ( 1 ), aXDash ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ), aXColor ( OUString(), COL_LIGHTRED ), @@ -689,12 +690,12 @@ bool SvxLineTabPage
[Libreoffice-commits] core.git: Changes to 'refs/changes/20/4620/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/20/4620/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/20/4620/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/08/1508/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/5281/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3179/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/3917/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3179/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/588/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/4128/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/39/839/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/4128/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/1602/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/08/1508/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/588/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3179/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3423/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/590/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/4128/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/4128/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3423/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3423/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/28/4128/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/79/3179/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/17/3917/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/1602/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/1602/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/7665/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/19/1519/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/22/422/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/7665/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/1291/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/5288/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/5288/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/4044/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/2651/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/4286/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/2010/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/7834/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/1518/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/22/422/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/7834/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/19/1519/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/2651/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/7834/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/25/5425/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/51/2651/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/65/7665/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/4044/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/2010/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/18/1518/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/2010/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/4044/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/23/3223/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/8'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/7'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/1986/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/70/1270/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/04/1804/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/3771/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/26/3526/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/26/3526/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/a11y/atkwrapper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 396d4f1c911770895900301f453b6d8f46243252 Author: Radu Ioan ioan.rad...@gmail.com Date: Mon Feb 3 23:52:37 2014 +0200 Related: fdo#35105 initially map HEADING to ATK_ROLE_HEADING gets overwritten anyway, but its less confusing this way Change-Id: Ib7da2b7787afa7804496337358f0ef6fc7d42b3e Reviewed-on: https://gerrit.libreoffice.org/7834 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index ba1e558..b01abcd 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -214,7 +214,7 @@ static AtkRole mapToAtkRole( sal_Int16 nRole ) ATK_ROLE_IMAGE, // GRAPHIC ATK_ROLE_UNKNOWN, // GROUP_BOX - registered below ATK_ROLE_HEADER, -ATK_ROLE_PARAGRAPH, // HEADING - registered below +ATK_ROLE_HEADING, // HEADING - registered below ATK_ROLE_TEXT,// HYPER_LINK - registered below ATK_ROLE_ICON, ATK_ROLE_INTERNAL_FRAME, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source
sc/source/core/opencl/op_math.cxx |8
sc/source/core/tool/interpr3.cxx | 22 +-
sc/source/core/tool/scmatrix.cxx |2 +-
sd/source/core/sdpage.cxx |8 +---
4 files changed, 23 insertions(+), 17 deletions(-)
New commits:
commit c634faf12886228754eb59ec9bedf6cd6f631054
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sun Jan 26 15:12:53 2014 +0200
fdo#39440 - cppcheck cleanliness
- Fixed some The scope of the variable 'x' can be reduced.
Change-Id: I6b586314b2ed201249dc52469cc4bb86b99f79d2
Reviewed-on: https://gerrit.libreoffice.org/7665
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/core/opencl/op_math.cxx
b/sc/source/core/opencl/op_math.cxx
index 1c8c717..c45981e 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -2981,11 +2981,9 @@ void
OpAverageIf::GenSlidingWindowFunction(std::stringstream ss,
unsigned paraOneIsDoubleVector = 0;
unsigned paraOneWidth = 1;
unsigned paraTwoWidth = 1;
-unsigned paraThreeWidth = 1;
unsigned loopTimes = 0;
-unsigned loopIndex = 0;
-if(vSubArguments[0]-GetFormulaToken()-GetType() ==
-formula::svDoubleVectorRef)
+
+if(vSubArguments[0]-GetFormulaToken()-GetType() ==
formula::svDoubleVectorRef)
{
paraOneIsDoubleVector = 1;
FormulaToken *tmpCur0 = vSubArguments[0]-GetFormulaToken();
@@ -3034,6 +3032,7 @@ void
OpAverageIf::GenSlidingWindowFunction(std::stringstream ss,
if(vSubArguments[paraThreeIndex]-GetFormulaToken()-GetType() ==
formula::svDoubleVectorRef)
{
+unsigned paraThreeWidth = 1;
FormulaToken *tmpCur2 =
vSubArguments[paraThreeIndex]-GetFormulaToken();
const formula::DoubleVectorRefToken*pCurDVR2= dynamic_castconst
@@ -3048,6 +3047,7 @@ void
OpAverageIf::GenSlidingWindowFunction(std::stringstream ss,
if(paraOneIsDoubleVector)
{
+unsigned loopIndex = 0;
FormulaToken *tmpCur0 = vSubArguments[0]-GetFormulaToken();
const formula::DoubleVectorRefToken*pCurDVR0= dynamic_castconst
formula::DoubleVectorRefToken *(tmpCur0);
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 2a5d770..bd02398 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2454,7 +2454,7 @@ void ScInterpreter::ScZTest()
sal_uInt8 nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 2, 3 ) )
return;
-double sigma = 0.0, mue, x;
+double sigma = 0.0, x;
if (nParamCount == 3)
{
sigma = GetDouble();
@@ -2560,7 +2560,8 @@ void ScInterpreter::ScZTest()
PushError( errDivisionByZero);
else
{
-mue = fSum/rValCount;
+double mue = fSum/rValCount;
+
if (nParamCount != 3)
{
sigma = (fSumSqr - fSum*fSum/rValCount)/(rValCount-1.0);
@@ -4138,9 +4139,7 @@ void ScInterpreter::CalculatePearsonCovar( bool
_bPearson, bool _bStexy, bool _b
double fCount = 0.0;
double fSumX= 0.0;
double fSumY= 0.0;
-double fSumDeltaXDeltaY = 0.0; // sum of (ValX-MeanX)*(ValY-MeanY)
-double fSumSqrDeltaX= 0.0; // sum of (ValX-MeanX)^2
-double fSumSqrDeltaY= 0.0; // sum of (ValY-MeanY)^2
+
for (SCSIZE i = 0; i nC1; i++)
{
for (SCSIZE j = 0; j nR1; j++)
@@ -4159,6 +4158,9 @@ void ScInterpreter::CalculatePearsonCovar( bool
_bPearson, bool _bStexy, bool _b
PushNoValue();
else
{
+double fSumDeltaXDeltaY = 0.0; // sum of (ValX-MeanX)*(ValY-MeanY)
+double fSumSqrDeltaX= 0.0; // sum of (ValX-MeanX)^2
+double fSumSqrDeltaY= 0.0; // sum of (ValY-MeanY)^2
const double fMeanX = fSumX / fCount;
const double fMeanY = fSumY / fCount;
for (SCSIZE i = 0; i nC1; i++)
@@ -4247,8 +4249,7 @@ void ScInterpreter::CalculateSlopeIntercept(bool bSlope)
double fCount = 0.0;
double fSumX= 0.0;
double fSumY= 0.0;
-double fSumDeltaXDeltaY = 0.0; // sum of (ValX-MeanX)*(ValY-MeanY)
-double fSumSqrDeltaX= 0.0; // sum of (ValX-MeanX)^2
+
for (SCSIZE i = 0; i nC1; i++)
{
for (SCSIZE j = 0; j nR1; j++)
@@ -4267,6 +4268,8 @@ void ScInterpreter::CalculateSlopeIntercept(bool bSlope)
PushNoValue();
else
{
+double fSumDeltaXDeltaY = 0.0; // sum of (ValX-MeanX)*(ValY-MeanY)
+double fSumSqrDeltaX= 0.0; // sum of (ValX-MeanX)^2
double fMeanX = fSumX / fCount;
double fMeanY = fSumY / fCount;
for (SCSIZE i = 0; i nC1; i++)
@@ -4329,8 +4332,7 @@ void ScInterpreter::ScForecast()
double fCount = 0.0;
double fSumX= 0.0;
double fSumY= 0.0;
-double
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/filectrl2.cxx |2 +- svtools/source/control/fileurlbox.cxx |2 +- svtools/source/control/fmtfield.cxx |2 +- svtools/source/control/headbar.cxx|2 +- svtools/source/control/hyperlabel.cxx |2 +- svtools/source/control/indexentryres.cxx |6 +++--- svtools/source/control/inettbc.cxx|4 ++-- svtools/source/control/roadmap.cxx|2 +- svtools/source/control/ruler.cxx |2 +- svtools/source/control/scriptedtext.cxx |2 +- svtools/source/control/scrwin.cxx |2 +- svtools/source/control/stdctrl.cxx|2 +- svtools/source/control/stdmenu.cxx|4 ++-- svtools/source/control/tabbar.cxx |6 +++--- svtools/source/control/toolbarmenu.cxx|4 ++-- svtools/source/control/toolbarmenuacc.cxx |2 +- svtools/source/control/urlcontrol.cxx |2 +- svtools/source/control/valueacc.cxx |2 +- svtools/source/control/valueset.cxx |2 +- svtools/source/dialogs/PlaceEditDialog.cxx|2 +- svtools/source/dialogs/addresstemplate.cxx| 10 +- svtools/source/dialogs/colrdlg.cxx|2 +- svtools/source/dialogs/insdlg.cxx |6 +++--- svtools/source/dialogs/prnsetup.cxx |6 +++--- svtools/source/dialogs/restartdialog.cxx |2 +- svtools/source/dialogs/roadmapwizard.cxx |8 svtools/source/dialogs/wizardmachine.cxx |8 svtools/source/dialogs/wizdlg.cxx |2 +- svtools/source/edit/editsyntaxhighlighter.cxx |4 ++-- svtools/source/edit/svmedit.cxx |2 +- svtools/source/edit/svmedit2.cxx |2 +- svtools/source/edit/textwindowpeer.cxx|2 +- svtools/source/filter/exportdialog.cxx|4 ++-- svtools/source/graphic/graphicunofactory.cxx |2 +- svtools/source/graphic/grfattr.cxx|2 +- svtools/source/graphic/grfcache.cxx |2 +- svtools/source/graphic/grfmgr.cxx |2 +- svtools/source/graphic/grfmgr2.cxx|2 +- svtools/source/graphic/provider.cxx |2 +- svtools/source/graphic/renderer.cxx |2 +- 40 files changed, 63 insertions(+), 63 deletions(-) New commits: commit 389bdc162415abff78971b1ce7c5d47482e1d37b Author: Radu Ioan ioan.rad...@gmail.com Date: Tue Aug 6 00:01:58 2013 +0300 fdo#63926 - remove extra include paths in svtools/ and sfx2/ - removed some paths from include - more of this kind will follow Change-Id: Ia5c410a5b9a7a0dfa5610dd50d82c8b23fcf43b2 Reviewed-on: https://gerrit.libreoffice.org/5288 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx index 0dcb13a..120975a 100644 --- a/svtools/source/control/filectrl2.cxx +++ b/svtools/source/control/filectrl2.cxx @@ -19,7 +19,7 @@ // this file contains code from filectrl.cxx which needs to be compiled with enabled exception hanling -#include svtools/filectrl.hxx +#include filectrl.hxx #include com/sun/star/ui/dialogs/FilePicker.hpp #include com/sun/star/ui/dialogs/TemplateDescription.hpp #include comphelper/processfactory.hxx diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 914f25d..ab9fba9 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include svtools/fileurlbox.hxx +#include fileurlbox.hxx #include osl/file.h #include svl/filenotation.hxx diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index bc6bd44..6bf9af7 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -25,7 +25,7 @@ #include unotools/localedatawrapper.hxx #include vcl/svapp.hxx #include svl/zformat.hxx -#include svtools/fmtfield.hxx +#include fmtfield.hxx #include i18nlangtag/languagetag.hxx #include com/sun/star/lang/Locale.hpp #include com/sun/star/util/SearchOptions.hpp diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 0cf0730..b4b158e 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include svtools/headbar.hxx +#include headbar.hxx #include tools/debug.hxx #include vcl/svapp.hxx diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index a67c384..4c6abc8 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0
[Libreoffice-commits] core.git: svtools/source
svtools/source/brwbox/brwbox2.cxx |4 ++-- svtools/source/brwbox/brwbox3.cxx |4 ++-- svtools/source/brwbox/brwhead.cxx |4 ++-- svtools/source/brwbox/datwin.hxx |6 +++--- svtools/source/brwbox/ebbcontrols.cxx |4 ++-- svtools/source/brwbox/editbrowsebox.cxx|6 +++--- svtools/source/brwbox/editbrowsebox2.cxx |2 +- svtools/source/config/accessibilityoptions.cxx |2 +- svtools/source/config/colorcfg.cxx |2 +- svtools/source/config/fontsubstconfig.cxx |2 +- svtools/source/config/helpopt.cxx |2 +- svtools/source/config/htmlcfg.cxx |4 ++-- svtools/source/config/itemholder2.cxx | 16 svtools/source/config/menuoptions.cxx |2 +- svtools/source/config/miscopt.cxx |4 ++-- svtools/source/config/optionsdrawinglayer.cxx |2 +- svtools/source/config/printoptions.cxx |2 +- svtools/source/config/slidesorterbaropt.cxx|2 +- svtools/source/config/toolpanelopt.cxx |4 ++-- svtools/source/contnr/DocumentInfoPreview.cxx |2 +- svtools/source/contnr/contentenumeration.cxx |4 ++-- svtools/source/contnr/fileview.cxx | 14 +++--- svtools/source/contnr/imivctl.hxx |2 +- svtools/source/contnr/imivctl1.cxx |4 ++-- svtools/source/contnr/ivctrl.cxx |2 +- svtools/source/contnr/simptabl.cxx |6 +++--- svtools/source/contnr/svimpbox.cxx | 12 ++-- svtools/source/contnr/svlbitm.cxx |8 svtools/source/contnr/svtabbx.cxx | 12 ++-- svtools/source/contnr/templwin.cxx | 20 ++-- svtools/source/contnr/templwin.hxx |4 ++-- svtools/source/contnr/treelist.cxx |6 +++--- svtools/source/contnr/treelistbox.cxx | 10 +- svtools/source/contnr/treelistentry.cxx|4 ++-- svtools/source/contnr/viewdataentry.cxx|2 +- svtools/source/control/asynclink.cxx |2 +- svtools/source/control/calendar.cxx|6 +++--- svtools/source/control/collatorres.cxx |6 +++--- svtools/source/control/ctrlbox.cxx | 12 ++-- svtools/source/control/ctrltool.cxx|6 +++--- svtools/source/control/filectrl.cxx|4 ++-- 41 files changed, 111 insertions(+), 111 deletions(-) New commits: commit 1cbdcc31b8a921c508f2fdf09847f64d004a7faa Author: Radu Ioan ioan.rad...@gmail.com Date: Mon Aug 5 00:18:29 2013 +0300 fdo#63926 - remove extra include paths in svtools/ and sfx2/ - removed some paths from include - more of this kind wil follow Change-Id: I0255d8dd338d82dfd4ac3027c34cddea493f105d Reviewed-on: https://gerrit.libreoffice.org/5281 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index a93d65b..53e6bd9 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -18,9 +18,9 @@ */ #include tools/debug.hxx -#include svtools/brwbox.hxx +#include brwbox.hxx #include datwin.hxx -#include svtools/colorcfg.hxx +#include colorcfg.hxx #include vcl/salgtype.hxx #include tools/multisel.hxx diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 7b511c0..7c93f14 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include svtools/brwbox.hxx -#include svtools/AccessibleBrowseBoxObjType.hxx +#include brwbox.hxx +#include AccessibleBrowseBoxObjType.hxx #include tools/debug.hxx #include tools/multisel.hxx #include datwin.hxx diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx index d3b7a7e..76c7acd 100644 --- a/svtools/source/brwbox/brwhead.cxx +++ b/svtools/source/brwbox/brwhead.cxx @@ -18,8 +18,8 @@ */ -#include svtools/brwhead.hxx -#include svtools/brwbox.hxx +#include brwhead.hxx +#include brwbox.hxx //=== diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index b668227..b18627a 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -20,11 +20,11 @@ #ifndef _SFXDATWIN_HXX #define _SFXDATWIN_HXX -#include svtools/brwbox.hxx -#include svtools/brwhead.hxx +#include brwbox.hxx +#include brwhead.hxx #include vcl/timer.hxx #include vcl/image.hxx -#include svtools/transfer.hxx +#include transfer.hxx #include vector //=== diff --git a/svtools/source/brwbox/ebbcontrols.cxx b
[Libreoffice-commits] core.git: canvas/source comphelper/source cppcanvas/source
canvas/source/directx/dx_bitmapcanvashelper.cxx |9 -
canvas/source/vcl/canvasbitmaphelper.cxx | 11 -
canvas/source/vcl/impltools.cxx |5
comphelper/source/container/embeddedobjectcontainer.cxx | 100 +++
cppcanvas/source/mtfrenderer/bitmapaction.cxx|4
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx |5
cppcanvas/source/mtfrenderer/implrenderer.cxx| 15 +-
cppcanvas/source/mtfrenderer/lineaction.cxx |5
cppcanvas/source/mtfrenderer/pointaction.cxx |5
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 14 --
cppcanvas/source/mtfrenderer/textaction.cxx | 52 +++
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 10 -
12 files changed, 108 insertions(+), 127 deletions(-)
New commits:
commit bd888a331b6eafbdf3225e15e47c1190bd5bd6b7
Author: Radu Ioan ioan.rad...@gmail.com
Date: Wed May 15 23:34:01 2013 +0300
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*
Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e
Reviewed-on: https://gerrit.libreoffice.org/3917
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx
b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 9772cc2..e9577e1 100644
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx
@@ -21,7 +21,6 @@
#include canvas/debug.hxx
#include tools/diagnose_ex.h
-#include rtl/logfile.hxx
#include rtl/math.hxx
#include com/sun/star/rendering/TexturingMode.hpp
@@ -159,7 +158,7 @@ namespace dxcanvas
uno::Sequence sal_Int8 BitmapCanvasHelper::getData(
rendering::IntegerBitmapLayout bitmapLayout,
const
geometry::IntegerRectangle2D rect )
{
-RTL_LOGFILE_CONTEXT( aLog, ::dxcanvas::BitmapCanvasHelper::getData()
);
+SAL_INFO( canvas.directx,
::dxcanvas::BitmapCanvasHelper::getData() );
ENSURE_OR_THROW( mpTarget,
::dxcanvas::BitmapCanvasHelper::getData():
disposed );
@@ -175,7 +174,7 @@ namespace dxcanvas
const rendering::IntegerBitmapLayout
bitmapLayout,
const geometry::IntegerRectangle2D
rect )
{
-RTL_LOGFILE_CONTEXT( aLog, ::dxcanvas::BitmapCanvasHelper::setData()
);
+SAL_INFO( canvas.directx,
::dxcanvas::BitmapCanvasHelper::setData() );
ENSURE_OR_THROW( mpTarget,
::dxcanvas::BitmapCanvasHelper::setData():
disposed );
@@ -190,7 +189,7 @@ namespace dxcanvas
const rendering::IntegerBitmapLayout
bitmapLayout,
const geometry::IntegerPoint2D
pos )
{
-RTL_LOGFILE_CONTEXT( aLog,
::dxcanvas::BitmapCanvasHelper::setPixel() );
+SAL_INFO( canvas.directx,
::dxcanvas::BitmapCanvasHelper::setPixel() );
ENSURE_OR_THROW( mpTarget,
::dxcanvas::BitmapCanvasHelper::setPixel():
disposed );
@@ -204,7 +203,7 @@ namespace dxcanvas
uno::Sequence sal_Int8 BitmapCanvasHelper::getPixel(
rendering::IntegerBitmapLayout bitmapLayout,
const
geometry::IntegerPoint2D pos )
{
-RTL_LOGFILE_CONTEXT( aLog,
::dxcanvas::BitmapCanvasHelper::getPixel() );
+SAL_INFO( canvas.directx,
::dxcanvas::BitmapCanvasHelper::getPixel() );
ENSURE_OR_THROW( mpTarget,
::dxcanvas::BitmapCanvasHelper::getPixel():
disposed );
diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx
b/canvas/source/vcl/canvasbitmaphelper.cxx
index 6a9698a..9178ff7 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -23,7 +23,6 @@
#include com/sun/star/util/Endianness.hpp
-#include rtl/logfile.hxx
#include rtl/math.hxx
#include tools/poly.hxx
@@ -112,7 +111,7 @@ namespace vclcanvas
ENSURE_OR_THROW( mpDevice,
disposed CanvasHelper );
-RTL_LOGFILE_CONTEXT( aLog,
::vclcanvas::CanvasBitmapHelper::getScaledBitmap() );
+SAL_INFO( canvas.vcl,
::vclcanvas::CanvasBitmapHelper::getScaledBitmap() );
if( !mpBackBuffer || mpDevice )
return uno::Reference rendering::XBitmap (); // we're disposed
@@ -129,7 +128,7 @@ namespace vclcanvas
uno::Sequence sal_Int8 CanvasBitmapHelper::getData(
rendering::IntegerBitmapLayout rLayout,
const
geometry::IntegerRectangle2D rect )
{
-RTL_LOGFILE_CONTEXT
[Libreoffice-commits] core.git: include/sal xmloff/source
include/sal/log-areas.dox |4 +-
xmloff/source/core/RDFaImportHelper.cxx| 33 +--
xmloff/source/core/xmlexp.cxx | 32 +++
xmloff/source/core/xmlimp.cxx | 42 +++--
xmloff/source/draw/sdxmlimp.cxx|6 +--
xmloff/source/text/txtparai.cxx| 37 ++
xmloff/source/transform/EventOASISTContext.cxx |6 +--
xmloff/source/transform/Oasis2OOo.cxx |8 ++--
8 files changed, 79 insertions(+), 89 deletions(-)
New commits:
commit ac937d8be69953abcaf1365644c6607c279f37a6
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sat May 4 01:40:09 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- replaced dbg_* with sal_*
Change-Id: I80aca85562e4a43fded5c37f9895e51f79e42c14
Reviewed-on: https://gerrit.libreoffice.org/3771
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d809e45..9257dee 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -303,9 +303,12 @@ certain functionality.
@section xmloff
@li @c xmloff.core
+@li @c xmloff.draw
@li @c xmloff.forms
@li @c xmloff.chart
@li @c xmloff.style
+@li @c xmloff.text
+@li @c xmloff.transform
@section xmlsecurity
@@ -358,7 +361,6 @@ certain functionality.
@li @c uui
@li @c vbahelper
@li @c xmlhelp
-@li @c xmloff
@li @c xmlreader
*/
diff --git a/xmloff/source/core/RDFaImportHelper.cxx
b/xmloff/source/core/RDFaImportHelper.cxx
index e377894..3ff61d1 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -191,7 +191,7 @@ RDFaReader::ReadCURIE(OUString const i_rCURIE) const
}
else
{
-OSL_ENSURE(XML_NAMESPACE_NONE != nKey, no namespace?);
+SAL_WARN_IF(XML_NAMESPACE_NONE == nKey, xmloff.core, no
namespace?);
if ((XML_NAMESPACE_UNKNOWN != nKey)
(XML_NAMESPACE_XMLNS != nKey))
{
@@ -201,12 +201,12 @@ RDFaReader::ReadCURIE(OUString const i_rCURIE) const
}
else
{
-OSL_TRACE( ReadCURIE: invalid CURIE: invalid prefix );
+SAL_INFO(xmloff.core, ReadCURIE: invalid CURIE: invalid
prefix );
return OUString();
}
}
}
-OSL_TRACE( ReadCURIE: invalid CURIE: no prefix );
+SAL_INFO(xmloff.core, ReadCURIE: invalid CURIE: no prefix );
return OUString();
}
@@ -229,7 +229,7 @@ RDFaReader::ReadCURIEs(OUString const i_rCURIEs) const
while (!CURIEs.isEmpty());
if (vec.empty())
{
-OSL_TRACE( ReadCURIEs: invalid CURIEs );
+SAL_INFO(xmloff.core, ReadCURIEs: invalid CURIEs );
}
return vec;
}
@@ -246,7 +246,7 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const
i_rURIOrSafeCURIE) const
}
else
{
-OSL_TRACE( ReadURIOrSafeCURIE: invalid SafeCURIE );
+SAL_INFO(xmloff.core, ReadURIOrSafeCURIE: invalid SafeCURIE );
return OUString();
}
}
@@ -254,7 +254,7 @@ RDFaReader::ReadURIOrSafeCURIE(OUString const
i_rURIOrSafeCURIE) const
{
if (i_rURIOrSafeCURIE.matchAsciiL(_:, 2)) // blank node
{
-OSL_TRACE( ReadURIOrSafeCURIE: invalid URI: scheme is _ );
+SAL_INFO(xmloff.core, ReadURIOrSafeCURIE: invalid URI: scheme
is _ );
return OUString();
}
else
@@ -282,7 +282,7 @@ RDFaInserter::MakeURI( OUString const i_rURI) const
{
if (i_rURI.matchAsciiL(_:, 2)) // blank node
{
-OSL_TRACE(MakeURI: cannot create URI for blank node);
+SAL_INFO(xmloff.core, MakeURI: cannot create URI for blank node);
return 0;
}
else
@@ -293,7 +293,7 @@ RDFaInserter::MakeURI( OUString const i_rURI) const
}
catch (uno::Exception )
{
-OSL_FAIL(MakeURI: cannot create URI);
+SAL_WARN(xmloff.core, MakeURI: cannot create URI);
return 0;
}
}
@@ -309,7 +309,7 @@ RDFaInserter::MakeResource( OUString const i_rResource)
// N.B.: content.xml and styles.xml are distinct graphs
OUString name( i_rResource.copy(2) );
const uno::Reference rdf::XBlankNode xBNode( LookupBlankNode(name)
);
-OSL_ENSURE(xBNode.is(), no blank node?);
+SAL_WARN_IF(!xBNode.is(), xmloff.core, no blank node?);
return uno::Referencerdf::XResource( xBNode, uno::UNO_QUERY);
}
else
@@ -334,8 +334,7 @@ public:
void RDFaInserter::InsertRDFaEntry(
struct RDFaEntry const i_rEntry)
{
-OSL_ENSURE(i_rEntry.m_xObject.is(),
-InsertRDFaEntry: invalid arg: null object);
+SAL_WARN_IF
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLImport.cxx | 22 +++--
xmloff/source/chart/SchXMLLegendContext.cxx |6 ++--
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 32 ++
xmloff/source/chart/SchXMLSeries2Context.cxx | 25 +---
xmloff/source/chart/SchXMLSeriesHelper.cxx| 19 ---
xmloff/source/chart/SchXMLTableContext.cxx| 30
xmloff/source/chart/SchXMLTools.cxx | 31 -
xmloff/source/chart/contexts.cxx | 16 +
8 files changed, 60 insertions(+), 121 deletions(-)
New commits:
commit 671b73789b2b09384e278efa0b989560b6606e4f
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sun Apr 21 18:49:52 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- replaced dbg_* with sal_*
Change-Id: I4db4a2db0f4f2e9913826f428ba129099b1ac8a8
Reviewed-on: https://gerrit.libreoffice.org/3526
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/xmloff/source/chart/SchXMLImport.cxx
b/xmloff/source/chart/SchXMLImport.cxx
index 6f758c8..91ba282 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -165,7 +165,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext(
}
else
{
-OSL_FAIL( No valid XChartDocument given as XModel );
+SAL_WARN(xmloff.chart, No valid XChartDocument given as XModel );
pContext = new SvXMLImportContext( rImport, nPrefix, rLocalName );
}
@@ -436,12 +436,7 @@ void SchXMLImportHelper::DeleteDataSeries(
}
catch( const uno::Exception ex )
{
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString( Exception caught. Type: ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString( , Message: ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+ SAL_WARN(xmloff.chart, Exception caught. Type:
OUString::createFromAscii( typeid( ex ).name()) , Message: ex.Message);
}
}
@@ -520,12 +515,7 @@ Reference chart2::XDataSeries
SchXMLImportHelper::GetNewDataSeries(
}
catch( const uno::Exception ex )
{
-(void)ex; // avoid warning for pro build
-OSL_FAIL( OUStringToOString(
-OUString( Exception caught. Type: ) +
-OUString::createFromAscii( typeid( ex ).name()) +
-OUString( , Message: ) +
-ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
+SAL_WARN(xmloff.chart, Exception caught. Type:
OUString::createFromAscii( typeid( ex ).name()) , Message: ex.Message);
}
return xResult;
}
@@ -678,12 +668,8 @@ void SAL_CALL SchXMLImport::setTargetDocument( const
uno::Reference lang::XComp
}
catch( const uno::Exception rEx )
{
-#ifdef DBG_UTIL
OString aBStr(OUStringToOString(rEx.Message,
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE(SchXMLChartContext::StartElement(): Exception caught: %s,
aBStr.getStr());
-#else
-(void)rEx; // avoid warning for pro build
-#endif
+SAL_INFO(xmloff.chart, SchXMLChartContext::StartElement():
Exception caught: aBStr);
}
}
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx
b/xmloff/source/chart/SchXMLLegendContext.cxx
index ba44bf3..73b651fb 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -105,7 +105,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
}
catch(const beans::UnknownPropertyException)
{
-OSL_TRACE( Property HasLegend not found );
+SAL_INFO(xmloff.chart, Property HasLegend not found );
}
}
@@ -113,7 +113,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
uno::Reference beans::XPropertySet xLegendProps( xLegendShape,
uno::UNO_QUERY );
if( !xLegendShape.is() || !xLegendProps.is() )
{
-OSL_TRACE( legend could not be created );
+SAL_INFO(xmloff.chart, legend could not be created );
return;
}
@@ -151,7 +151,7 @@ void SchXMLLegendContext::StartElement( const
uno::Reference xml::sax::XAttribu
}
catch(const beans::UnknownPropertyException)
{
-OSL_TRACE( Property Alignment (legend) not found );
+SAL_INFO(xmloff.chart, Property Alignment (legend)
not found );
}
}
break;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLAxisContext.cxx | 16 +--
xmloff/source/chart/SchXMLChartContext.cxx | 31 +++--
xmloff/source/chart/SchXMLExport.cxx | 151 +
3 files changed, 71 insertions(+), 127 deletions(-)
New commits:
commit d461088eb4dd3b3bf7c2caaab082890ebcf80fea
Author: Radu Ioan ioan.rad...@gmail.com
Date: Tue Apr 16 23:28:16 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- replaced dbg_* with sal_*
Change-Id: Ie5d3ae7d2c5dbaaed30d0b39740748845c9f1641
Reviewed-on: https://gerrit.libreoffice.org/3423
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx
b/xmloff/source/chart/SchXMLAxisContext.cxx
index b14618f..1a83c20 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -180,7 +180,7 @@ Reference drawing::XShape
SchXMLAxisContext::getTitleShape()
aPropName = HasZAxisTitle;
break;
case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
break;
}
xDiaProp-setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -217,7 +217,7 @@ void SchXMLAxisContext::CreateGrid( OUString
sAutoStyleName, bool bIsMajor )
aPropName = HasZAxisHelpGrid;
break;
case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
break;
}
xDiaProp-setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -364,7 +364,7 @@ Reference chart2::XAxis lcl_getAxis( const Reference
frame::XModel xChart
}
catch( uno::Exception )
{
-OSL_TRACE( Couldn't get axis );
+SAL_INFO(xmloff.chart, Couldn't get axis );
}
return xAxis;
@@ -423,7 +423,7 @@ void SchXMLAxisContext::CreateAxis()
aPropName = HasSecondaryXAxis;
break;
case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( Invalid axis );
+SAL_INFO(xmloff.chart, Invalid axis );
break;
}
try
@@ -432,7 +432,7 @@ void SchXMLAxisContext::CreateAxis()
}
catch( beans::UnknownPropertyException )
{
-OSL_TRACE( Couldn't turn on axis );
+SAL_INFO(xmloff.chart, Couldn't turn on axis );
}
if( m_aCurrentAxis.eDimension==SCH_XML_AXIS_Z )
{
@@ -443,7 +443,7 @@ void SchXMLAxisContext::CreateAxis()
}
catch( beans::UnknownPropertyException )
{
-OSL_TRACE( Couldn't turn on z axis );
+SAL_INFO(xmloff.chart, Couldn't turn on z axis );
}
if( !bSettingZAxisSuccedded )
return;
@@ -460,7 +460,7 @@ void SchXMLAxisContext::CreateAxis()
}
catch( beans::UnknownPropertyException )
{
-OSL_TRACE( Couldn't turn on x axis );
+SAL_INFO(xmloff.chart, Couldn't turn on x axis );
}
}
@@ -602,7 +602,7 @@ void SchXMLAxisContext::SetAxisTitle()
}
catch( beans::UnknownPropertyException )
{
-OSL_TRACE( Property String for Title not available );
+SAL_INFO(xmloff.chart, Property String for Title not available
);
}
}
}
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx
b/xmloff/source/chart/SchXMLChartContext.cxx
index 034a2f6..5aeb93b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -57,6 +57,7 @@
#include com/sun/star/chart2/XChartTypeContainer.hpp
#include com/sun/star/chart2/XTitled.hpp
+
using namespace com::sun::star;
using namespace ::xmloff::token;
using com::sun::star::uno::Reference;
@@ -104,7 +105,7 @@ void lcl_MoveDataToCandleStickSeries(
}
catch(const uno::Exception)
{
-OSL_FAIL( Exception caught while moving data to candlestick series );
+SAL_WARN(xmloff.chart, Exception caught while moving data to
candlestick series );
}
}
@@ -163,7 +164,7 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference
chart2::XChartDocumen
catch(const uno::Exception ex)
{
OString aBStr(OUStringToOString(ex.Message,
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE( Exception caught while removing empty chart types: %s,
aBStr.getStr());
+SAL_INFO(xmloff.chart, Exception caught while removing empty chart
types: aBStr);
}
}
@@ -246,7 +247,7 @@ void SchXMLChartContext::StartElement( const
uno::Reference xml::sax::XAttribut
const SvXMLTokenMap rAttrTokenMap = mrImportHelper.GetChartAttrTokenMap();
uno::Reference embed::XVisualObject xVisualObject(
mrImportHelper.GetChartDocument(), uno::UNO_QUERY);
-DBG_ASSERT(xVisualObject.is(),need xVisualObject for page size);
+SAL_WARN_IF(!xVisualObject.is
[Libreoffice-commits] core.git: sal/inc xmlscript/source
sal/inc/sal/log-areas.dox |8 ++
xmlscript/source/xml_helper/xml_impctx.cxx | 29 -
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx| 61 ++---
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 +-
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx|8 +-
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 14 +---
xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 23 ++-
xmlscript/source/xmllib_imexp/xmllib_import.cxx|4 -
xmlscript/source/xmlmod_imexp/xmlmod_import.cxx|4 -
9 files changed, 75 insertions(+), 84 deletions(-)
New commits:
commit b20e7e1d11c8765116c415d7dabd3602d88d1103
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sun Apr 7 16:47:26 2013 +0300
fdo#43157 - Clean up OSL_ASSERT
- replaced osl_trace with sal_info
- added new log areas to log-area.dox
Change-Id: I41444e90a22bad7d04d3827914d4d793b3601304
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 6466c6e..98adef8 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -302,6 +302,14 @@ certain functionality.
@li @c xmlsecurity.helper
@li @c xmlsecurity.xmlsec - xmlsec wrapper
+@section xmlscript
+
+@li @c xmlscript.xmlhelper
+@li @c xmlscript.xmldlg
+@li @c xmlscript.xmlflat
+@li @c xmlscript.xmllib
+@li @c xmlscript.xmlmod
+
@section dbaccess
@li @c dbaccess
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx
b/xmlscript/source/xml_helper/xml_impctx.cxx
index 9189e53..11906bb 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -263,7 +263,7 @@ inline sal_Int32 DocumentHandlerImpl::getUidByPrefix(
if (iFind != m_prefixes.end())
{
const PrefixEntry rPrefixEntry = *iFind-second;
-OSL_ASSERT( ! rPrefixEntry.m_Uids.empty() );
+SAL_WARN_IF( rPrefixEntry.m_Uids.empty(), xmlscript.xmlhelper,
rPrefixEntry.m_Uids is empty );
m_nLastPrefix_lookup = rPrefixEntry.m_Uids.back();
m_aLastPrefix_lookup = rPrefix;
}
@@ -294,7 +294,7 @@ inline void DocumentHandlerImpl::pushPrefix(
else
{
PrefixEntry * pEntry = iFind-second;
-OSL_ASSERT( ! pEntry-m_Uids.empty() );
+SAL_WARN_IF( pEntry-m_Uids.empty(), xmlscript.xmlhelper,
pEntry-m_Uids is empty );
pEntry-m_Uids.push_back( nUid );
}
@@ -481,7 +481,7 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const
Uri )
throw (RuntimeException)
{
sal_Int32 uid = getUidByURI( Uri );
-OSL_ASSERT( uid != UID_UNKNOWN );
+SAL_WARN_IF( uid == UID_UNKNOWN, xmlscript.xmlhelper, uid UNKNOWN);
return uid;
}
@@ -538,8 +538,7 @@ void DocumentHandlerImpl::startElement(
#if OSL_DEBUG_LEVEL 1
OString aQName(
OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
-OSL_TRACE( ### no context given on createChildElement()
- = ignoring element \%s\ ..., aQName.getStr() );
+SAL_INFO(xmlscript.xmlhelper, ### no context given on
createChildElement() = ignoring element \ aQName.getStr() \ ...);
#endif
return;
}
@@ -595,9 +594,7 @@ void DocumentHandlerImpl::startElement(
if (pUids[ nPos ] = 0) // no xmlns: attribute
{
OUString const rQAttributeName = pQNames[ nPos ];
-OSL_ENSURE(
-!rQAttributeName.startsWith( xmlns: ),
-### unexpected xmlns! );
+SAL_WARN_IF(rQAttributeName.startsWith( xmlns: ),
xmlscript.xmlhelper, ### unexpected xmlns! );
// collect attribute's uid and current prefix
sal_Int32 nColonPos = rQAttributeName.indexOf( (sal_Unicode) ':' );
@@ -651,9 +648,7 @@ void DocumentHandlerImpl::startElement(
#if OSL_DEBUG_LEVEL 1
OString aQName(
OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
-OSL_TRACE(
-### no context given on createChildElement() =
-ignoring element \%s\ ..., aQName.getStr() );
+SAL_INFO(xmlscript.xmlhelper, ### no context given on
createChildElement() = ignoring element \ aQName.getStr() \ ...);
#endif
}
}
@@ -673,14 +668,14 @@ void DocumentHandlerImpl::endElement(
#if OSL_DEBUG_LEVEL 1
OString aQName(
OUStringToOString( rQElementName, RTL_TEXTENCODING_ASCII_US ) );
-OSL_TRACE( ### received endElement() for \%s\., aQName.getStr() );
+SAL_INFO(xmlscript.xmlhelper, ### received endElement() for \
aQName.getStr() \.);
#endif
static_castvoid(rQElementName);
return;
}
// popping context
-OSL_ASSERT( ! m_elements.empty() );
+SAL_WARN_IF( m_elements.empty(), xmlscript.xmlhelper, m_elements is
empty );
ElementEntry * pEntry = m_elements.back();
xCurrentElement = pEntry
[Libreoffice-commits] core.git: sal/inc vbahelper/source
sal/inc/sal/log-areas.dox |1 +
vbahelper/source/msforms/service.cxx|4 ++--
vbahelper/source/msforms/vbacombobox.cxx|4 ++--
vbahelper/source/msforms/vbatogglebutton.cxx|8
vbahelper/source/msforms/vbauserform.cxx|8
vbahelper/source/vbahelper/vbacommandbar.cxx|2 +-
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx |2 +-
vbahelper/source/vbahelper/vbacommandbarhelper.cxx |2 +-
vbahelper/source/vbahelper/vbadocumentbase.cxx |2 +-
vbahelper/source/vbahelper/vbaeventshelperbase.cxx |6 +++---
vbahelper/source/vbahelper/vbahelper.cxx| 10 --
vbahelper/source/vbahelper/vbashape.cxx |2 +-
12 files changed, 25 insertions(+), 26 deletions(-)
New commits:
commit 16d142443395b888c909fa92570e1a47833da3ff
Author: Radu Ioan ioan.rad...@gmail.com
Date: Wed Apr 3 00:04:46 2013 +0300
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- added new log areas to log-area.dox
Change-Id: I20f539bd9fa62bef2e9a2a82b59e0b15f4efdd48
Reviewed-on: https://gerrit.libreoffice.org/3179
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index c36c742..b14cb46 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -334,6 +334,7 @@ certain functionality.
@li @c ucbhelper
@li @c unoidl
@li @c uui
+@li @c vbahelper
@li @c xmlhelp
@li @c xmloff
@li @c xmlreader
diff --git a/vbahelper/source/msforms/service.cxx
b/vbahelper/source/msforms/service.cxx
index 9bc7953..5a9120f 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -46,10 +46,10 @@ extern C
const sal_Char * pImplName, lang::XMultiServiceFactory *
pServiceManager,
registry::XRegistryKey * pRegistryKey )
{
-OSL_TRACE(In component_getFactory for %s, pImplName );
+SAL_INFO(vbahelper, In component_getFactory for pImplName );
void* pRet = component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey,
controlprovider::serviceDecl, userform::serviceDecl );
-OSL_TRACE(Ret is 0x%x, pRet);
+SAL_INFO(vbahelper, Ret is 0x std::hex pRet);
return pRet;
}
}
diff --git a/vbahelper/source/msforms/vbacombobox.cxx
b/vbahelper/source/msforms/vbacombobox.cxx
index b78dea3..63856e5 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -104,13 +104,13 @@ ScVbaComboBox::getListIndex() throw
(uno::RuntimeException)
{
if ( sItems[ index ].equals( sText ) )
{
-OSL_TRACE(getListIndex returning %d, index );
+SAL_INFO(vbahelper, getListIndex returning index );
return uno::makeAny( index );
}
}
}
-OSL_TRACE(getListIndex returning %d, -1 );
+SAL_INFO(vbahelper, getListIndex returning -1 );
return uno::makeAny( sal_Int32( -1 ) );
}
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx
b/vbahelper/source/msforms/vbatogglebutton.cxx
index 6bf65c1..93073bc 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -29,13 +29,13 @@ const static OUString TOGGLE( Toggle );
const static OUString STATE( State );
ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference
ov::XHelperInterface xParent, const uno::Reference uno::XComponentContext
xContext, const uno::Reference uno::XInterface xControl, const
uno::Reference frame::XModel xModel, ov::AbstractGeometryAttributes*
pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel,
pGeomHelper )
{
-OSL_TRACE(ScVbaToggleButton(ctor));
+SAL_INFO(vbahelper, ScVbaToggleButton(ctor));
m_xProps-setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
}
ScVbaToggleButton::~ScVbaToggleButton()
{
-OSL_TRACE(~ScVbaToggleButton(dtor));
+SAL_INFO(vbahelper, ~ScVbaToggleButton(dtor));
}
// Attributes
@@ -67,9 +67,9 @@ ScVbaToggleButton::setValue( const uno::Any _value ) throw
(uno::RuntimeExcepti
{
sal_Int16 nState = 0;
_value = nState;
-OSL_TRACE( nState - %d, nState );
+SAL_INFO(vbahelper, nState - nState );
nState = ( nState == -1 ) ? 1 : 0;
-OSL_TRACE( nState - %d, nState );
+SAL_INFO(vbahelper, nState - nState );
m_xProps-setPropertyValue( STATE, uno::makeAny( nState ) );
}
diff --git a/vbahelper/source/msforms/vbauserform.cxx
b/vbahelper/source/msforms/vbauserform.cxx
index 988e837..e2a7652 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -59,7 +59,7 @@ ScVbaUserForm::~ScVbaUserForm()
void SAL_CALL
ScVbaUserForm::Show( ) throw (uno::RuntimeException
[Libreoffice-commits] core.git: oox/source sw/source
oox/source/ppt/animationspersist.cxx | 12 ++---
oox/source/ppt/commonbehaviorcontext.cxx |7 ---
oox/source/ppt/pptshape.cxx | 25 +--
sw/source/filter/ww8/ww8toolbar.cxx | 66 +++
4 files changed, 53 insertions(+), 57 deletions(-)
New commits:
commit a3d299e15526fdcbcaae269e33a83a9c0b187a5a
Author: Radu Ioan ioan.rad...@gmail.com
Date: Sun Mar 10 23:05:25 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced OSL_TRACE with SAL_INFO
- replaced OSL_ENSURE with SAL_WARN_IF
Change-Id: Ie30fbc9c720d8b93d6093e2c95f61dceea8aae2f
Reviewed-on: https://gerrit.libreoffice.org/2651
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/oox/source/ppt/animationspersist.cxx
b/oox/source/ppt/animationspersist.cxx
index 74a9208..d905c0e 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -60,12 +60,12 @@ namespace oox { namespace ppt {
{
case XML_charRg:
// TODO calculate the corresponding paragraph for the text
range
-OSL_TRACE( OOX: TODO calculate the corresponding
paragraph for the text range... );
+SAL_INFO(oox.ppt, OOX: TODO calculate the corresponding
paragraph for the text range... );
break;
case XML_pRg:
aParaTarget.Paragraph = static_cast sal_Int16 (
maRange.start );
// TODO what to do with more than one.
-OSL_TRACE( OOX: TODO what to do with more than one );
+SAL_INFO(oox.ppt, OOX: TODO what to do with more than
one );
break;
}
rTarget = makeAny( aParaTarget );
@@ -86,11 +86,11 @@ namespace oox { namespace ppt {
{
case XML_inkTgt:
// TODO
-OSL_TRACE( OOX: TODO inkTgt );
+SAL_INFO(oox.ppt, OOX: TODO inkTgt );
break;
case XML_sldTgt:
// TODO
-OSL_TRACE( OOX: TODO sldTgt );
+SAL_INFO(oox.ppt, OOX: TODO sldTgt );
break;
case XML_sndTgt:
aTarget = makeAny(msValue);
@@ -99,11 +99,11 @@ namespace oox { namespace ppt {
{
Any rTarget;
::oox::drawingml::ShapePtr pShape = pSlide-getShape(msValue);
-OSL_ENSURE( pShape, failed to locate Shape);
+SAL_WARN_IF( !pShape, oox.ppt, failed to locate Shape);
if( pShape )
{
Reference XShape xShape( pShape-getXShape() );
-OSL_ENSURE( xShape.is(), fail to get XShape from shape );
+SAL_WARN_IF( !xShape.is(), oox.ppt, fail to get XShape from
shape );
if( xShape.is() )
{
rTarget = xShape;
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx
b/oox/source/ppt/commonbehaviorcontext.cxx
index 14c6c6b..ffaeef5 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -19,7 +19,6 @@
#include comphelper/anytostring.hxx
#include cppuhelper/exc_hlp.hxx
-#include osl/diagnose.h
#include rtl/ustrbuf.hxx
#include com/sun/star/animations/XTimeContainer.hpp
@@ -98,9 +97,7 @@ namespace oox { namespace ppt {
RTL_TEXTENCODING_ASCII_US );
attr.type = attrConv-meAttribute;
maAttributes.push_back( attr );
-OSL_TRACE( OOX: attrName is %s - %s,
- OUSTRING_TO_CSTR( msCurrentAttribute ),
- attrConv-mpAPIName );
+SAL_INFO(oox.ppt, OOX: attrName is
OUSTRING_TO_CSTR( msCurrentAttribute ) - attrConv-mpAPIName );
break;
}
attrConv++;
@@ -143,7 +140,7 @@ namespace oox { namespace ppt {
}
else
{
-OSL_TRACE( OOX: Attribute Name outside an Attribute List );
+SAL_INFO(oox.ppt, OOX: Attribute Name outside an Attribute
List );
}
return this;
}
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 6da39d3..6bf6498 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -84,7 +84,7 @@ oox::drawingml::TextListStylePtr
PPTShape::getSubTypeTextListStyle( const SlideP
{
oox::drawingml::TextListStylePtr pTextListStyle;
-OSL_TRACE( subtype style: %s, lclDebugSubType( nSubType ) );
+SAL_INFO(oox.ppt, subtype style: lclDebugSubType( nSubType ) );
switch( nSubType )
{
@@ -116,7 +116,7 @@ void PPTShape::addShape(
const awt::Rectangle* pShapeRect
[Libreoffice-commits] core.git: extensions/source sal/inc sal/osl sax/qa scripting/source sdext/source stoc/source tools/source xmlsecurity/source
extensions/source/update/check/updateprotocoltest.cxx |9 +-
sal/inc/sal/log-areas.dox |8 ++
sal/osl/all/loadmodulerelative.cxx| 10 +--
sax/qa/cppunit/test_converter.cxx | 60 +++---
scripting/source/provider/ScriptImpl.cxx |7 +-
sdext/source/pdfimport/pdfiadaptor.cxx| 26 +++
stoc/source/corereflection/lrucache.hxx | 21 +++---
stoc/source/tdmanager/lrucache.hxx| 21 +++---
tools/source/memtools/mempool.cxx |6 -
xmlsecurity/source/helper/xsecverify.cxx | 25 +++
10 files changed, 95 insertions(+), 98 deletions(-)
New commits:
commit ef1d096ddc311a2fd821d4076421c4a8f8d63abf
Author: Radu Ioan ioan.rad...@gmail.com
Date: Wed Feb 6 00:10:23 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced osl_trace with sal_info
- added new log areas to log-area.dox
Change-Id: Ib47c4b4c9604bca1f8a635dd01bb89702b47b591
Reviewed-on: https://gerrit.libreoffice.org/2010
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
diff --git a/extensions/source/update/check/updateprotocoltest.cxx
b/extensions/source/update/check/updateprotocoltest.cxx
index e88367c..fa82e9e 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -26,6 +26,7 @@
#include sal/main.h
#include osl/process.h
#include stdio.h
+#include sal/log.hxx
namespace task = ::com::sun::star::task;
namespace uno = ::com::sun::star::uno;
@@ -58,18 +59,16 @@ SAL_IMPLEMENT_MAIN()
{
if( checkForUpdates(rComponentContext, uno::Reference
task::XInteractionHandler (), aURL, aVersion) )
{
-OSL_TRACE( Update found: %s on %s,
-rtl::OUStringToOString( aVersion,
RTL_TEXTENCODING_UTF8).getStr(),
-rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(extensions.update, Update found: aVersion on
aURL);
}
else
{
-OSL_TRACE( no updates found );
+SAL_INFO(extensions.update, no updates found );
}
}
catch( ... )
{
-OSL_TRACE( unhandled exception caught );
+SAL_INFO(extensions.update, unhandled exception caught );
}
return 0;
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index e1422ca..378dcf5c 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -33,6 +33,7 @@ certain functionality.
@li @c canvas
@li @c canvas.cairo
+@li @c canvas.null
@section connectivity
@@ -65,6 +66,7 @@ certain functionality.
@li @c sd.fwk
@li @c sd.sls
@li @c sd.tools
+@li @c sd.ui
@li @c sd.view
@li @c sd.slideshow
@li @c sdremote
@@ -165,6 +167,7 @@ certain functionality.
@section tools
@li @c tools.debug
+@li @c tools.memtools
@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
@@ -183,6 +186,10 @@ certain functionality.
@li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
@li @c salhelper.thread - ::salhelper::Thread class
+@section stoc
+
+@li @c stoc.corerefl
+@li @c stoc.tdmanager
@section VCL
@@ -220,6 +227,7 @@ certain functionality.
@section xmlsecurity
@li @c xmlsecurity.dialogs - xml security dialogs
+@li @c xmlsecurity.helper
@li @c xmlsecurity.xmlsec - xmlsec wrapper
@section other
diff --git a/sal/osl/all/loadmodulerelative.cxx
b/sal/osl/all/loadmodulerelative.cxx
index 0a91169..98cf137 100644
--- a/sal/osl/all/loadmodulerelative.cxx
+++ b/sal/osl/all/loadmodulerelative.cxx
@@ -22,7 +22,7 @@
#include cstddef
-#include osl/diagnose.h
+#include sal/log.hxx
#include osl/module.h
#include osl/module.hxx
#include osl/thread.h
@@ -42,7 +42,7 @@ oslModule SAL_CALL osl_loadModuleRelative(
{
::rtl::OUString base;
if (!::osl::Module::getUrlFromAddress(baseModule, base)) {
-OSL_TRACE(osl::Module::getUrlFromAddress failed);
+SAL_INFO(sal.osl,osl::Module::getUrlFromAddress failed);
return NULL;
}
::rtl::OUString abs;
@@ -50,10 +50,8 @@ oslModule SAL_CALL osl_loadModuleRelative(
abs = ::rtl::Uri::convertRelToAbs(base, relativePath);
} catch (const ::rtl::MalformedUriException e) {
(void) e; // avoid warnings
-OSL_TRACE(
-rtl::MalformedUriException %s,
-rtl::OUStringToOString(e.getMessage(),
osl_getThreadTextEncoding()).
-getStr());
+SAL_INFO(sal.osl,
+rtl::MalformedUriException e.getMessage() );
//TODO: let some OSL_TRACE variant take care of text conversion?
return NULL;
}
diff --git a/sax/qa/cppunit/test_converter.cxx
b/sax/qa/cppunit/test_converter.cxx
index 26627f8..7860092 100644
--- a/sax/qa/cppunit
[Libreoffice-commits] core.git: canvas/source oox/source sd/source
canvas/source/null/null_usagecounter.hxx | 12 --
oox/source/ppt/timenode.cxx | 56 +--
sd/source/ui/framework/configuration/ConfigurationTracer.cxx |9 -
3 files changed, 36 insertions(+), 41 deletions(-)
New commits:
commit f4f727f7bfc848deb82e4df4c6e3b9affaf5f613
Author: Radu Ioan ioan.rad...@gmail.com
Date: Tue Feb 5 00:18:15 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- changed osl_trace with sal_info
Change-Id: I6504abf50f6193db52d101ec856bcaf1ee2a982c
diff --git a/canvas/source/null/null_usagecounter.hxx
b/canvas/source/null/null_usagecounter.hxx
index 5a3260e..482f220 100644
--- a/canvas/source/null/null_usagecounter.hxx
+++ b/canvas/source/null/null_usagecounter.hxx
@@ -22,6 +22,7 @@
#include osl/interlck.h
#include boost/current_function.hpp
+#include sal/log.hxx
namespace nullcanvas
{
@@ -36,9 +37,7 @@ namespace nullcanvas
public:
UsageCounter()
{
-OSL_TRACE( %s, %d objects currently in use.\n,
- BOOST_CURRENT_FUNCTION,
- osl_atomic_increment( s_nCount ) );
+SAL_INFO(canvas.null, BOOST_CURRENT_FUNCTION ,
osl_atomic_increment( s_nCount ) objects currently in use.\n);
}
~UsageCounter()
@@ -47,14 +46,11 @@ namespace nullcanvas
if( !nCount )
{
-OSL_TRACE( %s, last instance deleted.\n,
- BOOST_CURRENT_FUNCTION );
+SAL_INFO(canvas.null, BOOST_CURRENT_FUNCTION ,
last instance deleted.\n);
}
else
{
-OSL_TRACE( %s, %d instances left.\n,
- BOOST_CURRENT_FUNCTION,
- nCount );
+SAL_INFO(canvas.null, BOOST_CURRENT_FUNCTION ,
nCount instances left.\n);
}
}
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index eb0f55b..cd3cd64 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -40,6 +40,7 @@
#include oox/helper/helper.hxx
#include oox/core/xmlfilterbase.hxx
+#include sal/log.hxx
using namespace ::oox::core;
using namespace ::com::sun::star::beans;
@@ -88,7 +89,7 @@ namespace oox { namespace ppt {
sServiceName = com.sun.star.animations.Audio;
break;
default:
-OSL_TRACE( OOX: uhandled type %x, nNodeType );
+SAL_INFO(oox.ppt,OOX: uhandled type nNodeType );
break;
}
return sServiceName;
@@ -170,7 +171,7 @@ namespace oox { namespace ppt {
catch( Exception e )
{
(void)e;
-OSL_TRACE(fixMainSequenceTiming(), exception caught! );
+SAL_INFO(oox.ppt,fixMainSequenceTiming(), exception caught! );
}
}
@@ -196,7 +197,7 @@ namespace oox { namespace ppt {
catch( Exception e )
{
(void)e;
-OSL_TRACE(fixInteractiveSequenceTiming(), exception caught! );
+SAL_INFO(oox.ppt,fixInteractiveSequenceTiming(), exception
caught! );
}
}
@@ -211,14 +212,14 @@ namespace oox { namespace ppt {
}
catch( const Exception e )
{
-OSL_TRACE( OOX: exception raised in TimeNode::addNode() - %s,
+SAL_INFO(oox.ppt,OOX: exception raised in TimeNode::addNode() -
OUStringToOString( e.Message,
RTL_TEXTENCODING_ASCII_US ).getStr() );
}
}
void TimeNode::setNode( const XmlFilterBase rFilter, const Reference
XAnimationNode xNode, const SlidePersistPtr pSlide )
{
-OSL_ENSURE( xNode.is(), null node passed );
+SAL_WARN_IF( !xNode.is(), oox.ppt, null node passed );
try {
if( !msId.isEmpty() )
@@ -331,7 +332,7 @@ namespace oox { namespace ppt {
xAnimate-setSubItem( nInt16 );
else
{
-OSL_TRACE( any = failed %d, __LINE__ );
+SAL_INFO(oox.ppt,any = failed
__LINE__ );
}
}
break;
@@ -342,7 +343,7 @@ namespace oox { namespace ppt {
xAnimate-setAttributeName( sString );
else
{
-OSL_TRACE( any = failed %d, __LINE__ );
+SAL_INFO(oox.ppt,any = failed
__LINE__ );
}
}
break;
@@ -353,7 +354,7 @@ namespace oox { namespace ppt {
xAnimate-setCalcMode( nInt16 );
else
[Libreoffice-commits] .: fpicker/source sal/inc
fpicker/source/aqua/CFStringUtilities.hxx | 54 +++---
fpicker/source/aqua/CFStringUtilities.mm | 10 +-
fpicker/source/aqua/ControlHelper.mm | 112 +++---
fpicker/source/aqua/NSURL_OOoAdditions.mm |7 +
sal/inc/sal/log-areas.dox |1
5 files changed, 93 insertions(+), 91 deletions(-)
New commits:
commit f9aabc714af41d7c3dd5cd08b6dc0761db904c4d
Author: Radu Ioan ioan.rad...@gmail.com
Date: Mon Jan 21 23:51:56 2013 +0200
fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT
- replaced OSL_TRACE with SAL_INFO
Change-Id: I4d63df493e85bc095b8a11e3842b0d69c5217c96
Reviewed-on: https://gerrit.libreoffice.org/1804
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/fpicker/source/aqua/CFStringUtilities.hxx
b/fpicker/source/aqua/CFStringUtilities.hxx
index 9845e92..655312e 100644
--- a/fpicker/source/aqua/CFStringUtilities.hxx
+++ b/fpicker/source/aqua/CFStringUtilities.hxx
@@ -26,7 +26,7 @@
#include postmac.h
#include rtl/ustring.hxx
#include sal/types.h
-#include osl/diagnose.h
+#include sal/log.hxx
enum InfoType {
FULLPATH,
@@ -43,71 +43,71 @@ CFStringRef CFStringCreateWithOUString(const OUString
aString);
#define PARAMFILLER \n
inline void DBG_PRINT_ENTRY() {
-OSL_TRACE( %s, __func__);
+SAL_INFO(fpicker.aqua, __func__);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname) {
-OSL_TRACE( %s::%s, classname, methodname);
+SAL_INFO(fpicker.aqua, classname :: methodname);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1) {
-OSL_TRACE( %s::%s%s%s = %s, classname, methodname, PARAMFILLER,
param1, value1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const OUString value1) {
-OSL_TRACE( %s::%s%s%s = %s, classname, methodname, PARAMFILLER,
param1, OUStringToOString(value1, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = OUStringToOString(value1,
RTL_TEXTENCODING_UTF8).getStr());
}
#if OSL_DEBUG_LEVEL 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef value1)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
CFShow(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const CFStringRef /* value1 */)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
}
#endif
#if OSL_DEBUG_LEVEL 1
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* value1)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
NSLog(value1);
}
#else
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const NSString* /* value1 */)
{
-OSL_TRACE( %s::%s%s%s =, classname, methodname, PARAMFILLER, param1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 =);
}
#endif
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1) {
-OSL_TRACE( %s::%s%s%s = %d, classname, methodname, PARAMFILLER,
param1, value1);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1, const char* param2, const int value2) {
-OSL_TRACE( %s::%s%s%s = %s%s%s = %d, classname, methodname,
PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1 PARAMFILLER param2 =
value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const char* value1, const char* param2, const char* value2)
{
-OSL_TRACE( %s::%s%s%s = %s%s%s = %s, classname, methodname,
PARAMFILLER, param1, value1, PARAMFILLER, param2, value2);
+SAL_INFO(fpicker.aqua, classname :: methodname
PARAMFILLER param1 = value1 PARAMFILLER param2 =
value2);
}
inline void DBG_PRINT_ENTRY(const char * classname, const char * methodname,
const char* param1, const int value1, const char* param2, const int value2) {
-OSL_TRACE( %s::%s%s%s = %d%s%s = %d, classname, methodname
