diff options
| author | Vishv Brahmbhatt <vishvbrahmbhatt19@gmail.com> | 2013-09-11 00:44:36 +0530 |
|---|---|---|
| committer | Thorsten Behrens <thb@documentfoundation.org> | 2013-09-13 14:26:39 +0000 |
| commit | 6fc6494aa9fea0b47fbf048998d7bd412ef478b1 (patch) | |
| tree | 4c377bee5774dceec6aa6c43f36644d3fde72a28 /include | |
| parent | Related: fdo#38838 remove UniString::ToLowerAscii (diff) | |
| download | core-6fc6494aa9fea0b47fbf048998d7bd412ef478b1.tar.gz core-6fc6494aa9fea0b47fbf048998d7bd412ef478b1.zip | |
Using macro expansion function for the remaining config entries.
Macro Expansion function is used in 'CustomAnimationPreset.cxx'
& 'TransitionPreset.cxx' to avoid code redundancy.Also appropriate
changes are to made to 'getExpandedFilePath' function.
Change-Id: I6b6ae068db3499fe2de2e78a884f9e0737577651
Reviewed-on: https://gerrit.libreoffice.org/5910
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/expandmacro.hxx | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/comphelper/expandmacro.hxx b/include/comphelper/expandmacro.hxx index efd255249aa2..d699a1aaf94b 100644 --- a/include/comphelper/expandmacro.hxx +++ b/include/comphelper/expandmacro.hxx @@ -29,29 +29,8 @@ namespace comphelper @param path to operate on. Both system file path and file URIs are accepted. - @return macro-expanded system file path. + @return macro-expanded file URI. */ COMPHELPER_DLLPUBLIC rtl::OUString getExpandedFilePath(const rtl::OUString& filepath); - - /** - A helper function to get expanded version of macro for filepaths. - - If the given path is prefixed by "vnd.sun.star.expand:", this - function substitutes contained macro references. It then always - returns a system file path, if necessary converting file - URIs. Example: - vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR gets - converted to e.g. /usr/lib64/libreoffice/share. - - Use this version if you have a local reference of a component - context at hand, saves us the extra lookup. - - @param path to operate on. Both system file path and file URIs are accepted. - @param xContext refers to the component context of the process. - - @return macro-expanded system file path. - */ - COMPHELPER_DLLPUBLIC rtl::OUString getExpandedFilePath(const rtl::OUString& filepath, - const ::com::sun::star::uno::Reference<css::uno::XComponentContext>& xContext); } #endif |