Kaydet (Commit) 6d29ad0d authored tarafından Philipp Riemer's avatar Philipp Riemer

align code pieces to surrounding lines/style

Change-Id: I992fd490461ba499cba1007abd57285949d3a488
üst c47988fc
...@@ -104,18 +104,18 @@ namespace dbaui ...@@ -104,18 +104,18 @@ namespace dbaui
bool m_bAppendFirstLine; bool m_bAppendFirstLine;
virtual sal_Bool CreateTable(int nToken) = 0; virtual sal_Bool CreateTable(int nToken) = 0;
virtual TypeSelectionPageFactory virtual TypeSelectionPageFactory
getTypeSelectionPageFactory() = 0; getTypeSelectionPageFactory() = 0;
void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); void CreateDefaultColumn(const ::rtl::OUString& _rColumnName);
sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat);
void adjustFormat(); void adjustFormat();
void eraseTokens(); void eraseTokens();
void insertValueIntoColumn(); void insertValueIntoColumn();
sal_Bool createRowSet(); sal_Bool createRowSet();
void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e); void showErrorDialog(const ::com::sun::star::sdbc::SQLException& e);
void ensureFormatter(); void ensureFormatter();
/** executeWizard calls a wizard to create/append data /** executeWizard calls a wizard to create/append data
...@@ -125,9 +125,9 @@ namespace dbaui ...@@ -125,9 +125,9 @@ namespace dbaui
@return true when an error occurs @return true when an error occurs
*/ */
sal_Bool executeWizard( const ::rtl::OUString& _sTableName, sal_Bool executeWizard( const ::rtl::OUString& _sTableName,
const ::com::sun::star::uno::Any& _aTextColor, const ::com::sun::star::uno::Any& _aTextColor,
const ::com::sun::star::awt::FontDescriptor& _rFont); const ::com::sun::star::awt::FontDescriptor& _rFont);
virtual ~ODatabaseExport(); virtual ~ODatabaseExport();
......
...@@ -101,7 +101,7 @@ namespace dbaui ...@@ -101,7 +101,7 @@ namespace dbaui
ScrollBar* m_pHorzScroll; ScrollBar* m_pHorzScroll;
TOTypeInfoSP m_pPreviousType; TOTypeInfoSP m_pPreviousType;
sal_uInt16 nCurChildId; sal_uInt16 nCurChildId;
short m_nPos; short m_nPos;
XubString aYes; XubString aYes;
XubString aNo; XubString aNo;
......
...@@ -40,7 +40,7 @@ namespace dbaui ...@@ -40,7 +40,7 @@ namespace dbaui
virtual void NextToken( int nToken ); // base class virtual void NextToken( int nToken ); // base class
virtual sal_Bool CreateTable(int nToken); virtual sal_Bool CreateTable(int nToken);
virtual TypeSelectionPageFactory virtual TypeSelectionPageFactory
getTypeSelectionPageFactory(); getTypeSelectionPageFactory();
void TableDataOn(SvxCellHorJustify& eVal); void TableDataOn(SvxCellHorJustify& eVal);
void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor); void TableFontOn(::com::sun::star::awt::FontDescriptor& _rFont,sal_Int32 &_rTextColor);
......
...@@ -31,9 +31,7 @@ namespace dbaui ...@@ -31,9 +31,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; typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XUnoTunnel > OJoinExchObj_Base;
class OJoinExchObj class OJoinExchObj : public TransferableHelper, public OJoinExchObj_Base
:public TransferableHelper
,public OJoinExchObj_Base
{ {
static String m_sJoinFormat; static String m_sJoinFormat;
sal_Bool m_bFirstEntry; sal_Bool m_bFirstEntry;
......
...@@ -72,9 +72,9 @@ namespace dbaui ...@@ -72,9 +72,9 @@ namespace dbaui
}; };
class OJoinTableView : public Window class OJoinTableView : public Window,
,public IDragTransferableListener public IDragTransferableListener,
,public DropTargetHelper public DropTargetHelper
{ {
friend class OJoinMoveTabWinUndoAct; friend class OJoinMoveTabWinUndoAct;
......
...@@ -27,9 +27,10 @@ ...@@ -27,9 +27,10 @@
namespace dbaui namespace dbaui
{ {
class ORelationDesignView; class ORelationDesignView;
class ORelationTableView : public ::cppu::BaseMutex
, public OJoinTableView class ORelationTableView : public ::cppu::BaseMutex,
, public ::comphelper::OContainerListener 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 TTableConnectionData::value_type m_pCurrentlyTabConnData; ///< set when we creating a connection with more than one keycolumn
......
...@@ -53,7 +53,9 @@ namespace dbaui ...@@ -53,7 +53,9 @@ namespace dbaui
OTableConnectionData& operator=( const OTableConnectionData& rConnData ); OTableConnectionData& operator=( const OTableConnectionData& rConnData );
public: public:
OTableConnectionData(); 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 ); OTableConnectionData( const OTableConnectionData& rConnData );
virtual ~OTableConnectionData(); virtual ~OTableConnectionData();
......
...@@ -29,8 +29,7 @@ namespace dbaui ...@@ -29,8 +29,7 @@ namespace dbaui
{ {
class OTableDesignView; class OTableDesignView;
class OTableRowView : public ::svt::EditBrowseBox class OTableRowView : public ::svt::EditBrowseBox, public IClipboardTest
,public IClipboardTest
{ {
friend class OTableDesignUndoAct; friend class OTableDesignUndoAct;
......
...@@ -30,13 +30,12 @@ namespace dbaui ...@@ -30,13 +30,12 @@ namespace dbaui
{ {
// Deriving from TabPage is a trick to notice changes // Deriving from TabPage is a trick to notice changes
// of the system colors // of the system colors
class OTableDesignHelpBar : public TabPage class OTableDesignHelpBar : public TabPage, public IClipboardTest
,public IClipboardTest
{ {
private: private:
String m_sHelpText; String m_sHelpText;
MultiLineEdit* m_pTextWin; MultiLineEdit* m_pTextWin;
sal_uInt16 m_nDummy; sal_uInt16 m_nDummy;
protected: protected:
virtual void Resize(); virtual void Resize();
......
...@@ -135,11 +135,11 @@ namespace dbaui ...@@ -135,11 +135,11 @@ namespace dbaui
inline sal_Bool OTableFieldDesc::IsEmpty() const inline sal_Bool OTableFieldDesc::IsEmpty() const
{ {
sal_Bool bEmpty = (m_aTableName.isEmpty() && sal_Bool bEmpty = (m_aTableName.isEmpty() &&
m_aAliasName.isEmpty() && m_aAliasName.isEmpty() &&
m_aFieldName.isEmpty() && m_aFieldName.isEmpty() &&
m_aFieldAlias.isEmpty() && m_aFieldAlias.isEmpty() &&
m_aFunctionName.isEmpty() && m_aFunctionName.isEmpty() &&
!HasCriteria()); !HasCriteria());
return bEmpty; return bEmpty;
} }
......
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