dbaccess/source/ui/inc/DExport.hxx | 37 +++---- dbaccess/source/ui/inc/FieldDescControl.hxx | 11 -- dbaccess/source/ui/inc/HtmlReader.hxx | 15 -- dbaccess/source/ui/inc/JoinExchange.hxx | 13 -- dbaccess/source/ui/inc/JoinTableView.hxx | 72 +++++++------- dbaccess/source/ui/inc/QEnumTypes.hxx | 4 dbaccess/source/ui/inc/QueryTableView.hxx | 18 +-- dbaccess/source/ui/inc/RelationTableView.hxx | 17 +-- dbaccess/source/ui/inc/RtfReader.hxx | 4 dbaccess/source/ui/inc/TableConnection.hxx | 3 dbaccess/source/ui/inc/TableConnectionData.hxx | 22 +--- dbaccess/source/ui/inc/TableDesignControl.hxx | 19 +-- dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 8 - dbaccess/source/ui/inc/TableFieldDescription.hxx | 117 +++++++++++------------ 14 files changed, 170 insertions(+), 190 deletions(-)
New commits: commit 6bf0ea22d6198def6b59f45a93960842a3198bf9 Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Aug 12 18:55:05 2012 +0200 formatted a missed comment into doxygen style This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: I33d995fd195b6f40644ce124de2578bde7a2c85c diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index e554095..8c97240 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -232,13 +232,18 @@ namespace dbaui /** @note can be used for special ui handling after d&d */ virtual void lookForUiActivities(); - /// called after moving/resizing TabWins - /// (the standard implementation just passes the new data to the Wins) + /** Hook that is called after moving/resizing TabWins + + The position is 'virtual': the container has a virtual area of + which only a part - changeable by scroll bar - is visible. + Therefore: ptOldPosition is always positive, even if it represents + a point with a negative physical ordinate above the visible area + + @note The standard implementation just passes the new data to the + Wins + */ virtual void TabWinMoved(OTableWindow* ptWhich, const Point& ptOldPosition); - // the position is 'virtual': the container has a virtual area - // of which only a part - changeable by scroll bar - is visible - // therefore: ptOldPosition is always positive, even if it represents - // a point with a negative physical ordinate above the visible area + virtual void TabWinSized(OTableWindow* ptWhich, const Point& ptOldPosition, const Size& szOldSize); void modified(); commit 5ffdd7803d302f240e749750d92dc36fe23ae9a5 Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Aug 12 18:48:35 2012 +0200 change indentation This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: Idf2c7da3e449dec1afcc0aa3683ea46c6172420a diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 8eda75f..e1c4068 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 a1c14f8..f00d25c 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 40aefff..e554095 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 1f1f7ce..ee7403f 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 56c14ad..50511b0 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 f93a9fd..5aae3c5 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 5bbb602..0ab1a19 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 commit 6d29ad0d288fe73d92eaad950f72f1902d3d6d01 Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Aug 12 18:45:53 2012 +0200 align code pieces to surrounding lines/style Change-Id: I992fd490461ba499cba1007abd57285949d3a488 diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index e59b2cf..8eda75f 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 8a56b0f..991a85a 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 fd58071..a1c14f8 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 88d5c81..e3c6678 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 e6732da..40aefff 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 57f8e09..56c14ad 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 c7c56ea..bc084db 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 31ae845..f93a9fd 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 f7d3876..6b02354 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 419abb6..5bbb602 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; } commit c47988fcef166966b6d8b1b706399f2032e9465a Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Aug 12 18:41:59 2012 +0200 Reformatted existing comments This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: If7739768ee0f90c6beb71cb56843fbbc98947873 diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 5ec0730..8a56b0f 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -120,7 +120,7 @@ namespace dbaui DECL_LINK( FormatClickHdl, Button * ); DECL_LINK( ChangeHdl, ListBox * ); - // used by ActivatePropertyField + // used by ActivatePropertyField DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index b902413..e6732da 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -45,7 +45,8 @@ namespace dbaui class OTableWindowData; class OJoinDesignViewAccess; - // this class conatins only the scrollbars to avoid that the tablewindows clip the scrollbars + // this class conatins only the scrollbars to avoid that + // the tablewindows clip the scrollbars class OJoinTableView; class OScrollWindowHelper : public Window { diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index eaab16e..c7c56ea 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -28,12 +28,12 @@ namespace dbaui { - //================================================================== - // ConnData ---------->* ConnLineData - // ^1 ^1 - // | | - // Conn ---------->* ConnLine - //================================================================== + //===========================================// + // ConnData ---------->* ConnLineData // + // ^1 ^1 // + // | | // + // Conn ---------->* ConnLine // + //===========================================// /** Contains all connection data which exists between two windows */ class OTableConnectionData commit 8c5b085e8eb6ff1bacb486c388d7e42d91252869 Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Aug 12 18:38:58 2012 +0200 Removed ascii art + added/removed blank lines This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: I8963aae057a91f0f6753d3b04439673614383565 diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 5b6c72f..e59b2cf 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -130,6 +130,7 @@ namespace dbaui const ::com::sun::star::awt::FontDescriptor& _rFont); virtual ~ODatabaseExport(); + public: ODatabaseExport( const SharedConnection& _rxConnection, @@ -167,10 +168,6 @@ namespace dbaui }; } -#endif // DBAUI_DATABASEEXPORT_HXX - - - - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index e19baf1..5ec0730 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include "TypeInfo.hxx" -//------------------------------------------------------------------ // field description columns of a table #define FIELD_NAME 1 #define FIELD_TYPE 2 @@ -56,14 +55,13 @@ class Control; namespace dbaui { - class OTableDesignHelpBar; class OPropListBoxCtrl; class OPropEditCtrl; class OPropNumericEditCtrl; class OFieldDescription; class OPropColumnEditCtrl; - //================================================================== + class OFieldDescControl : public TabPage { private: @@ -213,7 +211,6 @@ namespace dbaui void implFocusLost(Window* _pWhich); }; } -#endif // DBAUI_FIELDDESCRIPTIONCONTROL_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 3e4c5e1..fd58071 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -25,12 +25,8 @@ #include <tools/stream.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> - namespace dbaui { - //=============================================================================================== - // OHTMLReader - //=============================================================================================== class OHTMLReader : public HTMLParser, public ODatabaseExport { String m_sCurrent; @@ -52,6 +48,7 @@ namespace dbaui void setTextEncoding(); void fetchOptions(); virtual ~OHTMLReader(); + public: OHTMLReader(SvStream& rIn, const SharedConnection& _rxConnection, @@ -76,8 +73,6 @@ namespace dbaui SV_DECL_IMPL_REF( OHTMLReader ); } -#endif // DBAUI_HTMLREADER_HXX - - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index a5352d7..88d5c81 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -28,10 +28,7 @@ namespace dbaui { - //================================================================== - // OJoinExchObj : - // Additional data to create Joins in the JoinShell - //================================================================== + // OJoinExchObj: Additional data to create Joins in the JoinShell typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel > OJoinExchObj_Base; class OJoinExchObj @@ -46,6 +43,7 @@ namespace dbaui IDragTransferableListener* m_pDragListener; virtual ~OJoinExchObj(); + public: OJoinExchObj(const OJoinExchangeData& jxdSource,sal_Bool _bFirstEntry=sal_False); @@ -74,7 +72,6 @@ namespace dbaui using TransferableHelper::StartDrag; }; } -#endif // DBAUI_JOINEXCHANGE_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 6506efd..b902413 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -35,6 +35,7 @@ struct AcceptDropEvent; struct ExecuteDropEvent; class SfxUndoAction; + namespace dbaui { class OTableConnection; @@ -55,6 +56,7 @@ namespace dbaui protected: virtual void Resize(); + public: OScrollWindowHelper( Window* pParent); ~OScrollWindowHelper(); @@ -74,8 +76,10 @@ namespace dbaui ,public DropTargetHelper { friend class OJoinMoveTabWinUndoAct; + public: DECLARE_STL_USTRINGACCESS_MAP(OTableWindow*,OTableWindowMap); + private: OTableWindowMap m_aTableMap; ::std::vector<OTableConnection*> m_vTableConnection; @@ -248,8 +252,6 @@ namespace dbaui Size getRealOutputSize() const { return m_aOutputSize; } - - virtual void EnsureVisible(const OTableWindow* _pWin); virtual void EnsureVisible(const Point& _rPoint,const Size& _rSize); @@ -315,6 +317,6 @@ namespace dbaui using Window::Scroll; }; } -#endif // DBAUI_JOINTABLEVIEW_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx index 4256760..75f2024 100644 --- a/dbaccess/source/ui/inc/QEnumTypes.hxx +++ b/dbaccess/source/ui/inc/QEnumTypes.hxx @@ -61,7 +61,6 @@ namespace dbaui INNER_JOIN }; - //================================================================== enum EControlType { tpDefault = 0, @@ -78,7 +77,6 @@ namespace dbaui tpAutoIncrementValue }; } -#endif // DBAUI_ENUMTYPES_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 003309b..1f1f7ce 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -25,7 +25,6 @@ namespace dbaui { - struct TabWinsChangeNotification { enum ACTION_TYPE { AT_ADDED_WIN, AT_REMOVED_WIN }; @@ -35,11 +34,11 @@ namespace dbaui TabWinsChangeNotification(ACTION_TYPE at, const String& str) : atActionPerformed(at), strAffectedTable(str) { } }; - //======================================================================== class OQueryTabWinUndoAct; class OQueryTableConnection; class OQueryTableWindow; class OQueryDesignView; + class OQueryTableView : public OJoinTableView { Link m_lnkTabWinsChangeHandler; @@ -56,6 +55,7 @@ namespace dbaui virtual void onNoColumns_throw(); virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const; + public: OQueryTableView(Window* pParent,OQueryDesignView* pView); virtual ~OQueryTableView(); @@ -129,10 +129,6 @@ namespace dbaui using OJoinTableView::EnsureVisible; }; } -#endif // DBAUI_QUERYTABLEVIEW_HXX - - - - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index acffe83..57f8e09 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -70,7 +70,6 @@ namespace dbaui virtual void lookForUiActivities(); }; } -#endif // DBAUI_RELATION_TABLEVIEW_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 040d692..22ae95a 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -40,6 +40,7 @@ namespace dbaui getTypeSelectionPageFactory(); ~ORTFReader(); + public: ORTFReader( SvStream& rIn, const SharedConnection& _rxConnection, @@ -65,7 +66,6 @@ namespace dbaui SV_DECL_IMPL_REF( ORTFReader ); } -#endif // DBAUI_RTFREADER_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index ad87d64..818edec 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -69,7 +69,6 @@ namespace dbaui OTableConnection& operator=( const OTableConnection& rConn ); - void Select(); void Deselect(); sal_Bool IsSelected() const { return m_bSelected; } @@ -101,6 +100,6 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; } -#endif // DBAUI_TABLECONNECTION_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 620f4cf..eaab16e 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -35,12 +35,9 @@ namespace dbaui // Conn ---------->* ConnLine //================================================================== - - //================================================================== /** Contains all connection data which exists between two windows */ class OTableConnectionData { - protected: TTableWindowData::value_type m_pReferencingTable; TTableWindowData::value_type m_pReferencedTable; @@ -103,7 +100,6 @@ namespace dbaui typedef ::std::vector< ::boost::shared_ptr<OTableConnectionData> > TTableConnectionData; } -#endif // DBAUI_TABLECONNECTIONDATA_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index b7f6493..31ae845 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -28,7 +28,7 @@ namespace dbaui { class OTableDesignView; - //================================================================== + class OTableRowView : public ::svt::EditBrowseBox ,public IClipboardTest { @@ -40,6 +40,7 @@ namespace dbaui private: sal_uInt16 m_nCurUndoActId; + protected: sal_Bool m_bCurrentModified; sal_Bool m_bUpdatable; @@ -86,7 +87,6 @@ namespace dbaui virtual void Init(); }; } -#endif // DBAUI_TABLEDESIGNCONTROL_HXX - +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 74bd1d0..f7d3876 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -25,6 +25,7 @@ #include "IClipBoardTest.hxx" class MultiLineEdit; + namespace dbaui { // Deriving from TabPage is a trick to notice changes @@ -60,6 +61,6 @@ namespace dbaui virtual void paste(); }; } -#endif // DBAUI_TABLEDESIGNHELPBAR_HXX +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 29d31e7..419abb6 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -34,6 +34,7 @@ namespace comphelper } class Window; + namespace dbaui { class OTableFieldDesc : public ::salhelper::SimpleReferenceObject @@ -132,7 +133,6 @@ namespace dbaui void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); }; - //------------------------------------------------------------------ inline sal_Bool OTableFieldDesc::IsEmpty() const { sal_Bool bEmpty = (m_aTableName.isEmpty() && @@ -143,10 +143,10 @@ namespace dbaui !HasCriteria()); return bEmpty; } - //------------------------------------------------------------------ + typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; typedef ::std::vector<OTableFieldDescRef> OTableFields; } -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits