summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2012-08-12 18:48:35 +0200
committerPhilipp Riemer <ruderphilipp@gmail.com>2012-08-12 18:48:35 +0200
commit5ffdd7803d302f240e749750d92dc36fe23ae9a5 (patch)
tree4560d8849eab3614d7e63d3450e3607f79b89024 /dbaccess
parent6d29ad0d288fe73d92eaad950f72f1902d3d6d01 (diff)
change indentation
This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: Idf2c7da3e449dec1afcc0aa3683ea46c6172420a
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/inc/DExport.hxx4
-rw-r--r--dbaccess/source/ui/inc/HtmlReader.hxx4
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx38
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx8
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx7
-rw-r--r--dbaccess/source/ui/inc/TableDesignControl.hxx10
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx101
7 files changed, 85 insertions, 87 deletions
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 8eda75fe73e8..e1c4068b8b05 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -153,9 +153,9 @@ namespace dbaui
SvStream& _rInputStream
);
- void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);
+ void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap* _pInfoMap);
- inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
+ inline void SetTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName ; }
virtual void release() = 0;
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index a1c14f87419c..f00d25c0b76a 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -66,8 +66,8 @@ namespace dbaui
const OTypeInfoMap* _pInfoMap,
sal_Bool _bAutoIncrementEnabled);
- virtual SvParserState CallParser();// base class
- virtual void release();
+ virtual SvParserState CallParser();// base class
+ virtual void release();
///< @attention recovers only valid data if 1. CTOR has been used
};
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 40aefffae6c7..e55409502364 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -137,7 +137,7 @@ namespace dbaui
virtual void RemoveTabWin( OTableWindow* pTabWin );
// hide all TabWins (does NOT delete them; they are put in an UNDO action)
- virtual void HideTabWins();
+ virtual void HideTabWins();
virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0;
@@ -162,27 +162,27 @@ namespace dbaui
*/
void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True);
- sal_Bool ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars );
- sal_uLong GetTabWinCount();
- Point GetScrollOffset() const { return m_aScrollOffset; }
+ sal_Bool ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars );
+ sal_uLong GetTabWinCount();
+ Point GetScrollOffset() const { return m_aScrollOffset; }
- OJoinDesignView* getDesignView() const { return m_pView; }
- OTableWindow* GetTabWindow( const String& rName );
+ OJoinDesignView* getDesignView() const { return m_pView; }
+ OTableWindow* GetTabWindow( const String& rName );
- OTableConnection* GetSelectedConn() { return m_pSelectedConn; }
+ OTableConnection* GetSelectedConn() { return m_pSelectedConn; }
/** @note NULL is explicitly allowed (then no-op) */
- void DeselectConn(OTableConnection* pConn);
- void SelectConn(OTableConnection* pConn);
+ void DeselectConn(OTableConnection* pConn);
+ void SelectConn(OTableConnection* pConn);
- OTableWindowMap* GetTabWinMap() { return &m_aTableMap; }
- const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; }
+ OTableWindowMap* GetTabWinMap() { return &m_aTableMap; }
+ const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; }
/** gives a read only access to the connection vector
*/
const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; }
+ sal_Bool ExistsAConn(const OTableWindow* pFromWin) const;
- sal_Bool ExistsAConn(const OTableWindow* pFromWin) const;
/** search for all connections of a table
@param _pFromWin the table for which connections should be found
@@ -225,9 +225,9 @@ namespace dbaui
virtual long PreNotify(NotifyEvent& rNEvt);
// DnD stuff
- virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
/** @note can be used for special ui handling after d&d */
virtual void lookForUiActivities();
@@ -289,18 +289,18 @@ namespace dbaui
/** determines whether the classes Init method should accept a query
name, or only table names */
- virtual bool allowQueries() const;
+ virtual bool allowQueries() const;
/** called when init fails at the tablewindowdata because the m_xTable
object could not provide columns, but no exception was thrown.
Expected to throw. */
- virtual void onNoColumns_throw();
+ virtual void onNoColumns_throw();
virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const;
private:
- void InitColors();
- sal_Bool ScrollWhileDragging();
+ void InitColors();
+ sal_Bool ScrollWhileDragging();
/** opens the context menu to delate a connection
@param _aPos the position where the popup menu should appear
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index 1f1f7ce18ea2..ee7403f176d7 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -88,14 +88,14 @@ namespace dbaui
void DropConnection(OQueryTableConnection* pConn);
// show and hide TabWin (NOT create or delete)
- sal_Bool ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend);
- void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction);
+ sal_Bool ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend);
+ void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction);
/// ensure visibility of TabWins (+ and invalidate connections)
virtual void EnsureVisible(const OTableWindow* _pWin);
/// how many tables with a certain alias do I already have?
- sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax);
+ sal_Int32 CountTableAlias(const String& rName, sal_Int32& rMax);
/// insert field (simply passed to parents)
void InsertField(const OTableFieldDescRef& rInfo);
@@ -114,7 +114,7 @@ namespace dbaui
void NotifyTabConnection(const OQueryTableConnection& rNewConn, sal_Bool _bCreateUndoAction = sal_True);
/// @note the Handler receives a pointer to a TabWinsChangeNotification struct
- Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; }
+ Link SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; }
sal_Bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const;
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index 56c14ade13ee..50511b09c0da 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -32,11 +32,10 @@ namespace dbaui
public OJoinTableView,
public ::comphelper::OContainerListener
{
- OTableConnection* m_pExistingConnection; ///< is set when a connection was draged on an existing connection
+ 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
- ::rtl::Reference< comphelper::OContainerListenerAdapter>
- m_pContainerListener;
- bool m_bInRemove;
+ ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener;
+ bool m_bInRemove;
virtual void ConnDoubleClicked( OTableConnection* pConnection );
virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False);
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index f93a9fde740d..5aae3c55deeb 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -49,15 +49,15 @@ namespace dbaui
OTableRowView(Window* pParent);
virtual ~OTableRowView();
- virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
- virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0;
+ virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
+ virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0;
virtual ::com::sun::star::uno::Any GetCellData( long nRow, sal_uInt16 nColId ) = 0;
- virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ) = 0;
- virtual String GetControlText( long nRow, sal_uInt16 nColId ) = 0;
+ virtual void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ) = 0;
+ virtual String GetControlText( long nRow, sal_uInt16 nColId ) = 0;
virtual OTableDesignView* GetView() const = 0;
- sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; }
+ sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; }
// IClipboardTest
virtual void cut();
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 5bbb602c9785..0ab1a19be4d9 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -69,55 +69,54 @@ namespace dbaui
OTableFieldDesc(const OTableFieldDesc& rRS);
~OTableFieldDesc();
- inline sal_Bool IsEmpty() const;
-
- OTableFieldDesc& operator=( const OTableFieldDesc& _aField );
- sal_Bool operator==( const OTableFieldDesc& rDesc );
-
- sal_Bool IsVisible() const { return m_bVisible;}
- sal_Bool IsGroupBy() const { return m_bGroupBy;}
-
- void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;}
- void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;}
- void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;}
- void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;}
- void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;}
- void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;}
- void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;}
- void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;}
- void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; }
- void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; }
- void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; }
- void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit);
- void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; }
- void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; }
- void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; }
- void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; }
-
-
- ::rtl::OUString GetField() const { return m_aFieldName;}
- ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;}
- ::rtl::OUString GetTable() const { return m_aTableName;}
- ::rtl::OUString GetAlias() const { return m_aAliasName;}
- ::rtl::OUString GetFunction() const { return m_aFunctionName;}
- sal_Int32 GetDataType() const { return m_eDataType; }
- ETableFieldType GetFieldType() const { return m_eFieldType; }
- EOrderDir GetOrderDir() const { return m_eOrderDir; }
- ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const;
- sal_Int32 GetColWidth() const { return m_nColWidth; }
- sal_Int32 GetFieldIndex() const { return m_nIndex; }
- Window* GetTabWindow() const { return m_pTabWindow;}
- sal_Int32 GetFunctionType() const { return m_eFunctionType; }
- sal_uInt16 GetColumnId() const { return m_nColumnId;}
-
- inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; }
- inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; }
- inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; }
- inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; }
- inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; }
- inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }
-
- sal_Bool HasCriteria() const
+ inline sal_Bool IsEmpty() const;
+
+ OTableFieldDesc& operator=( const OTableFieldDesc& _aField );
+ sal_Bool operator==( const OTableFieldDesc& rDesc );
+
+ sal_Bool IsVisible() const { return m_bVisible;}
+ sal_Bool IsGroupBy() const { return m_bGroupBy;}
+
+ void SetVisible( sal_Bool bVis=sal_True ) { m_bVisible = bVis; }
+ void SetGroupBy( sal_Bool bGb=sal_False ) { m_bGroupBy = bGb; }
+ void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; }
+ void SetField( const ::rtl::OUString& rF ) { m_aFieldName = rF; }
+ void SetFieldAlias( const ::rtl::OUString& rF ) { m_aFieldAlias = rF; }
+ void SetTable( const ::rtl::OUString& rT ) { m_aTableName = rT; }
+ void SetAlias( const ::rtl::OUString& rT ) { m_aAliasName = rT; }
+ void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT; }
+ void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; }
+ void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; }
+ void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; }
+ void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit );
+ void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; }
+ void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; }
+ void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; }
+ void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; }
+
+ ::rtl::OUString GetField() const { return m_aFieldName;}
+ ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;}
+ ::rtl::OUString GetTable() const { return m_aTableName;}
+ ::rtl::OUString GetAlias() const { return m_aAliasName;}
+ ::rtl::OUString GetFunction() const { return m_aFunctionName;}
+ sal_Int32 GetDataType() const { return m_eDataType; }
+ ETableFieldType GetFieldType() const { return m_eFieldType; }
+ EOrderDir GetOrderDir() const { return m_eOrderDir; }
+ ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const;
+ sal_Int32 GetColWidth() const { return m_nColWidth; }
+ sal_Int32 GetFieldIndex() const { return m_nIndex; }
+ Window* GetTabWindow() const { return m_pTabWindow;}
+ sal_Int32 GetFunctionType() const { return m_eFunctionType; }
+ sal_uInt16 GetColumnId() const { return m_nColumnId;}
+
+ inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; }
+ inline sal_Bool isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; }
+ inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; }
+ inline sal_Bool isNoneFunction() const { return m_eFunctionType == FKT_NONE; }
+ inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; }
+ inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }
+
+ sal_Bool HasCriteria() const
{
::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin();
::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end();
@@ -144,8 +143,8 @@ namespace dbaui
return bEmpty;
}
- typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef;
- typedef ::std::vector<OTableFieldDescRef> OTableFields;
+ typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef;
+ typedef ::std::vector<OTableFieldDescRef> OTableFields;
}
#endif