vmiklos01: #i113532# Use OSL_THIS_FUNC instead of the non-portable __PRETTY_FUNCTION__

1 files changed, 16 insertions, 16 deletions

diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 0898ed10acd2..c4ad956ae71f 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -90,7 +90,7 @@ RtfSdrExport::~RtfSdrExport()
 
 void RtfSdrExport::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     EscherEx::OpenContainer( nEscherContainer, nRecInstance );
 
@@ -106,7 +106,7 @@ void RtfSdrExport::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
 
 void RtfSdrExport::CloseContainer()
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     if ( mRecTypes.back() == ESCHER_SpContainer )
     {
@@ -123,21 +123,21 @@ void RtfSdrExport::CloseContainer()
 
 UINT32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     return GenerateShapeId();
 }
 
 void RtfSdrExport::LeaveGroup()
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     /* noop */
 }
 
 void RtfSdrExport::AddShape( UINT32 nShapeType, UINT32 nShapeFlags, UINT32 /*nShapeId*/ )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     m_nShapeType = nShapeType;
     m_nShapeFlags = nShapeFlags;
@@ -175,7 +175,7 @@ inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPoi
 
 void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     if ( m_nShapeType == ESCHER_ShpInst_Nil )
         return;
@@ -342,7 +342,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                                 case 0x8000: // end
                                     break;
                                 default:
-                                    OSL_TRACE("%s: unhandled segment '%x' in the path", __PRETTY_FUNCTION__, nSeg);
+                                    OSL_TRACE("%s: unhandled segment '%x' in the path", OSL_THIS_FUNC, nSeg);
                                     break;
                             }
                         }
@@ -359,7 +359,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                             m_aShapeProps.insert(std::pair<OString,OString>(OString("pSegmentInfo"), aSegmentInfo.makeStringAndClear()));
                     }
                     else
-                        OSL_TRACE("%s: unhandled shape path, missing either pVertices or pSegmentInfo", __PRETTY_FUNCTION__);
+                        OSL_TRACE("%s: unhandled shape path, missing either pVertices or pSegmentInfo", OSL_THIS_FUNC);
                 }
                 break;
             case ESCHER_Prop_shapePath:
@@ -391,7 +391,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
                 m_aShapeProps.insert(std::pair<OString,OString>(OString("txflTextFlow"), OString::valueOf(sal_Int32(it->nPropValue))));
                 break;
             default:
-                OSL_TRACE("%s: unhandled property: %d (value: %d)", __PRETTY_FUNCTION__, nId, it->nPropValue);
+                OSL_TRACE("%s: unhandled property: %d (value: %d)", OSL_THIS_FUNC, nId, it->nPropValue);
                 break;
         }
     }
@@ -399,7 +399,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
 
 void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     // We get the position relative to (the current?) character
     m_aShapeProps.insert(std::pair<OString,OString>(OString("posrelh"), OString::valueOf(sal_Int32(3))));
@@ -427,7 +427,7 @@ void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
 
 void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     // We get the position relative to (the current?) character
     m_aShapeProps.insert(std::pair<OString,OString>(OString("posrelh"), OString::valueOf(sal_Int32(3))));
@@ -440,7 +440,7 @@ void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Re
 
 void RtfSdrExport::AddShapeAttribute( sal_Int32 /*nAttribute*/, const rtl::OString& /*rValue*/ )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     /* noop */
 }
@@ -449,7 +449,7 @@ extern const char* pShapeTypes[];
 
 sal_Int32 RtfSdrExport::StartShape()
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     if ( m_nShapeType == ESCHER_ShpInst_Nil )
         return -1;
@@ -507,7 +507,7 @@ sal_Int32 RtfSdrExport::StartShape()
 
 void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
 {
-    OSL_TRACE("%s start", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s start", OSL_THIS_FUNC);
 
     const EditTextObject& rEditObj = rParaObj.GetTextObject();
     MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX );
@@ -555,12 +555,12 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
     }
     m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_PAR).append('}');
 
-    OSL_TRACE("%s end", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s end", OSL_THIS_FUNC);
 }
 
 void RtfSdrExport::EndShape( sal_Int32 nShapeElement )
 {
-    OSL_TRACE("%s", __PRETTY_FUNCTION__);
+    OSL_TRACE("%s", OSL_THIS_FUNC);
 
     if ( nShapeElement >= 0 )
     {