diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:27:37 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:27:37 -0600 |
commit | 8cc8ec8b94a36300a3f037885462e06a7749b36f (patch) | |
tree | e6c68e506d6215be069be9e7d95bcf957f3430d3 /connectivity/source/inc/java/sql/SQLWarning.hxx | |
parent | cf109aacb26616e1cff76a7c0983fe5dfcd81b2a (diff) |
merge non-conflicting changes to connectivity
Diffstat (limited to 'connectivity/source/inc/java/sql/SQLWarning.hxx')
-rw-r--r-- | connectivity/source/inc/java/sql/SQLWarning.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx index a5591b525f..8026d0ac5f 100644 --- a/connectivity/source/inc/java/sql/SQLWarning.hxx +++ b/connectivity/source/inc/java/sql/SQLWarning.hxx @@ -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. @@ -29,9 +30,6 @@ #define _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_ #include "java/sql/SQLException.hxx" -//#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ -//#include <com/sun/star/sdbc/SQLWarning.hpp> -//#endif namespace connectivity { @@ -62,3 +60,4 @@ namespace connectivity } #endif // _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |