diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
| commit | 3491b4ac4fe34cacea5f4d0a4594d4a88cbbe7b2 (patch) | |
| tree | 8dc60b794b88dd87c965d149c93fa3ac81e3096c /unotools/inc | |
| parent | 66e7dc1197e76e686ba731382d032a9a72849959 (diff) | |
| parent | 95f71183414a50d12cd4bbacf47d711672e63268 (diff) | |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'unotools/inc')
| -rw-r--r-- | unotools/inc/unotools/configpathes.hxx | 6 | ||||
| -rw-r--r-- | unotools/inc/unotools/ucbhelper.hxx | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpathes.hxx index c2d99bb54343..f170d84184d6 100644 --- a/unotools/inc/unotools/configpathes.hxx +++ b/unotools/inc/unotools/configpathes.hxx @@ -76,6 +76,9 @@ namespace utl If this is not a valid configuration path, it is interpreted as a single name of a node. + @param _sOutPath + If non-null, contains the remainder of the path upon return. + @returns The plain (non-escaped) name of the node that is the first step when traversing <var>_sInPath</var>.<BR/> @@ -83,7 +86,8 @@ namespace utl configuration path, it is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath(::rtl::OUString const& _sInPath); + UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath( + ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0); //---------------------------------------------------------------------------- /** check whether a path is to a nested node with respect to a parent path. diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 6ac62d201171..4e38b465b1a8 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -80,6 +80,7 @@ namespace utl static sal_Bool FindInPath( const String& rPath, const String& rName, String& rFile, char cDelim = ';', sal_Bool bAllowWildCards = sal_True ); static sal_Bool Find( const String& rFolder, const String& rName, String& rFile, sal_Bool bAllowWildCards = sal_False ); static sal_Bool IsSubPath( const ::rtl::OUString& rPath, const ::rtl::OUString& rChildCandidate, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >& xContentProvider = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider >() ); + static sal_Bool EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL ); }; } |