diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-02 17:46:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 08:28:44 +0100 |
| commit | 5837402fb1daa437d9a1a37edc9ede57319944f1 (patch) | |
| tree | 61e39515cd546fe7ad76364ebb444850b93541ce /xmlhelp | |
| parent | 3f15a663b273e4a437fd68335d6eab2b11fc80c9 (diff) | |
fdo#46808, use service constructor for ucb::SimpleFileAccess
I upgraded the service to return XSimpleFileAccess3, since it
already implemented that interface, and it's backwards
compatible.
Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.hxx | 6 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/db.hxx | 6 | ||||
| -rw-r--r-- | xmlhelp/source/treeview/tvread.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 1722972e55b4..1afcdba26011 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -47,7 +47,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/deployment/XPackage.hpp> -#include "com/sun/star/ucb/XSimpleFileAccess2.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess3.hpp" // Forward declaration @@ -296,7 +296,7 @@ namespace chelp { osl::Mutex m_aMutex; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; com::sun::star::uno::Reference< com::sun::star::lang::XMultiComponentFactory > m_xSMgr; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA; + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; bool m_bShowBasic; char* m_pErrorDoc; @@ -438,7 +438,7 @@ namespace chelp { com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage ); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA; + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; Databases& m_rDatabases; IteratorState m_eState; diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx index 2b0749fc95f7..2b5697d96fd5 100644 --- a/xmlhelp/source/cxxhelp/provider/db.hxx +++ b/xmlhelp/source/cxxhelp/provider/db.hxx @@ -34,7 +34,7 @@ #include <berkeleydb/db.h> #endif -#include "com/sun/star/ucb/XSimpleFileAccess2.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess3.hpp" #ifndef HAVE_CXX0X #define BOOST_NO_0X_HDR_TYPEINDEX @@ -123,7 +123,7 @@ namespace berkeleydbproxy { rtl::OUString m_aFileURL; StringToDataMap* m_pStringToDataMap; StringToValPosMap* m_pStringToValPosMap; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; com::sun::star::uno::Sequence< sal_Int8 > @@ -139,7 +139,7 @@ namespace berkeleydbproxy { //SimpleFileAccess requires file URLs as arguments. Passing file path may work but fails //for example when using long file paths on Windows, which start with "\\?\" DBHelp( const rtl::OUString& rFileURL, - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > xSFA ) + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > xSFA ) : m_aFileURL( rFileURL ) , m_pStringToDataMap( NULL ) , m_pStringToValPosMap( NULL ) diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx index a35da146b417..dc3bffdaf67c 100644 --- a/xmlhelp/source/treeview/tvread.hxx +++ b/xmlhelp/source/treeview/tvread.hxx @@ -43,7 +43,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/deployment/XPackage.hpp> -#include "com/sun/star/ucb/XSimpleFileAccess2.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess3.hpp" namespace treeview { @@ -358,7 +358,7 @@ namespace treeview { osl::Mutex m_aMutex; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess2 > m_xSFA; + com::sun::star::uno::Reference< com::sun::star::ucb::XSimpleFileAccess3 > m_xSFA; IteratorState m_eState; rtl::OUString m_aLanguage; |