diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /filter/source/xsltdialog | |
parent | Typo in comment in resmgr.hxx (diff) | |
download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'filter/source/xsltdialog')
-rw-r--r-- | filter/source/xsltdialog/typedetectionexport.cxx | 1 | ||||
-rw-r--r-- | filter/source/xsltdialog/typedetectionexport.hxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/typedetectionimport.cxx | 1 | ||||
-rw-r--r-- | filter/source/xsltdialog/typedetectionimport.hxx | 52 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltercommon.hxx | 48 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 20 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterjar.cxx | 9 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterjar.hxx | 20 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 6 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 14 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.cxx | 3 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertestdialog.hxx | 6 |
14 files changed, 93 insertions, 97 deletions
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx index 4a66506c96c6..a7593c2ff918 100644 --- a/filter/source/xsltdialog/typedetectionexport.cxx +++ b/filter/source/xsltdialog/typedetectionexport.cxx @@ -35,7 +35,6 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; TypeDetectionExporter::TypeDetectionExporter( Reference< XComponentContext >& xContext ) : mxContext( xContext ) diff --git a/filter/source/xsltdialog/typedetectionexport.hxx b/filter/source/xsltdialog/typedetectionexport.hxx index 05d702aee494..fe9435da8123 100644 --- a/filter/source/xsltdialog/typedetectionexport.hxx +++ b/filter/source/xsltdialog/typedetectionexport.hxx @@ -33,8 +33,8 @@ public: void doExport(com::sun::star::uno::Reference < com::sun::star::io::XOutputStream > xOS, const XMLFilterVector& rFilters ); private: - void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); - void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const rtl::OUString& rName, const rtl::OUString& rValue ); + void addProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); + void addLocaleProperty( com::sun::star::uno::Reference< com::sun::star::xml::sax::XWriter > xWriter, const OUString& rName, const OUString& rValue ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext; }; diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx index ffce4d9c8702..c9127d54dbc4 100644 --- a/filter/source/xsltdialog/typedetectionimport.cxx +++ b/filter/source/xsltdialog/typedetectionimport.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::xml::sax; using namespace com::sun::star; using namespace std; -using ::rtl::OUString; TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF ) : mxMSF(xMSF), diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx index ef27c43f695b..73d1077946e2 100644 --- a/filter/source/xsltdialog/typedetectionimport.hxx +++ b/filter/source/xsltdialog/typedetectionimport.hxx @@ -48,11 +48,11 @@ enum ImportState e_Unknown }; -DECLARE_STL_USTRINGACCESS_MAP( ::rtl::OUString, PropertyMap ); +DECLARE_STL_USTRINGACCESS_MAP( OUString, PropertyMap ); struct Node { - ::rtl::OUString maName; + OUString maName; PropertyMap maPropertyMap; }; @@ -70,15 +70,15 @@ public: throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) + virtual void SAL_CALL endElement( const OUString& aName ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) + virtual void SAL_CALL characters( const OUString& aChars ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -86,7 +86,7 @@ public: private: void fillFilterVector( XMLFilterVector& rFilters ); filter_info_impl* createFilterForNode( Node * pNode ); - Node* findTypeNode( const ::rtl::OUString& rType ); + Node* findTypeNode( const OUString& rType ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; @@ -96,24 +96,24 @@ private: NodeVector maFilterNodes; NodeVector maTypeNodes; - ::rtl::OUString maValue; - ::rtl::OUString maNodeName; - ::rtl::OUString maPropertyName; - - const ::rtl::OUString sRootNode; - const ::rtl::OUString sNode; - const ::rtl::OUString sName; - const ::rtl::OUString sProp; - const ::rtl::OUString sValue; - const ::rtl::OUString sUIName; - const ::rtl::OUString sData; - const ::rtl::OUString sFilters; - const ::rtl::OUString sTypes; - const ::rtl::OUString sFilterAdaptorService; - const ::rtl::OUString sXSLTFilterService; - - const ::rtl::OUString sCdataAttribute; - const ::rtl::OUString sWhiteSpace; + OUString maValue; + OUString maNodeName; + OUString maPropertyName; + + const OUString sRootNode; + const OUString sNode; + const OUString sName; + const OUString sProp; + const OUString sValue; + const OUString sUIName; + const OUString sData; + const OUString sFilters; + const OUString sTypes; + const OUString sFilterAdaptorService; + const OUString sXSLTFilterService; + + const OUString sCdataAttribute; + const OUString sWhiteSpace; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltercommon.hxx b/filter/source/xsltdialog/xmlfiltercommon.hxx index 3ea05b0a4f6e..00a354befbae 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hxx +++ b/filter/source/xsltdialog/xmlfiltercommon.hxx @@ -30,36 +30,36 @@ // -------------------------------------------------------------------- -extern ::rtl::OUString string_encode( const ::rtl::OUString & rText ); -extern ::rtl::OUString string_decode( const ::rtl::OUString & rText ); +extern OUString string_encode( const OUString & rText ); +extern OUString string_decode( const OUString & rText ); // -------------------------------------------------------------------- -extern bool isFileURL( const ::rtl::OUString & rURL ); +extern bool isFileURL( const OUString & rURL ); // -------------------------------------------------------------------- bool copyStreams( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xIS, ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > xOS ); -bool createDirectory( ::rtl::OUString& rURL ); +bool createDirectory( OUString& rURL ); // -------------------------------------------------------------------- class filter_info_impl { public: - rtl::OUString maFilterName; - rtl::OUString maType; - rtl::OUString maDocumentService; - rtl::OUString maFilterService; - rtl::OUString maInterfaceName; - rtl::OUString maComment; - rtl::OUString maExtension; - rtl::OUString maExportXSLT; - rtl::OUString maImportXSLT; - rtl::OUString maImportTemplate; - rtl::OUString maDocType; - rtl::OUString maImportService; - rtl::OUString maExportService; + OUString maFilterName; + OUString maType; + OUString maDocumentService; + OUString maFilterService; + OUString maInterfaceName; + OUString maComment; + OUString maExtension; + OUString maExportXSLT; + OUString maImportXSLT; + OUString maImportTemplate; + OUString maDocType; + OUString maImportService; + OUString maExportService; sal_Int32 maFlags; sal_Int32 maFileFormatVersion; @@ -73,17 +73,17 @@ public: filter_info_impl( const filter_info_impl& rInfo ); int operator==( const filter_info_impl& ) const; - com::sun::star::uno::Sequence< rtl::OUString > getFilterUserData() const; + com::sun::star::uno::Sequence< OUString > getFilterUserData() const; }; // -------------------------------------------------------------------- struct application_info_impl { - rtl::OUString maDocumentService; - rtl::OUString maDocumentUIName; - rtl::OUString maXMLImporter; - rtl::OUString maXMLExporter; + OUString maDocumentService; + OUString maDocumentUIName; + OUString maXMLImporter; + OUString maXMLExporter; application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter ); }; @@ -91,8 +91,8 @@ struct application_info_impl // -------------------------------------------------------------------- extern std::vector< application_info_impl* >& getApplicationInfos(); -extern rtl::OUString getApplicationUIName( const rtl::OUString& rServiceName ); -extern const application_info_impl* getApplicationInfo( const rtl::OUString& rServiceName ); +extern OUString getApplicationUIName( const OUString& rServiceName ); +extern const application_info_impl* getApplicationInfo( const OUString& rServiceName ); extern ResMgr* getXSLTDialogResMgr(); diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 229e4cf26c15..7c692405ce37 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -82,12 +82,12 @@ protected: virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XExecutableDialog - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw(RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw(RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw(RuntimeException); // XInitialization @@ -206,8 +206,8 @@ Sequence< OUString > SAL_CALL XMLFilterDialogComponent_getSupportedServiceNames( sal_Bool SAL_CALL XMLFilterDialogComponent_supportsService( const OUString& ServiceName ) throw ( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported(XMLFilterDialogComponent_getSupportedServiceNames()); + const OUString* pArray = aSupported.getConstArray(); for (sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray) if (pArray->equals(ServiceName)) return sal_True; @@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL XMLFilterDialogComponent_createInstance( const } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) +OUString SAL_CALL XMLFilterDialogComponent::getImplementationName() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getImplementationName(); } @@ -271,13 +271,13 @@ Sequence< Type > XMLFilterDialogComponent::getTypes() throw (RuntimeException) //------------------------------------------------------------------------- -Sequence< ::rtl::OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) +Sequence< OUString > SAL_CALL XMLFilterDialogComponent::getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException) { return XMLFilterDialogComponent_getSupportedServiceNames(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const ::rtl::OUString& ServiceName) throw(RuntimeException) +sal_Bool SAL_CALL XMLFilterDialogComponent::supportsService(const OUString& ServiceName) throw(RuntimeException) { return XMLFilterDialogComponent_supportsService( ServiceName ); } @@ -338,7 +338,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source } //------------------------------------------------------------------------- -void SAL_CALL XMLFilterDialogComponent::setTitle( const ::rtl::OUString& /* _rTitle */ ) throw(RuntimeException) +void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException) { } diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index 66f7198a5fdb..9d2eee03a2c5 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -58,7 +58,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::io; -using ::rtl::OUString; using ::rtl::Uri; XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF ) @@ -162,13 +161,13 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) @@ -262,13 +261,13 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; - aArg.Name = ::rtl::OUString( "StorageFormat" ); + aArg.Name = OUString( "StorageFormat" ); aArg.Value <<= ZIP_STORAGE_FORMAT_STRING; aArguments[ 1 ] <<= aArg; Reference< XHierarchicalNameAccess > xIfc( mxMSF->createInstanceWithArguments( - rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ), + OUString( "com.sun.star.packages.comp.ZipPackage" ), aArguments ), UNO_QUERY ); if( xIfc.is() ) diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx index 5c4005d0b2b0..8aea9d5c7cbd 100644 --- a/filter/source/xsltdialog/xmlfilterjar.hxx +++ b/filter/source/xsltdialog/xmlfilterjar.hxx @@ -34,23 +34,23 @@ class XMLFilterJarHelper public: XMLFilterJarHelper( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF ); - bool savePackage( const rtl::OUString& rPackageURL, const XMLFilterVector& rFilters ); - void openPackage( const rtl::OUString& rPackageURL, XMLFilterVector& rFilters ); + bool savePackage( const OUString& rPackageURL, const XMLFilterVector& rFilters ); + void openPackage( const OUString& rPackageURL, XMLFilterVector& rFilters ); private: - void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const ::rtl::OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); + void addFile( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xRootFolder, com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory, const OUString& rSourceFile ) throw( com::sun::star::uno::Exception ); - bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, ::rtl::OUString& rURL, const ::rtl::OUString& rTargetURL ); + bool copyFile( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, OUString& rURL, const OUString& rTargetURL ); bool copyFiles( com::sun::star::uno::Reference< com::sun::star::container::XHierarchicalNameAccess > xIfc, filter_info_impl* pFilter ); com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxMSF; - ::rtl::OUString sVndSunStarPackage; - ::rtl::OUString sXSLTPath; - ::rtl::OUString sTemplatePath; - ::rtl::OUString sSpecialConfigManager; - ::rtl::OUString sPump; - ::rtl::OUString sProgPath; + OUString sVndSunStarPackage; + OUString sXSLTPath; + OUString sTemplatePath; + OUString sSpecialConfigManager; + OUString sPump; + OUString sProgPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 473123a1d073..6356298cf881 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1657,7 +1657,7 @@ OUString string_decode( const OUString & rText ) // ----------------------------------------------------------------------- -bool isFileURL( const ::rtl::OUString & rURL ) +bool isFileURL( const OUString & rURL ) { return rURL.startsWith("file:"); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 7ebc3fca0513..80176e02128c 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -114,9 +114,9 @@ private: bool insertOrEdit( filter_info_impl* pNewInfo, const filter_info_impl* pOldInfo = NULL ); - rtl::OUString createUniqueFilterName( const rtl::OUString& rUIName ); - rtl::OUString createUniqueTypeName( const rtl::OUString& rTypeName ); - rtl::OUString createUniqueInterfaceName( const rtl::OUString& rInterfaceName ); + OUString createUniqueFilterName( const OUString& rUIName ); + OUString createUniqueTypeName( const OUString& rTypeName ); + OUString createUniqueInterfaceName( const OUString& rInterfaceName ); private: diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index a7db7ac23a37..857bb0a9adef 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -38,8 +38,8 @@ public: bool FillInfo( filter_info_impl* pInfo ); void SetInfo(const filter_info_impl* pInfo); - static rtl::OUString decodeComment( const rtl::OUString& rComment ); - static rtl::OUString encodeComment( const rtl::OUString& rComment ); + static OUString decodeComment( const OUString& rComment ); + static OUString encodeComment( const OUString& rComment ); FixedText maFTFilterName; Edit maEDFilterName; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 980647ed9caa..062637e1f02b 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -60,14 +60,14 @@ public: CheckBox maCBNeedsXSLT2; private: - void SetURL( SvtURLBox& rURLBox, const rtl::OUString& rURL ); - rtl::OUString GetURL( SvtURLBox& rURLBox ); + void SetURL( SvtURLBox& rURLBox, const OUString& rURL ); + OUString GetURL( SvtURLBox& rURLBox ); - ::rtl::OUString sHTTPSchema; - ::rtl::OUString sSHTTPSchema; - ::rtl::OUString sFILESchema; - ::rtl::OUString sFTPSchema; - ::rtl::OUString sInstPath; + OUString sHTTPSchema; + OUString sSHTTPSchema; + OUString sFILESchema; + OUString sFTPSchema; + OUString sInstPath; }; #endif diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index 74c08daf0d20..099aec7933d6 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -67,7 +67,6 @@ using namespace com::sun::star::system; using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1< com::sun::star::document::XEventListener > { @@ -526,7 +525,7 @@ void XMLFilterTestDialog::displayXMLFile( const OUString& rURL ) { Reference< XSystemShellExecute > xSystemShellExecute( SystemShellExecute::create(comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( rURL, rtl::OUString(), SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( rURL, OUString(), SystemShellExecuteFlags::URIS_ONLY ); } void XMLFilterTestDialog::onImportBrowse() diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 7fccd4ed406d..51732137cda0 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -51,9 +51,9 @@ private: void onImportRecentDocument(); void initDialog(); - com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const rtl::OUString& rServiceName ); - void import( const rtl::OUString& rURL ); - void displayXMLFile( const rtl::OUString& rURL ); + com::sun::star::uno::Reference< com::sun::star::lang::XComponent > getFrontMostDocument( const OUString& rServiceName ); + void import( const OUString& rURL ); + void displayXMLFile( const OUString& rURL ); void doExport( com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp ); private: |