[Libreoffice-commits] core.git: unoidl/source

Stephan Bergmann sbergman at redhat.com
Thu Sep 19 03:41:33 PDT 2013


 unoidl/source/sourcetreeprovider.cxx |   77 +++++++++++++++++------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

New commits:
commit 9960535bf562e91c19e119cbbcbefe07ac6ddb39
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 19 12:41:12 2013 +0200

    Fix indentation
    
    Change-Id: I7814547ef29ec728a5a815196427b661bf285256

diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx
index 850e983..2cfe938 100755
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -39,45 +39,44 @@ namespace {
 // osl_FileStatus_Mask_Validate):
 OUString getFileName(OUString const & uri, osl::FileStatus & status) {
 #if defined MACOSX
-     sal_Int32 i = uri.lastIndexOf('/') + 1;
-     OUString path;
-     if (osl::FileBase::getSystemPathFromFileURL(uri.copy(0, i), path)
-         != osl::FileBase::E_None)
-     {
-         SAL_WARN(
-             "unoidl",
-             "cannot getSystemPathFromFileURL(" << uri.copy(0, i) << ")");
-         return status.getFileName();
-     }
-     OString dir(OUStringToOString(path, osl_getThreadTextEncoding()));
-     OString name(OUStringToOString(uri.copy(i), osl_getThreadTextEncoding()));
-     DIR * d = opendir(dir.getStr());
-     if (d == 0) {
-         SAL_WARN("unoidl", "cannot opendir(" << dir << ")");
-         return status.getFileName();
-     }
-     for (;;) {
-         dirent ent;
-         dirent * p;
-         int e = readdir_r(d, &ent, &p);
-         if (e != 0) {
-             SAL_WARN("unoidl", "cannot readdir_r");
-             closedir(d);
-             return status.getFileName();
-         }
-         if (p == 0) {
-             SAL_WARN(
-                 "unoidl", "cannot find " << name << " via readdir of " << dir);
-             closedir(d);
-             return status.getFileName();
-         }
-         if (name.equalsIgnoreAsciiCase(p->d_name)) {
-             closedir(d);
-             return OUString(
-                 p->d_name, std::strlen(p->d_name),
-                 osl_getThreadTextEncoding());
-         }
-     }
+    sal_Int32 i = uri.lastIndexOf('/') + 1;
+    OUString path;
+    if (osl::FileBase::getSystemPathFromFileURL(uri.copy(0, i), path)
+        != osl::FileBase::E_None)
+    {
+        SAL_WARN(
+            "unoidl",
+            "cannot getSystemPathFromFileURL(" << uri.copy(0, i) << ")");
+        return status.getFileName();
+    }
+    OString dir(OUStringToOString(path, osl_getThreadTextEncoding()));
+    OString name(OUStringToOString(uri.copy(i), osl_getThreadTextEncoding()));
+    DIR * d = opendir(dir.getStr());
+    if (d == 0) {
+        SAL_WARN("unoidl", "cannot opendir(" << dir << ")");
+        return status.getFileName();
+    }
+    for (;;) {
+        dirent ent;
+        dirent * p;
+        int e = readdir_r(d, &ent, &p);
+        if (e != 0) {
+            SAL_WARN("unoidl", "cannot readdir_r");
+            closedir(d);
+            return status.getFileName();
+        }
+        if (p == 0) {
+            SAL_WARN(
+                "unoidl", "cannot find " << name << " via readdir of " << dir);
+            closedir(d);
+            return status.getFileName();
+        }
+        if (name.equalsIgnoreAsciiCase(p->d_name)) {
+            closedir(d);
+            return OUString(
+                p->d_name, std::strlen(p->d_name), osl_getThreadTextEncoding());
+        }
+    }
 #else
     (void) uri;
     return status.getFileName();


More information about the Libreoffice-commits mailing list