[Libreoffice-commits] .: 2 commits - filter/source oox/inc oox/source

[Fridrich Strba]

 filter/source/svg/svgexport.cxx     |    8 ++++++-
 filter/source/svg/svgscript.hxx     |   39 +++++++++++++++++++++++-------------
 oox/inc/oox/core/contexthandler.hxx |    2 -
 oox/source/core/contexthandler.cxx  |    2 -
 4 files changed, 34 insertions(+), 17 deletions(-)

New commits:
commit fd7bf202f83042271ab4f5019f0779dca8748da1
Author: Marco Cecchetti <mrcekets at gmail.com>
Date:   Sat Jul 9 05:03:15 2011 -0600

    Split the script in smaller pieces

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index af57d3b..31134e9 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1110,7 +1110,13 @@ sal_Bool SVGFilter::implGenerateScript()
 
         if( xExtDocHandler.is() )
         {
-            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript1 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript2 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript3 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript4 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript5 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript6 ) );
+            xExtDocHandler->unknown( OUString::createFromAscii( aSVGScript7 ) );
         }
     }
 
diff --git a/filter/source/svg/svgscript.hxx b/filter/source/svg/svgscript.hxx
index f7b01e0..cd75894 100644
--- a/filter/source/svg/svgscript.hxx
+++ b/filter/source/svg/svgscript.hxx
@@ -27,7 +27,7 @@
  ************************************************************************/
 
 
-static const char aSVGScript[] =
+static const char aSVGScript1[] =
 "<![CDATA[\n\
 \n\
     /** * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * \n\
@@ -335,8 +335,10 @@ static const char aSVGScript[] =
         else\n\
             return nIndex;\n\
     }\n\
-\n\
-\n\
+\n\ ";
+
+static const char aSVGScript2[] =
+"\n\
     // ------------------------------------------------------------------------------------------ //\n\
     /******************\n\
      ** Core Classes **\n\
@@ -714,8 +716,10 @@ static const char aSVGScript[] =
 \n\
         this.textElement = getElementByClassName( aParentElem, 'PlaceholderContent' );\n\
     };\n\
-\n\
-    \n\
+\n\ ";
+
+static const char aSVGScript3[] =
+"\n\
     // ------------------------------------------------------------------------------------------ //\n\
     /********************************\n\
      ** Text Field Class Hierarchy **\n\
@@ -837,9 +841,10 @@ static const char aSVGScript[] =
         // TODO handle page numbering type\n\
         return String( nSlideNumber );\n\
     };\n\
-    \n\
-    \n\
-    \n\
+\n\ ";
+
+static const char aSVGScript4[] =
+"\n\
     //------------------------------------------------------------------------------------------- //\n\
     /********************************\n\
      ** Slide Index Classes **\n\
@@ -1065,8 +1070,10 @@ static const char aSVGScript[] =
         ROOT_NODE.unsuspendRedraw( suspendHandle );\n\
         ROOT_NODE.forceRedraw();   \n\
     };\n\
-    \n\
-    \n\
+    \n\ ";
+
+static const char aSVGScript5[] =
+"\n\
     /** Class Thumbnail **\n\
      *  This class handles a slide thumbnail.\n\
      */\n\
@@ -1258,8 +1265,10 @@ static const char aSVGScript[] =
     };\n\
     \n\
     \n\
-    \n\
-\n\
+    \n\ ";
+
+static const char aSVGScript6[] =
+"\n\
     // ------------------------------------------------------------------------------------------ //\n\
     /** Initialization function.\n\
      *  The whole presentation is set-up in this function.\n\
@@ -1396,8 +1405,10 @@ static const char aSVGScript[] =
 \n\
         return charCodeDict;\n\
     }\n\
-    \n\
-\n\
+    \n\ ";
+
+static const char aSVGScript7[] =
+"\n\
     function slideOnMouseDown( aEvt )\n\
     {\n\
         if (!aEvt)\n\
commit 7fcf4180c25c4f1502afe18fc45db9d5d1bf3efb
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Sun Jul 10 16:56:33 2011 -0600

    Fix windows build
    
    Use const reference in copy constructor if we are going to give it const objects.

diff --git a/oox/inc/oox/core/contexthandler.hxx b/oox/inc/oox/core/contexthandler.hxx
index 0bcc3d8..d0d306e 100644
--- a/oox/inc/oox/core/contexthandler.hxx
+++ b/oox/inc/oox/core/contexthandler.hxx
@@ -63,7 +63,7 @@ typedef ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastContextHandler
 class ContextHandler : public ContextHandler_BASE
 {
 public:
-    explicit            ContextHandler( ContextHandler& rParent );
+    explicit            ContextHandler( const ContextHandler& rParent );
     virtual             ~ContextHandler();
 
     /** Returns the filter instance. */
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index c8aeb8c..55336c2 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -42,7 +42,7 @@ using ::rtl::OUString;
 
 // ============================================================================
 
-ContextHandler::ContextHandler( ContextHandler& rParent ) :
+ContextHandler::ContextHandler( const ContextHandler& rParent ) :
     ContextHandler_BASE(),
     mxBaseData( rParent.mxBaseData )
 {