writerperfect/source/draw/CDRImportFilter.cxx | 5 --
writerperfect/source/draw/CDRImportFilter.hxx | 16 ++++----
writerperfect/source/draw/CMXImportFilter.cxx | 4 --
writerperfect/source/draw/CMXImportFilter.hxx | 16 ++++----
writerperfect/source/draw/MSPUBImportFilter.cxx | 4 --
writerperfect/source/draw/MSPUBImportFilter.hxx | 16 ++++----
writerperfect/source/draw/VisioImportFilter.cxx | 4 --
writerperfect/source/draw/VisioImportFilter.hxx | 16 ++++----
writerperfect/source/draw/WPGImportFilter.cxx | 3 -
writerperfect/source/draw/WPGImportFilter.hxx | 16 ++++----
writerperfect/source/filter/DocumentHandler.cxx | 3 -
writerperfect/source/stream/WPXSvStream.cxx | 6 +--
writerperfect/source/writer/MSWorksImportFilter.cxx | 6 ---
writerperfect/source/writer/MSWorksImportFilter.hxx | 16 ++++----
writerperfect/source/writer/MWAWImportFilter.cxx | 6 ---
writerperfect/source/writer/MWAWImportFilter.hxx | 16 ++++----
writerperfect/source/writer/WordPerfectImportFilter.cxx | 3 -
writerperfect/source/writer/WordPerfectImportFilter.hxx | 32 ++++++++--------
18 files changed, 82 insertions(+), 106 deletions(-)
New commits:
commit 3dfff2ea4678105a186ce9ca4a038458a57c727e
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Tue Mar 19 09:54:00 2013 +0100
::rtl::OUString -> OUString in writerperfect
Change-Id: I2d0f8868779e5ac4a802f3f061704d2de5826c5d
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx
b/writerperfect/source/draw/CDRImportFilter.cxx
index ba2d19d..1a66c98 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -38,9 +38,6 @@ using com::sun::star::uno::Reference;
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::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
@@ -134,7 +131,7 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx
b/writerperfect/source/draw/CDRImportFilter.hxx
index 95189e8..efdfae8 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -38,7 +38,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
public:
@@ -57,7 +57,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -65,22 +65,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString CDRImportFilter_getImplementationName()
+OUString CDRImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL CDRImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL CDRImportFilter_supportsService( const OUString &ServiceName
)
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
CDRImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
CDRImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx
b/writerperfect/source/draw/CMXImportFilter.cxx
index 7e76eb0..6065354 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -38,8 +38,6 @@ using com::sun::star::uno::Reference;
using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
@@ -133,7 +131,7 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
diff --git a/writerperfect/source/draw/CMXImportFilter.hxx
b/writerperfect/source/draw/CMXImportFilter.hxx
index 151d543..a218ff8 100644
--- a/writerperfect/source/draw/CMXImportFilter.hxx
+++ b/writerperfect/source/draw/CMXImportFilter.hxx
@@ -38,7 +38,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
public:
@@ -57,7 +57,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -65,22 +65,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString CMXImportFilter_getImplementationName()
+OUString CMXImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL CMXImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL CMXImportFilter_supportsService( const OUString &ServiceName
)
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
CMXImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
CMXImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx
b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 8e04e6d..2ad210b 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -34,8 +34,6 @@ using com::sun::star::uno::Reference;
using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
@@ -129,7 +127,7 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx
b/writerperfect/source/draw/MSPUBImportFilter.hxx
index 6d97665..90bb2aa 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.hxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.hxx
@@ -35,7 +35,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
public:
@@ -54,7 +54,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -62,22 +62,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString MSPUBImportFilter_getImplementationName()
+OUString MSPUBImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL MSPUBImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL MSPUBImportFilter_supportsService( const OUString
&ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
MSPUBImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
MSPUBImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx
b/writerperfect/source/draw/VisioImportFilter.cxx
index 3e6a22a..d2b0dc0 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -34,8 +34,6 @@ using com::sun::star::uno::Reference;
using com::sun::star::io::XInputStream;
using com::sun::star::io::XSeekable;
using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
@@ -129,7 +127,7 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
diff --git a/writerperfect/source/draw/VisioImportFilter.hxx
b/writerperfect/source/draw/VisioImportFilter.hxx
index 3af4b1b..b001865 100644
--- a/writerperfect/source/draw/VisioImportFilter.hxx
+++ b/writerperfect/source/draw/VisioImportFilter.hxx
@@ -35,7 +35,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
public:
@@ -54,7 +54,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -62,22 +62,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString VisioImportFilter_getImplementationName()
+OUString VisioImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL VisioImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL VisioImportFilter_supportsService( const OUString
&ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
VisioImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
VisioImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx
b/writerperfect/source/draw/WPGImportFilter.cxx
index 2c0e715..d7629c5 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -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::OUString;
using com::sun::star::uno::Any;
using com::sun::star::uno::UNO_QUERY;
using com::sun::star::uno::XInterface;
@@ -134,7 +133,7 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
diff --git a/writerperfect/source/draw/WPGImportFilter.hxx
b/writerperfect/source/draw/WPGImportFilter.hxx
index f648aea..12bbf58 100644
--- a/writerperfect/source/draw/WPGImportFilter.hxx
+++ b/writerperfect/source/draw/WPGImportFilter.hxx
@@ -40,7 +40,7 @@ protected:
// oo.org declares
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
public:
@@ -59,7 +59,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -67,22 +67,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString WPGImportFilter_getImplementationName()
+OUString WPGImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL WPGImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL WPGImportFilter_supportsService( const OUString &ServiceName
)
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
WPGImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
WPGImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/filter/DocumentHandler.cxx
b/writerperfect/source/filter/DocumentHandler.cxx
index 8336c07..f3c6a35 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/filter/DocumentHandler.cxx
@@ -17,9 +17,6 @@
// #define DEBUG_XML 1
-using namespace ::rtl;
-using rtl::OUString;
-
using com::sun::star::xml::sax::XAttributeList;
DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) :
diff --git a/writerperfect/source/stream/WPXSvStream.cxx
b/writerperfect/source/stream/WPXSvStream.cxx
index b058b87..640ab20 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -19,7 +19,7 @@ using namespace ::com::sun::star::io;
namespace
{
-static void splitPath( std::vector<rtl::OUString> &rElems, const
::rtl::OUString &rPath )
+static void splitPath( std::vector<OUString> &rElems, const OUString &rPath )
{
for (sal_Int32 i = 0; i >= 0;)
rElems.push_back( rPath.getToken( 0, '/', i ) );
@@ -159,8 +159,8 @@ WPXInputStream
*WPXSvInputStream::getDocumentOLEStream(const char *name)
{
if (!name)
return 0;
- rtl::OUString rPath(name,strlen(name),RTL_TEXTENCODING_UTF8);
- std::vector<rtl::OUString> aElems;
+ OUString rPath(name,strlen(name),RTL_TEXTENCODING_UTF8);
+ std::vector<OUString> aElems;
splitPath( aElems, rPath );
if ((mnLength == 0) || !mxStream.is() || !mxSeekable.is())
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 11b294d..27112eb 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -35,7 +35,6 @@
#include <iostream>
using namespace ::com::sun::star::uno;
-using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
@@ -136,13 +135,10 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
- if (input.atEOS())
- return ::rtl::OUString();
-
confidence = WPSDocument::isFileFormatSupported(&input);
if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence ==
WPS_CONFIDENCE_GOOD))
diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx
b/writerperfect/source/writer/MSWorksImportFilter.hxx
index 4f7439f..5a107e5 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.hxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.hxx
@@ -34,7 +34,7 @@ class MSWorksImportFilter : public cppu::WeakImplHelper5
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aDescriptor )
@@ -56,7 +56,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -64,22 +64,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString MSWorksImportFilter_getImplementationName()
+OUString MSWorksImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL MSWorksImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL MSWorksImportFilter_supportsService( const OUString
&ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
MSWorksImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
MSWorksImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx
b/writerperfect/source/writer/MWAWImportFilter.cxx
index 2727098..9c3e989 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -35,7 +35,6 @@
#include <iostream>
using namespace ::com::sun::star::uno;
-using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Reference;
using com::sun::star::uno::Any;
@@ -912,13 +911,10 @@ throw( com::sun::star::uno::RuntimeException )
}
if (!xInputStream.is())
- return ::rtl::OUString();
+ return OUString();
WPXSvInputStream input( xInputStream );
- if (input.atEOS())
- return ::rtl::OUString();
-
confidence = MWAWDocument::isFileFormatSupported(&input, docType, docKind);
if ((confidence == MWAW_CONFIDENCE_EXCELLENT) || (confidence ==
MWAW_CONFIDENCE_GOOD))
diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx
b/writerperfect/source/writer/MWAWImportFilter.hxx
index 95af688..0ccccb1 100644
--- a/writerperfect/source/writer/MWAWImportFilter.hxx
+++ b/writerperfect/source/writer/MWAWImportFilter.hxx
@@ -34,7 +34,7 @@ class MWAWImportFilter : public cppu::WeakImplHelper5
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > &aDescriptor )
@@ -56,7 +56,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue > &Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue > &Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -64,22 +64,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString MWAWImportFilter_getImplementationName()
+OUString MWAWImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL MWAWImportFilter_supportsService( const ::rtl::OUString
&ServiceName )
+sal_Bool SAL_CALL MWAWImportFilter_supportsService( const OUString
&ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
MWAWImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
MWAWImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx
b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 0b8640a..d5cd0ca 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -194,9 +194,6 @@ throw( RuntimeException )
WPXSvInputStream input( xInputStream );
- if (input.atEOS())
- return OUString();
-
confidence = WPDocument::isFileFormatSupported(&input);
if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence ==
WPD_CONFIDENCE_SUPPORTED_ENCRYPTION)
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx
b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index 577e0b0..caad6cf 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -38,7 +38,7 @@ class WordPerfectImportFilter : public cppu::WeakImplHelper5
protected:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
mxDoc;
- ::rtl::OUString msFilterName;
+ OUString msFilterName;
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aDescriptor )
@@ -60,7 +60,7 @@ public:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
//XExtendedFilterDetection
- virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
+ virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
com::sun::star::beans::PropertyValue >& Descriptor )
throw( com::sun::star::uno::RuntimeException );
// XInitialization
@@ -68,22 +68,22 @@ public:
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
};
-::rtl::OUString WordPerfectImportFilter_getImplementationName()
+OUString WordPerfectImportFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const
::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString
&ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
WordPerfectImportFilter_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
WordPerfectImportFilter_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -98,23 +98,23 @@ class WordPerfectImportFilterDialog : public
cppu::WeakImplHelper3 <
>
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> mxContext;
- ::rtl::OUString msPassword;
+ OUString msPassword;
::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
mxInputStream;
~WordPerfectImportFilterDialog();
// XExecutableDialog
- virtual void SAL_CALL setTitle( const ::rtl::OUString &aTitle )
+ virtual void SAL_CALL setTitle( const OUString &aTitle )
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute()
throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
&ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( )
throw (::com::sun::star::uno::RuntimeException);
// XPropertyAccess
@@ -133,13 +133,13 @@ public:
};
-::rtl::OUString WordPerfectImportFilterDialog_getImplementationName()
+OUString WordPerfectImportFilterDialog_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException );
-sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const
::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL WordPerfectImportFilterDialog_supportsService( const
OUString &ServiceName )
throw ( ::com::sun::star::uno::RuntimeException );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
WordPerfectImportFilterDialog_getSupportedServiceNames( )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL
WordPerfectImportFilterDialog_getSupportedServiceNames( )
throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
