diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2009-12-29 14:58:42 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2009-12-29 14:58:42 -0500 |
commit | 6f9c94e026de8d62c424da7c7fca80996b92c469 (patch) | |
tree | 106d097c35450dee5868da3fb2350101a5251a7b | |
parent | 447e2d88b800a5877594e4acfe44f9554412efd5 (diff) |
Sorted headers etc.
-rw-r--r-- | source/global.cxx | 18 | ||||
-rw-r--r-- | source/main.cxx | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/source/global.cxx b/source/global.cxx index 47fa340..3f97efe 100644 --- a/source/global.cxx +++ b/source/global.cxx @@ -4,26 +4,26 @@ #include "rtl/ustring.hxx" #include "rtl/textenc.h" +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/frame/XComponentLoader.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> -#include <cstring> #include <cstdlib> +#include <cstring> #include <iostream> using ::com::sun::star::beans::PropertyValue; -using ::com::sun::star::frame::XDesktop; using ::com::sun::star::frame::XComponentLoader; -using ::com::sun::star::sheet::XSpreadsheetDocument; -using ::com::sun::star::uno::XComponentContext; -using ::com::sun::star::lang::XMultiComponentFactory;; +using ::com::sun::star::frame::XDesktop; using ::com::sun::star::lang::XComponent;; -using ::com::sun::star::uno::UNO_QUERY_THROW; +using ::com::sun::star::lang::XMultiComponentFactory;; +using ::com::sun::star::sheet::XSpreadsheetDocument; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; +using ::com::sun::star::uno::UNO_QUERY_THROW; +using ::com::sun::star::uno::XComponentContext; using ::rtl::OUString; using namespace ::std; diff --git a/source/main.cxx b/source/main.cxx index 2357d7e..34d9369 100644 --- a/source/main.cxx +++ b/source/main.cxx @@ -1,25 +1,25 @@ #include "global.hxx" -#include <iostream> +#include <algorithm> #include <cstdlib> +#include <iostream> #include <string> #include <vector> -#include <algorithm> #include <unistd.h> #include <dirent.h> #include <sys/stat.h> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/util/XCloseable.hpp> -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::frame::XDesktop; using ::com::sun::star::lang::DisposedException; using ::com::sun::star::sheet::XSpreadsheetDocument; +using ::com::sun::star::uno::Reference; +using ::com::sun::star::uno::UNO_QUERY_THROW; using ::rtl::OUString; using namespace ::com::sun::star; @@ -86,7 +86,7 @@ public: { cout << "loading " << rtl::OUStringToOString(r, RTL_TEXTENCODING_UTF8).getStr() << endl; Reference<XSpreadsheetDocument> xDoc = loadComponent(mxDesktop, r); - sleep(1); + sleep(2); Reference<util::XCloseable> xCloseable(xDoc, UNO_QUERY_THROW); xCloseable->close(true); } @@ -120,6 +120,10 @@ int main() } catch (const uno::Exception&) { - error("exception caught"); + error("generic UNO exception"); + } + catch (const ::std::exception& e) + { + error(e.what()); } } |