summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2012-08-12 18:45:53 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2012-08-12 18:45:53 +0200
commit6d29ad0d288fe73d92eaad950f72f1902d3d6d01 (patch)
tree234319442931b4361ec323af979166677064f2bb /dbaccess
parentc47988fcef166966b6d8b1b706399f2032e9465a (diff)
align code pieces to surrounding lines/style
Change-Id: I992fd490461ba499cba1007abd57285949d3a488
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/inc/DExport.hxx26
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx2
-rw-r--r--dbaccess/source/ui/inc/HtmlReader.hxx2
-rw-r--r--dbaccess/source/ui/inc/JoinExchange.hxx4
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx6
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx7
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx4
-rw-r--r--dbaccess/source/ui/inc/TableDesignControl.hxx3
-rw-r--r--dbaccess/source/ui/inc/TableDesignHelpBar.hxx5
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx10
10 files changed, 34 insertions, 35 deletions
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index e59b2cf00f3c..8eda75fe73e8 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -104,18 +104,18 @@ namespace dbaui
bool m_bAppendFirstLine;
- virtual sal_Bool CreateTable(int nToken) = 0;
+ virtual sal_Bool CreateTable(int nToken) = 0;
virtual TypeSelectionPageFactory
- getTypeSelectionPageFactory() = 0;
+ getTypeSelectionPageFactory() = 0;
- void CreateDefaultColumn(const ::rtl::OUString& _rColumnName);
- sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat);
- void adjustFormat();
- void eraseTokens();
- void insertValueIntoColumn();
- sal_Bool createRowSet();
- void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e);
- void ensureFormatter();
+ void CreateDefaultColumn(const ::rtl::OUString& _rColumnName);
+ sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat);
+ void adjustFormat();
+ void eraseTokens();
+ void insertValueIntoColumn();
+ sal_Bool createRowSet();
+ void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e);
+ void ensureFormatter();
/** executeWizard calls a wizard to create/append data
@@ -125,9 +125,9 @@ namespace dbaui
@return true when an error occurs
*/
- sal_Bool executeWizard( const ::rtl::OUString& _sTableName,
- const ::com::sun::star::uno::Any& _aTextColor,
- const ::com::sun::star::awt::FontDescriptor& _rFont);
+ sal_Bool executeWizard( const ::rtl::OUString& _sTableName,
+ const ::com::sun::star::uno::Any& _aTextColor,
+ const ::com::sun::star::awt::FontDescriptor& _rFont);
virtual ~ODatabaseExport();
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 8a56b0fab145..991a85a765b7 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -101,7 +101,7 @@ namespace dbaui
ScrollBar* m_pHorzScroll;
TOTypeInfoSP m_pPreviousType;
- sal_uInt16 nCurChildId;
+ sal_uInt16 nCurChildId;
short m_nPos;
XubString aYes;
XubString aNo;
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index fd58071080a4..a1c14f87419c 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -40,7 +40,7 @@ namespace dbaui
virtual void NextToken( int nToken ); // base class
virtual sal_Bool CreateTable(int nToken);
virtual TypeSelectionPageFactory
- getTypeSelectionPageFactory();
+ getTypeSelectionPageFactory();
void TableDataOn(SvxCellHorJustify& eVal);
void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor);
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 88d5c81c0265..e3c6678faf95 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -31,9 +31,7 @@ namespace dbaui
// OJoinExchObj: Additional data to create Joins in the JoinShell
typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel > OJoinExchObj_Base;
- class OJoinExchObj
- :public TransferableHelper
- ,public OJoinExchObj_Base
+ class OJoinExchObj : public TransferableHelper, public OJoinExchObj_Base
{
static String m_sJoinFormat;
sal_Bool m_bFirstEntry;
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index e6732da60f59..40aefffae6c7 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -72,9 +72,9 @@ namespace dbaui
};
- class OJoinTableView : public Window
- ,public IDragTransferableListener
- ,public DropTargetHelper
+ class OJoinTableView : public Window,
+ public IDragTransferableListener,
+ public DropTargetHelper
{
friend class OJoinMoveTabWinUndoAct;
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index 57f8e09c46c9..56c14ade13ee 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -27,9 +27,10 @@
namespace dbaui
{
class ORelationDesignView;
- class ORelationTableView : public ::cppu::BaseMutex
- , public OJoinTableView
- , public ::comphelper::OContainerListener
+
+ class ORelationTableView : public ::cppu::BaseMutex,
+ public OJoinTableView,
+ public ::comphelper::OContainerListener
{
OTableConnection* m_pExistingConnection; ///< is set when a connection was draged on an existing connection
TTableConnectionData::value_type m_pCurrentlyTabConnData; ///< set when we creating a connection with more than one keycolumn
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index c7c56eaa9ccc..bc084dba4373 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -53,7 +53,9 @@ namespace dbaui
OTableConnectionData& operator=( const OTableConnectionData& rConnData );
public:
OTableConnectionData();
- OTableConnectionData(const TTableWindowData::value_type& _pReferencingTable,const TTableWindowData::value_type& _pReferencedTable, const String& rConnName = String() );
+ OTableConnectionData( const TTableWindowData::value_type& _pReferencingTable,
+ const TTableWindowData::value_type& _pReferencedTable,
+ const String& rConnName = String() );
OTableConnectionData( const OTableConnectionData& rConnData );
virtual ~OTableConnectionData();
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index 31ae84504671..f93a9fde740d 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -29,8 +29,7 @@ namespace dbaui
{
class OTableDesignView;
- class OTableRowView : public ::svt::EditBrowseBox
- ,public IClipboardTest
+ class OTableRowView : public ::svt::EditBrowseBox, public IClipboardTest
{
friend class OTableDesignUndoAct;
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index f7d387690a8a..6b02354fcd3c 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -30,13 +30,12 @@ namespace dbaui
{
// Deriving from TabPage is a trick to notice changes
// of the system colors
- class OTableDesignHelpBar : public TabPage
- ,public IClipboardTest
+ class OTableDesignHelpBar : public TabPage, public IClipboardTest
{
private:
String m_sHelpText;
MultiLineEdit* m_pTextWin;
- sal_uInt16 m_nDummy;
+ sal_uInt16 m_nDummy;
protected:
virtual void Resize();
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 419abb68df9b..5bbb602c9785 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -135,11 +135,11 @@ namespace dbaui
inline sal_Bool OTableFieldDesc::IsEmpty() const
{
- sal_Bool bEmpty = (m_aTableName.isEmpty() &&
- m_aAliasName.isEmpty() &&
- m_aFieldName.isEmpty() &&
- m_aFieldAlias.isEmpty() &&
- m_aFunctionName.isEmpty() &&
+ sal_Bool bEmpty = (m_aTableName.isEmpty() &&
+ m_aAliasName.isEmpty() &&
+ m_aFieldName.isEmpty() &&
+ m_aFieldAlias.isEmpty() &&
+ m_aFunctionName.isEmpty() &&
!HasCriteria());
return bEmpty;
}