mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify a bit the boilerplate code

Browse Source 
The XInputStream is guaranteed to be there always
and if it is not there, do not try to create it.

Change-Id: Ie133489dfcb3d9cec0c4efe78740348a1efa2423
This commit is contained in:
Fridrich Štrba
2013-03-01 23:01:28 +01:00
parent 6ee08cc0f1
commit 866ebf66b3
7 changed files with 17 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
writerperfect/source/draw/CDRImportFilter.cxx
View File

@@ -74,16 +74,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -142,6 +138,9 @@ throw( com::sun::star::uno::RuntimeException )
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );
if (libcdr::CDRDocument::isSupported(&input))

8
writerperfect/source/draw/CMXImportFilter.cxx
View File

@@ -39,7 +39,6 @@ using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
using namespace ::rtl;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -74,16 +73,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -142,6 +137,9 @@ throw( com::sun::star::uno::RuntimeException )
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );
if (libcdr::CMXDocument::isSupported(&input))

8
writerperfect/source/draw/MSPUBImportFilter.cxx
View File

@@ -35,7 +35,6 @@ using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
using namespace ::rtl;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -70,16 +69,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -138,6 +133,9 @@ throw( com::sun::star::uno::RuntimeException )
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );
if (libmspub::MSPUBDocument::isSupported(&input))

8
writerperfect/source/draw/VisioImportFilter.cxx
View File

@@ -35,7 +35,6 @@ using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
using namespace ::rtl;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -70,16 +69,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -138,6 +133,9 @@ throw( com::sun::star::uno::RuntimeException )
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );
if (libvisio::VisioDocument::isSupported(&input))

8
writerperfect/source/draw/WPGImportFilter.cxx
View File

@@ -40,7 +40,6 @@ using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
using namespace ::rtl;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -75,16 +74,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
@@ -143,6 +138,9 @@ throw( com::sun::star::uno::RuntimeException )
pValue[i].Value >>= xInputStream;
}
if (!xInputStream.is())
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );
if (libwpg::WPGraphics::isSupported(&input))

24
writerperfect/source/writer/MSWorksImportFilter.cxx
View File

@@ -19,7 +19,6 @@
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
@@ -36,7 +35,6 @@
#include <iostream>
using namespace ::com::sun::star::uno;
using rtl::OString;
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
@@ -72,16 +70,12 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
OSL_ASSERT( 0 );
return sal_False;
}
OString sFileName;
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
OUString sXMLImportService ( "com.sun.star.comp.Writer.XMLOasisImporter" );
@@ -142,26 +136,10 @@ throw( com::sun::star::uno::RuntimeException )
location=i;
else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
if (!xInputStream.is())
{
try
{
::ucbhelper::Content aContent(sURL, xEnv, mxContext);
xInputStream = aContent.openStream();
}
catch ( ... )
{
return ::rtl::OUString();
}
if (!xInputStream.is())
return ::rtl::OUString();
}
return ::rtl::OUString();
WPXSvInputStream input( xInputStream );

21
writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

@@ -19,7 +19,6 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <comphelper/componentcontext.hxx>
#include <xmloff/attrlist.hxx>
@@ -100,8 +99,6 @@ throw (RuntimeException)
{
if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
if ( !xInputStream.is() )
{
@@ -194,26 +191,10 @@ throw( RuntimeException )
location=i;
else if ( pValue[i].Name == "InputStream" )
pValue[i].Value >>= xInputStream;
else if ( pValue[i].Name == "URL" )
pValue[i].Value >>= sURL;
}
Reference< com::sun::star::ucb::XCommandEnvironment > xEnv;
if (!xInputStream.is())
{
try
{
Content aContent(sURL, xEnv, mxContext);
xInputStream = aContent.openStream();
}
catch ( ... )
{
return OUString();
}
if (!xInputStream.is())
return OUString();
}
return OUString();
WPXSvInputStream input( xInputStream );