Skip to content

C
core
Kaydet (Commit) 5ffdd780 authored tarafından Philipp Riemer's avatar Philipp Riemer
Dosyalara gözat
Seçenekler

change indentation 

This is a follow-up patch of 401a454c.

Change-Id: Idf2c7da3e449dec1afcc0aa3683ea46c6172420a
üst 6d29ad0d
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 87 deletions
dbaccess/source/ui/inc/DExport.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -153,9 +153,9 @@ namespace dbaui ...@@ -153,9 +153,9 @@ namespace dbaui
SvStream& _rInputStream 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; virtual void release() = 0;
......
dbaccess/source/ui/inc/HtmlReader.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -66,8 +66,8 @@ namespace dbaui ...@@ -66,8 +66,8 @@ namespace dbaui
const OTypeInfoMap* _pInfoMap, const OTypeInfoMap* _pInfoMap,
sal_Bool _bAutoIncrementEnabled); sal_Bool _bAutoIncrementEnabled);
virtual SvParserState CallParser();// base class virtual SvParserState CallParser();// base class
virtual void release(); virtual void release();
///< @attention recovers only valid data if 1. CTOR has been used ///< @attention recovers only valid data if 1. CTOR has been used
}; };
......
dbaccess/source/ui/inc/JoinTableView.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -137,7 +137,7 @@ namespace dbaui ...@@ -137,7 +137,7 @@ namespace dbaui
virtual void RemoveTabWin( OTableWindow* pTabWin ); virtual void RemoveTabWin( OTableWindow* pTabWin );
// hide all TabWins (does NOT delete them; they are put in an UNDO action) // 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; virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) = 0;
...@@ -162,27 +162,27 @@ namespace dbaui ...@@ -162,27 +162,27 @@ namespace dbaui
*/ */
void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True); void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True);
sal_Bool ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars ); sal_Bool ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars );
sal_uLong GetTabWinCount(); sal_uLong GetTabWinCount();
Point GetScrollOffset() const { return m_aScrollOffset; } Point GetScrollOffset() const { return m_aScrollOffset; }
OJoinDesignView* getDesignView() const { return m_pView; } OJoinDesignView* getDesignView() const { return m_pView; }
OTableWindow* GetTabWindow( const String& rName ); OTableWindow* GetTabWindow( const String& rName );
OTableConnection* GetSelectedConn() { return m_pSelectedConn; } OTableConnection* GetSelectedConn() { return m_pSelectedConn; }
/** @note NULL is explicitly allowed (then no-op) */ /** @note NULL is explicitly allowed (then no-op) */
void DeselectConn(OTableConnection* pConn); void DeselectConn(OTableConnection* pConn);
void SelectConn(OTableConnection* pConn); void SelectConn(OTableConnection* pConn);
OTableWindowMap* GetTabWinMap() { return &m_aTableMap; } OTableWindowMap* GetTabWinMap() { return &m_aTableMap; }
const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; } const OTableWindowMap* GetTabWinMap() const { return &m_aTableMap; }
/** gives a read only access to the connection vector /** gives a read only access to the connection vector
*/ */
const ::std::vector<OTableConnection*>* getTableConnections() const { return &m_vTableConnection; } 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 /** search for all connections of a table
@param _pFromWin the table for which connections should be found @param _pFromWin the table for which connections should be found
...@@ -225,9 +225,9 @@ namespace dbaui ...@@ -225,9 +225,9 @@ namespace dbaui
virtual long PreNotify(NotifyEvent& rNEvt); virtual long PreNotify(NotifyEvent& rNEvt);
// DnD stuff // DnD stuff
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
/** @note can be used for special ui handling after d&d */ /** @note can be used for special ui handling after d&d */
virtual void lookForUiActivities(); virtual void lookForUiActivities();
...@@ -289,18 +289,18 @@ namespace dbaui ...@@ -289,18 +289,18 @@ namespace dbaui
/** determines whether the classes Init method should accept a query /** determines whether the classes Init method should accept a query
name, or only table names */ name, or only table names */
virtual bool allowQueries() const; virtual bool allowQueries() const;
/** called when init fails at the tablewindowdata because the m_xTable /** called when init fails at the tablewindowdata because the m_xTable
object could not provide columns, but no exception was thrown. object could not provide columns, but no exception was thrown.
Expected to throw. */ Expected to throw. */
virtual void onNoColumns_throw(); virtual void onNoColumns_throw();
virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const;
private: private:
void InitColors(); void InitColors();
sal_Bool ScrollWhileDragging(); sal_Bool ScrollWhileDragging();
/** opens the context menu to delate a connection /** opens the context menu to delate a connection
@param _aPos the position where the popup menu should appear @param _aPos the position where the popup menu should appear
......
dbaccess/source/ui/inc/QueryTableView.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -88,14 +88,14 @@ namespace dbaui ...@@ -88,14 +88,14 @@ namespace dbaui
void DropConnection(OQueryTableConnection* pConn); void DropConnection(OQueryTableConnection* pConn);
// show and hide TabWin (NOT create or delete) // show and hide TabWin (NOT create or delete)
sal_Bool ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend); sal_Bool ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend);
void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction); void HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction);
/// ensure visibility of TabWins (+ and invalidate connections) /// ensure visibility of TabWins (+ and invalidate connections)
virtual void EnsureVisible(const OTableWindow* _pWin); virtual void EnsureVisible(const OTableWindow* _pWin);
/// how many tables with a certain alias do I already have? /// 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) /// insert field (simply passed to parents)
void InsertField(const OTableFieldDescRef& rInfo); void InsertField(const OTableFieldDescRef& rInfo);
...@@ -114,7 +114,7 @@ namespace dbaui ...@@ -114,7 +114,7 @@ namespace dbaui
void NotifyTabConnection(const OQueryTableConnection& rNewConn, sal_Bool _bCreateUndoAction = sal_True); void NotifyTabConnection(const OQueryTableConnection& rNewConn, sal_Bool _bCreateUndoAction = sal_True);
/// @note the Handler receives a pointer to a TabWinsChangeNotification struct /// @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; sal_Bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const;
......
dbaccess/source/ui/inc/RelationTableView.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -32,11 +32,10 @@ namespace dbaui ...@@ -32,11 +32,10 @@ namespace dbaui
public OJoinTableView, public OJoinTableView,
public ::comphelper::OContainerListener 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 TTableConnectionData::value_type m_pCurrentlyTabConnData; ///< set when we creating a connection with more than one keycolumn
::rtl::Reference< comphelper::OContainerListenerAdapter> ::rtl::Reference< comphelper::OContainerListenerAdapter> m_pContainerListener;
m_pContainerListener; bool m_bInRemove;
bool m_bInRemove;
virtual void ConnDoubleClicked( OTableConnection* pConnection ); virtual void ConnDoubleClicked( OTableConnection* pConnection );
virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False); virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False);
......
dbaccess/source/ui/inc/TableDesignControl.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -49,15 +49,15 @@ namespace dbaui ...@@ -49,15 +49,15 @@ namespace dbaui
OTableRowView(Window* pParent); OTableRowView(Window* pParent);
virtual ~OTableRowView(); virtual ~OTableRowView();
virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 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 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 ::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 void SetControlText( long nRow, sal_uInt16 nColId, const String& rText ) = 0;
virtual String GetControlText( long nRow, sal_uInt16 nColId ) = 0; virtual String GetControlText( long nRow, sal_uInt16 nColId ) = 0;
virtual OTableDesignView* GetView() const = 0; virtual OTableDesignView* GetView() const = 0;
sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; } sal_uInt16 GetCurUndoActId(){ return m_nCurUndoActId; }
// IClipboardTest // IClipboardTest
virtual void cut(); virtual void cut();
......
dbaccess/source/ui/inc/TableFieldDescription.hxx
Dosyayı görüntüle @ 5ffdd780
...@@ -69,55 +69,54 @@ namespace dbaui ...@@ -69,55 +69,54 @@ namespace dbaui
OTableFieldDesc(const OTableFieldDesc& rRS); OTableFieldDesc(const OTableFieldDesc& rRS);
~OTableFieldDesc(); ~OTableFieldDesc();
inline sal_Bool IsEmpty() const; inline sal_Bool IsEmpty() const;
OTableFieldDesc& operator=( const OTableFieldDesc& _aField ); OTableFieldDesc& operator=( const OTableFieldDesc& _aField );
sal_Bool operator==( const OTableFieldDesc& rDesc ); sal_Bool operator==( const OTableFieldDesc& rDesc );
sal_Bool IsVisible() const { return m_bVisible;} sal_Bool IsVisible() const { return m_bVisible;}
sal_Bool IsGroupBy() const { return m_bGroupBy;} sal_Bool IsGroupBy() const { return m_bGroupBy;}
void SetVisible( sal_Bool bVis=sal_True ){ m_bVisible = bVis;} void SetVisible( sal_Bool bVis=sal_True ) { m_bVisible = bVis; }
void SetGroupBy( sal_Bool bGb=sal_False ){ m_bGroupBy = bGb;} void SetGroupBy( sal_Bool bGb=sal_False ) { m_bGroupBy = bGb; }
void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin;} void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; }
void SetField( const ::rtl::OUString& rF ){ m_aFieldName = rF;} void SetField( const ::rtl::OUString& rF ) { m_aFieldName = rF; }
void SetFieldAlias( const ::rtl::OUString& rF ){ m_aFieldAlias = rF;} void SetFieldAlias( const ::rtl::OUString& rF ) { m_aFieldAlias = rF; }
void SetTable( const ::rtl::OUString& rT ){ m_aTableName = rT;} void SetTable( const ::rtl::OUString& rT ) { m_aTableName = rT; }
void SetAlias( const ::rtl::OUString& rT ){ m_aAliasName = rT;} void SetAlias( const ::rtl::OUString& rT ) { m_aAliasName = rT; }
void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT;} void SetFunction( const ::rtl::OUString& rT ) { m_aFunctionName = rT; }
void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; } void SetOrderDir( EOrderDir eDir ) { m_eOrderDir = eDir; }
void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; } void SetDataType( sal_Int32 eTyp ) { m_eDataType = eTyp; }
void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; } void SetFieldType( ETableFieldType eTyp ) { m_eFieldType = eTyp; }
void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit); void SetCriteria( sal_uInt16 nIdx, const ::rtl::OUString& rCrit );
void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; } void SetColWidth( sal_Int32 nWidth ) { m_nColWidth = nWidth; }
void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; } void SetFieldIndex( sal_Int32 nFieldIndex ) { m_nIndex = nFieldIndex; }
void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; } void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; }
void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; } void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; }
::rtl::OUString GetField() const { return m_aFieldName;}
::rtl::OUString GetField() const { return m_aFieldName;} ::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;}
::rtl::OUString GetFieldAlias() const { return m_aFieldAlias;} ::rtl::OUString GetTable() const { return m_aTableName;}
::rtl::OUString GetTable() const { return m_aTableName;} ::rtl::OUString GetAlias() const { return m_aAliasName;}
::rtl::OUString GetAlias() const { return m_aAliasName;} ::rtl::OUString GetFunction() const { return m_aFunctionName;}
::rtl::OUString GetFunction() const { return m_aFunctionName;} sal_Int32 GetDataType() const { return m_eDataType; }
sal_Int32 GetDataType() const { return m_eDataType; } ETableFieldType GetFieldType() const { return m_eFieldType; }
ETableFieldType GetFieldType() const { return m_eFieldType; } EOrderDir GetOrderDir() const { return m_eOrderDir; }
EOrderDir GetOrderDir() const { return m_eOrderDir; } ::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const;
::rtl::OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; }
sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; }
sal_Int32 GetFieldIndex() const { return m_nIndex; } Window* GetTabWindow() const { return m_pTabWindow;}
Window* GetTabWindow() const { return m_pTabWindow;} sal_Int32 GetFunctionType() const { return m_eFunctionType; }
sal_Int32 GetFunctionType() const { return m_eFunctionType; } sal_uInt16 GetColumnId() const { return m_nColumnId;}
sal_uInt16 GetColumnId() const { return m_nColumnId;}
inline sal_Bool isAggreateFunction() const { return (m_eFunctionType & FKT_AGGREGATE) == FKT_AGGREGATE; }
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 isOtherFunction() const { return (m_eFunctionType & FKT_OTHER) == FKT_OTHER; } inline sal_Bool isNumeric() const { return (m_eFunctionType & FKT_NUMERIC) == FKT_NUMERIC; }
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 isNoneFunction() const { return m_eFunctionType == FKT_NONE; } inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; }
inline sal_Bool isCondition() const { return (m_eFunctionType & FKT_CONDITION) == FKT_CONDITION; } inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }
inline sal_Bool isNumericOrAggreateFunction() const { return isNumeric() || isAggreateFunction(); }
sal_Bool HasCriteria() const
sal_Bool HasCriteria() const
{ {
::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin(); ::std::vector< ::rtl::OUString>::const_iterator aIter = m_aCriteria.begin();
::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end(); ::std::vector< ::rtl::OUString>::const_iterator aEnd = m_aCriteria.end();
...@@ -144,8 +143,8 @@ namespace dbaui ...@@ -144,8 +143,8 @@ namespace dbaui
return bEmpty; return bEmpty;
} }
typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef;
typedef ::std::vector<OTableFieldDescRef> OTableFields; typedef ::std::vector<OTableFieldDescRef> OTableFields;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment