[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cppuhelper/source

Michael Meeks michael at kemper.freedesktop.org
Wed Dec 7 06:42:04 PST 2011


 cppuhelper/source/bootstrap.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 7713d3378d8aa7da1855adbeb885ac2c3b79a623
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed Dec 7 14:38:16 2011 +0000

    ignore backup files in services/ directory to avoid debugging grief

diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 8217ee7..399af07 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -289,6 +289,13 @@ Reference< registry::XSimpleRegistry > readRdbDirectory(
                  url),
                 css::uno::Reference< css::uno::XInterface >());
         }
+        rtl::OUString aName = stat.getFileName();
+
+        // Ignore backup files - to allow people to edit their
+        // services/ without extremely confusing behaviour
+        if (aName.toChar() == '.' || aName.endsWithAsciiL("~", 1))
+            continue;
+
         if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks
             last = readRdbFile(
                 stat.getFileURL(), fatalErrors, last, simpleRegistryFactory,


More information about the Libreoffice-commits mailing list