Skip to content

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

Removed ascii art + added/removed blank lines 

This is a follow-up patch of 401a454c.

Change-Id: I8963aae057a91f0f6753d3b04439673614383565
üst 5c293bfa
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 54 deletions
dbaccess/source/ui/inc/DExport.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/FieldDescControl.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/HtmlReader.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/JoinExchange.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/JoinTableView.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/QEnumTypes.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/QueryTableView.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/RelationTableView.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -70,7 +70,6 @@ namespace dbaui
virtual void lookForUiActivities();
};
}
#endif // DBAUI_RELATION_TABLEVIEW_HXX
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/inc/RtfReader.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/TableConnection.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/TableConnectionData.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/TableDesignControl.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/TableDesignHelpBar.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
dbaccess/source/ui/inc/TableFieldDescription.hxx
Dosyayı görüntüle @ 8c5b085e
......@@ -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: */
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