diff options
author | Thorsten Behrens <tbehrens@suse.com> | 2012-10-10 11:05:30 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@suse.com> | 2012-10-10 12:03:32 +0200 |
commit | f64457b19cea3c16c0a53f1d98134d48833ef4ed (patch) | |
tree | 6cf22758abc0a6d5024823f18535f6063678b95c /filter | |
parent | a6eb00438d5ae8555a71b4cf79caf3b3c2fe1b77 (diff) |
Define ooo xmlns prefix unconditionally for svg export
Plus some commented-code cleanup
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/svg/svgexport.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f3c8350ccf04..905500add847 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -738,7 +738,6 @@ Reference< XDocumentHandler > SVGFilter::implCreateExportDocumentHandler( const // ----------------------------------------------------------------------------- -inline sal_Bool SVGFilter::implLookForFirstVisiblePage() { sal_Int32 nCurPage = 0, nLastPage = mSelectedPages.getLength() - 1; @@ -781,7 +780,6 @@ sal_Bool SVGFilter::implExportDocument() mbSinglePage = (nLastPage == 0) || !bExperimentalMode; mnVisiblePage = -1; -// mnVisibleMasterPage = -1; const Reference< XPropertySet > xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY ); const Reference< XExtendedDocumentHandler > xExtDocHandler( mpSVGExport->GetDocHandler(), UNO_QUERY ); @@ -836,13 +834,7 @@ sal_Bool SVGFilter::implExportDocument() // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm) mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::valueOf( 28.222 ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", B2UCONST( "round" ) ); - - if( !mbSinglePage ) - { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( "http://xml.openoffice.org/svg/export" ) ); - } - - + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", B2UCONST( "http://xml.openoffice.org/svg/export" ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", B2UCONST( "http://www.w3.org/2000/svg" ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", B2UCONST( "http://www.w3.org/1999/xlink" ) ); @@ -2116,7 +2108,6 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape ) // ----------------------------------------------------------------------------- -//inline void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) { if( rxIf.is() ) @@ -2125,13 +2116,11 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf ) // ----------------------------------------------------------------------------- -//inline const ::rtl::OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf ) { return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf ); } - // ----------------------------------------------------------------------------- OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf ) |