Fixed few obvious mismerges.

4 files changed, 27 insertions, 18 deletions

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 837a5188f21f..15bed7208985 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -260,7 +260,6 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
         }
         else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PagePos" ) ) )
             pValue[ i ].Value >>= nPageToExport;
-        }
         else if( pValue[ i ].Name.equalsAscii( "FilterData" ) )
         {
             pValue[ i ].Value >>= maFilterData;
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 663726847c06..61fbdc06d61c 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -166,6 +166,20 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc
 
 rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException)
 {
+    uno::Reference< io::XInputStream > xInput;
+    rtl::OUString aURL;
+
+    const beans::PropertyValue* pAttribs = io_rDescriptor.getConstArray();
+    const sal_Int32 nAttribs = io_rDescriptor.getLength();
+    for( sal_Int32 i = 0; i < nAttribs; i++ )
+    {
+        if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
+            pAttribs[i].Value >>= xInput;
+    }
+
+    if( !xInput.is() )
+        return rtl::OUString();
+
     uno::Reference< io::XSeekable > xSeek( xInput, uno::UNO_QUERY );
     if( xSeek.is() )
         xSeek->seek( 0 );
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 24d983a89c40..8c28227e78ad 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -132,13 +132,13 @@ void SVGAttributeWriter::ImplGetColorStr( const Color& rColor, ::rtl::OUString&
     else
     {
         ::rtl::OUStringBuffer aStyle;
-        aStyle.appendAscii( RTL_CONSTASCII_USTRINGPARAM("rgb(") );
-        aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetRed() );
-        aStyle.appendAscii( RTL_CONSTASCII_USTRINGPARAM(",") );
-        aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetGreen() );
-        aStyle.appendAscii( RTL_CONSTASCII_USTRINGPARAM(",") );
-        aStyle += NMSP_RTL::OUString::valueOf( (sal_Int32) rColor.GetBlue() );
-        aStyle.appendAscii( RTL_CONSTASCII_USTRINGPARAM(")") );
+        aStyle.appendAscii( "rgb(" );
+        aStyle.append( (sal_Int32) rColor.GetRed() );
+        aStyle.appendAscii( "," );
+        aStyle.append( (sal_Int32) rColor.GetGreen() );
+        aStyle.appendAscii( "," );
+        aStyle.append( (sal_Int32) rColor.GetBlue() );
+        aStyle.appendAscii( ")" );
         rColorStr = aStyle.makeStringAndClear();
     }
 }
@@ -704,7 +704,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, sal_Bool
 void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
                                         const Hatch* pHatch,
                                         const Gradient* pGradient,
-                                        const NMSP_RTL::OUString* pStyle,
+                                        const rtl::OUString* pStyle,
                                         sal_uInt32 nWriteFlags )
 {
     if( rPolyPoly.Count() )
@@ -726,7 +726,7 @@ void SVGActionWriter::ImplWritePattern( const PolyPolygon& rPolyPoly,
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrWidth, GetValueString( aRect.GetWidth() ) );
             mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, GetValueString( aRect.GetHeight() ) );
 
-            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
+            mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrPatternUnits, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse") ) );
 
             {
                 SvXMLElementExport aElemPattern( mrExport, XML_NAMESPACE_NONE, aXMLElemPattern, sal_True, sal_True );
@@ -829,7 +829,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY2, GetValueString( aPoly[ 1 ].Y() ) );
 
                 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrGradientUnits,
-                                       NMSP_RTL::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
+                                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "userSpaceOnUse" ) ) );
             }
 
             {
@@ -906,7 +906,7 @@ void SVGActionWriter::ImplWriteGradientLinear( const PolyPolygon& rPolyPoly,
 
 void SVGActionWriter::ImplWriteGradientStop( const Color& rColor, double fOffset )
 {
-    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, NMSP_RTL::OUString::valueOf( fOffset ) );
+    mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrOffset, rtl::OUString::valueOf( fOffset ) );
 
     ::rtl::OUString aStyle;
     aStyle += B2UCONST( "stop-color:" );
@@ -952,7 +952,7 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
                                      const Point& rDestPt,
                                      const Size& rDestSize,
                                      const Gradient& rGradient,
-                                     const NMSP_RTL::OUString* pStyle,
+                                     const rtl::OUString* pStyle,
                                      sal_uInt32 nWriteFlags )
 {
     Point          aSrcPt( rMtf.GetPrefMapMode().GetOrigin() );
@@ -1288,7 +1288,7 @@ void SVGActionWriter::ImplWriteBmp( const BitmapEx& rBmpEx,
                 Point                    aPt;
                 Size                     aSz;
                 Sequence< sal_Int8 >     aSeq( (sal_Int8*) aOStm.GetData(), aOStm.Tell() );
-                NMSP_RTL::OUStringBuffer aBuffer;
+                rtl::OUStringBuffer aBuffer;
                 aBuffer.appendAscii( "data:image/png;base64," );
                 SvXMLUnitConverter::encodeBase64( aBuffer, aSeq );
 
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 0010fad9d421..cfe4093f2996 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -208,10 +208,6 @@ private:
     void                    ImplCheckPaintAttributes();
 
     void                    ImplWriteActions( const GDIMetaFile& rMtf, sal_uInt32 nWriteFlags, const ::rtl::OUString* pElementId );
-    sal_Int32               ImplGetNextClipId() { return mnCurClipId++; }
-    sal_Int32               ImplGetNextPatternId() { return mnCurPatternId++; }
-    sal_Int32               ImplGetNextGradientId() { return mnCurGradientId++; }
-    sal_Int32               ImplGetNextMaskId() { return mnCurMaskId++; }
 
 public: