Now debugging code is conditionally compiled and JavaScript debug log are turned off.

filter/source/svg/presentation_engine.js

@@ -341,7 +341,7 @@ function mouseClickHelper( aEvt )
             var sSelectedText =  aTextSelection.toString();
             if( sSelectedText )
             {
-                log( 'text selection: ' + sSelectedText );
+                DBGLOG( 'text selection: ' + sSelectedText );
                 if( sLastSelectedText !== sSelectedText )
                 {
                     bTextHasBeenSelected = true;
@@ -1682,6 +1682,10 @@ DebugPrinter.prototype.print = function( sMessage, nTime )
 
 
 // - Debug Printers -
+var aGenericDebugPrinter = new DebugPrinter();
+aGenericDebugPrinter.on();
+var DBGLOG = bind2( DebugPrinter.prototype.print, aGenericDebugPrinter );
+
 var NAVDBG = new DebugPrinter();
 NAVDBG.off();
 
@@ -9663,7 +9667,7 @@ AnimatedTextElement.prototype.setToElement = function( aElement )
 
 AnimatedTextElement.prototype.notifySlideStart = function( aSlideShowContext )
 {
-    log( 'AnimatedTextElement.notifySlideStart' );
+    DBGLOG( 'AnimatedTextElement.notifySlideStart' );
     AnimatedTextElement.superclass.notifySlideStart.call( this, aSlideShowContext );
     this.aGraphicGroupElement = getElementByClassName( this.aActiveElement, 'GraphicGroup' );
     this.restoreBaseTextParagraph();
@@ -9671,7 +9675,7 @@ AnimatedTextElement.prototype.notifySlideStart = function( aSlideShowContext )
 
 AnimatedTextElement.prototype.notifySlideEnd = function()
 {
-    log( 'AnimatedTextElement.notifySlideEnd' );
+    DBGLOG( 'AnimatedTextElement.notifySlideEnd' );
     this.aGraphicGroupElement.setAttribute( 'visibility', 'inherit' );
 };
 
@@ -9709,7 +9713,7 @@ AnimatedTextElement.prototype.restoreBaseTextParagraph = function()
 
 AnimatedTextElement.prototype.notifyAnimationStart = function()
 {
-    log( 'AnimatedTextElement.notifyAnimationStart' );
+    DBGLOG( 'AnimatedTextElement.notifyAnimationStart' );
     if( this.nRunningAnimations === 0 )
     {
         var sVisibilityAttr = this.aParagraphElement.getAttribute( 'visibility' );
@@ -9724,7 +9728,7 @@ AnimatedTextElement.prototype.notifyAnimationStart = function()
 
 AnimatedTextElement.prototype.notifyAnimationEnd = function()
 {
-    log( 'AnimatedTextElement.notifyAnimationEnd' );
+    DBGLOG( 'AnimatedTextElement.notifyAnimationEnd' );
     --this.nRunningAnimations;
     if( this.nRunningAnimations === 0 )
     {

filter/source/svg/svgexport.cxx

@@ -1749,42 +1749,6 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
                 {   // for text field shapes we set up text-adjust attributes
                     // and set visibility to hidden
                     OUString aShapeClass = implGetClassFromShape( rxShape );
-
-
-
-                    {
-//                        Reference< XPropertySetInfo > xPropSetInfo = xShapePropSet->getPropertySetInfo();
-//                        Sequence< Property > aPropSeq = xPropSetInfo->getProperties();
-//                        sal_Int32 nLength = aPropSeq.getLength();
-//                        OUString sGraphicPropList;
-//                        for( sal_Int32 i = 0; i < nLength; ++i )
-//                        {
-//                            sGraphicPropList += aPropSeq[i].Name;
-//                            sGraphicPropList += B2UCONST( ": " );
-//                            sGraphicPropList += aPropSeq[i].Type.getTypeName();
-//                            sGraphicPropList += B2UCONST( "; " );
-//                        }
-//                        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "Graphic" ) );
-//                        mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "property-list", sGraphicPropList );
-//                        SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_True );
-
-//                        if( xPropSetInfo->hasPropertyByName( B2UCONST( "GraphicURL" ) ) )
-//                        {
-//                            OUString sGraphicURL;
-//                            if( xShapePropSet->getPropertyValue( B2UCONST( "GraphicURL" ) ) >>= sGraphicURL )
-//                            {
-//                                if( !sGraphicURL.isEmpty() )
-//                                {
-//                                    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", B2UCONST( "GraphicURL" ) );
-//                                    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xlink:ref", sGraphicURL );
-//                                    SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "desc", sal_True, sal_True );
-//                                }
-//                            }
-//                        }
-                    }
-
-
-
                     if( mbPresentation )
                     {
                         sal_Bool bIsPageNumber  = ( aShapeClass == "Slide_Number" );
@@ -1859,7 +1823,6 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape )
                     if( !rShapeId.isEmpty() )
                     {
                         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", rShapeId );
-
                     }
 
                     const GDIMetaFile* pEmbeddedBitmapsMtf = NULL;
@@ -1968,7 +1931,6 @@ sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > &
 sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
 {
     sal_Bool bRet = sal_False;
-
     if( rxShape->getShapeType().lastIndexOf( B2UCONST( "drawing.GroupShape" ) ) != -1 )
     {
         Reference< XShapes > xShapes( rxShape, UNO_QUERY );
@@ -2075,8 +2037,8 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
                         }
                     }
                     (*mpObjects)[ rxShape ] = ObjectRepresentation( rxShape, aGraphic.GetGDIMetaFile() );
-                    bRet = sal_True;
                 }
+                bRet = sal_True;
             }
         }
     }
@@ -2183,7 +2145,6 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
 IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
 {
     sal_Bool bFieldProcessed = sal_False;
-
     if( pInfo && mbPresentation )
     {
         bFieldProcessed = true;