[Libreoffice-commits] .: 2 commits - sal/inc

Will Thompson wjt at kemper.freedesktop.org
Thu Mar 22 09:54:37 PDT 2012


 sal/inc/rtl/bootstrap.h   |    8 ++++----
 sal/inc/rtl/bootstrap.hxx |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit cb9e45382f2c36ac9e746eab3f03b37515935530
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Mar 22 16:53:43 2012 +0000

    Clarify rtl_bootstrap_get documentation.

diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 46e7323..9070569 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -118,8 +118,8 @@ extern "C" {
 
     <p>
     Must be called before rtl_bootstrap_get(). May not be called twice.
-    If it is never called, a the filename executable.ini (win)
-    or execuablerc (unx) is assumed.
+    If it is never called, the filename is based on the name of the executable,
+    with the suffix ".ini" on Windows or "rc" on Unix.
 
     @param pFileUri URL of the ini file; must not be null, must not be the empty
     string
commit 8077dbeeb2965f1a9e7477906287240f9fcd4c35
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Mar 22 09:57:36 2012 +0000

    rtl::bootstap: rename filename parameter to contain "uri"

diff --git a/sal/inc/rtl/bootstrap.h b/sal/inc/rtl/bootstrap.h
index 3f89bde..46e7323 100644
--- a/sal/inc/rtl/bootstrap.h
+++ b/sal/inc/rtl/bootstrap.h
@@ -121,10 +121,10 @@ extern "C" {
     If it is never called, a the filename executable.ini (win)
     or execuablerc (unx) is assumed.
 
-    @param pName URL of the ini file; must not be null, must not be the empty
+    @param pFileUri URL of the ini file; must not be null, must not be the empty
     string
 */
-SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pName )
+SAL_DLLPUBLIC void SAL_CALL rtl_bootstrap_setIniFileName( rtl_uString *pFileUri )
     SAL_THROW_EXTERN_C();
 
 /**
diff --git a/sal/inc/rtl/bootstrap.hxx b/sal/inc/rtl/bootstrap.hxx
index 60ad350..789c17c 100644
--- a/sal/inc/rtl/bootstrap.hxx
+++ b/sal/inc/rtl/bootstrap.hxx
@@ -41,9 +41,9 @@ namespace rtl
 
     public:
         /**
-           @see rtl_bootstrap_setIniFileName()
+         * @see rtl_bootstrap_setIniFileName()
          */
-        static inline void SAL_CALL setIniFilename( const ::rtl::OUString &sFile );
+        static inline void SAL_CALL setIniFilename( const ::rtl::OUString &sFileUri );
 
         /** Retrieves a bootstrap parameter
            @param sName name of the bootstrap value. case insensitive.


More information about the Libreoffice-commits mailing list