diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 20:39:56 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 20:39:56 -0600 |
| commit | 722e27f05c29f2831bb8decc239da5243c6088f7 (patch) | |
| tree | 7826ab096fc6fddcb90a22d62d98d2ca5553185f /framework/source/fwe/xml/statusbarconfiguration.cxx | |
| parent | 305d2830e7e672c8bfc8affb0a4e304ab4c7e754 (diff) | |
merge non-conflicting changes in framework
Diffstat (limited to 'framework/source/fwe/xml/statusbarconfiguration.cxx')
| -rw-r--r-- | framework/source/fwe/xml/statusbarconfiguration.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 8f653f9f89..57c0500160 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,9 +46,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include <comphelper/processfactory.hxx> -#endif #include <unotools/streamwrap.hxx> #include <tools/debug.hxx> @@ -164,3 +163,4 @@ sal_Bool StatusBarConfiguration::StoreStatusBar( } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |