diff options
Diffstat (limited to 'dbaccess/source/ui/control')
22 files changed, 194 insertions, 194 deletions
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 094b1c6f4271..8dc0b41f75cd 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ DBG_NAME(OColumnControlWindow) //======================================================================== OColumnControlWindow::OColumnControlWindow(Window* pParent ,const Reference<XMultiServiceFactory>& _rxFactory) - : OFieldDescControl(pParent,NULL) + : OFieldDescControl(pParent,NULL) , m_xORB(_rxFactory) , m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(sal_True) @@ -73,7 +73,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -87,7 +87,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType ) { case tpFormat: case tpDefault: -// case tpAutoIncrement: +// case tpAutoIncrement: case tpColumnName: break; default: @@ -100,7 +100,7 @@ void OColumnControlWindow::CellModified(long /*nRow*/, USHORT /*nColId*/ ) saveCurrentFieldDescData(); } // ----------------------------------------------------------------------------- -::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const +::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const { return m_aLocale; } @@ -131,7 +131,7 @@ TOTypeInfoSP OColumnControlWindow::getTypeInfo(sal_Int32 _nPos) return ( _nPos >= 0 && _nPos < static_cast<sal_Int32>(m_aDestTypeInfoIndex.size())) ? m_aDestTypeInfoIndex[_nPos]->second : TOTypeInfoSP(); } // ----------------------------------------------------------------------------- -const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const +const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const { return &m_aDestTypeInfo; } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 353fba74e3e1..e05829656531 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY -#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY -#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK -#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN +#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY +#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY +#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK +#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN #include "FieldDescControl.hxx" #include "FieldControls.hxx" @@ -51,7 +51,7 @@ #include <svx/svxids.hrc> #include <svx/algitem.hxx> #include <svl/itempool.hxx> -#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> +#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in <svl/zforlist.hxx> #include <svl/zforlist.hxx> #include <svl/rngitem.hxx> #include <svl/intitem.hxx> @@ -84,18 +84,18 @@ using namespace ::com::sun::star::util; //================================================================== // fuer die Controls auf der OFieldDescGenPage -#define CONTROL_SPACING_X 18 // 6 -#define CONTROL_SPACING_Y 4 -#define CONTROL_WIDTH_1 160 // 100 -#define CONTROL_WIDTH_2 100 // 60 -#define CONTROL_WIDTH_3 250 -#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) +#define CONTROL_SPACING_X 18 // 6 +#define CONTROL_SPACING_Y 4 +#define CONTROL_WIDTH_1 160 // 100 +#define CONTROL_WIDTH_2 100 // 60 +#define CONTROL_WIDTH_3 250 +#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5) -#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem -#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format -#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem +#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem +#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format +#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem -#define HSCROLL_STEP 20 +#define HSCROLL_STEP 20 namespace @@ -105,7 +105,7 @@ namespace { double nValue = _nValue; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue); @@ -263,11 +263,11 @@ OFieldDescControl::~OFieldDescControl() { ::std::auto_ptr<Window> aTemp(m_pVertScroll); - m_pVertScroll = NULL; + m_pVertScroll = NULL; } { ::std::auto_ptr<Window> aTemp(m_pHorzScroll); - m_pHorzScroll = NULL; + m_pHorzScroll = NULL; } if ( m_bAdded ) ::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); @@ -410,7 +410,7 @@ void OFieldDescControl::CheckScrollBars() { m_pVertScroll->Show(); m_pVertScroll->SetRangeMax(nActive - nLastVisible); -// m_pVertScroll->SetThumbPos(0); +// m_pVertScroll->SetThumbPos(0); m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) ); } @@ -425,7 +425,7 @@ void OFieldDescControl::CheckScrollBars() { m_pHorzScroll->Show(); m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP); -// m_pHorzScroll->SetThumbPos(0); +// m_pHorzScroll->SetThumbPos(0); m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) ); } @@ -475,12 +475,12 @@ void OFieldDescControl::ScrollAllAggregates() if (nDeltaX || nDeltaY) { - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -527,13 +527,13 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly ) DBG_CHKTHIS(OFieldDescControl,NULL); ////////////////////////////////////////////////////////////////////// // Controls enablen/disablen - Control* ppAggregates[] = { pRequired, pNumType + Control* ppAggregates[] = { pRequired, pNumType , pAutoIncrement, pDefault , pTextLen, pLength , pScale, m_pColumnName , m_pType, m_pAutoIncrementValue , pFormat}; - Control* ppAggregatesText[] = { pRequiredText, pNumTypeText + Control* ppAggregatesText[] = { pRequiredText, pNumTypeText , pAutoIncrementText, pDefaultText , pTextLenText, pLengthText , pScaleText, m_pColumnNameText @@ -729,7 +729,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ ) } // ----------------------------------------------------------------------- -void OFieldDescControl::SetModified(sal_Bool /*bModified*/) +void OFieldDescControl::SetModified(sal_Bool /*bModified*/) { } //------------------------------------------------------------------------ @@ -814,9 +814,9 @@ void OFieldDescControl::ArrangeAggregates() // die Beschreibung eines Controls struct AGGREGATE_DESCRIPTION { - Control* pctrlInputControl; // das eigentliche Control zur Eingabe - Control* pctrlTextControl; // das Label dazu - USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize + Control* pctrlInputControl; // das eigentliche Control zur Eingabe + Control* pctrlTextControl; // das Label dazu + USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize }; AGGREGATE_DESCRIPTION adAggregates[] = { { m_pColumnName, m_pColumnNameText, 1}, @@ -924,7 +924,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pRequired->InsertEntry( aYes ); pRequired->InsertEntry( aNo ); pRequired->SelectEntryPos(1); - + InitializeControl(pRequired,HID_TAB_ENT_REQUIRED,true); } } @@ -1094,7 +1094,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); pControl->SetMin(0); - pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig + pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig pControl->SetStrictFormat(TRUE); InitializeControl(pControl,_nHelpId,false); @@ -1170,7 +1170,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType ) void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol ) { DBG_CHKTHIS(OFieldDescControl,NULL); - + ////////////////////////////////////////////////////////////////////// // Groesse ermitteln const sal_Int32 nControlHeight = GetMaxControlHeight(); @@ -1228,12 +1228,12 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MAP_APPFONT).Height(); aPosition.Y() += ((nRow+1)*nControl_Spacing_y) + (nRow*nControlHeight); - + ////////////////////////////////////////////////////////////////////// // Control anzeigen (*ppControl)->SetPosSizePixel( aPosition, aSize ); aSize = (*ppControl)->GetSizePixel(); - + (*ppControl)->Show(); } //------------------------------------------------------------------------------ @@ -1461,7 +1461,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) { // disable autoincrement value because it should only be visible when autoincrement is to true DeactivateAggregate( tpAutoIncrementValue ); - pAutoIncrement->SelectEntryPos( 1 ); // no + pAutoIncrement->SelectEntryPos( 1 ); // no ActivateAggregate( tpDefault ); // hat Auswirkungen auf pRequired if(!pFieldDescr->IsPrimaryKey()) @@ -1478,7 +1478,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pBoolDefault ) { // wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <<keiner>> besitzen - ::rtl::OUString sValue; + ::rtl::OUString sValue; pFieldDescr->GetControlDefault() >>= sValue; String sDef = BoolStringUI(sValue); @@ -1507,9 +1507,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pRequired ) { if( pFieldDescr->IsNullable() ) - pRequired->SelectEntryPos( 1 ); // no + pRequired->SelectEntryPos( 1 ); // no else - pRequired->SelectEntryPos( 0 ); // yes + pRequired->SelectEntryPos( 0 ); // yes } if( pTextLen ) @@ -1540,7 +1540,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND; if(nPos == LISTBOX_ENTRY_NOTFOUND) { - const OTypeInfoMap* pMap = getTypeInfo(); + const OTypeInfoMap* pMap = getTypeInfo(); OTypeInfoMap::const_iterator aIter = pMap->find(pFieldType.get() ? pFieldDescr->getTypeInfo()->nType : pFieldDescr->GetType()); if(aIter == pMap->end() && !pMap->empty()) { @@ -1787,9 +1787,9 @@ void OFieldDescControl::LoseFocus() sal_Bool OFieldDescControl::isCopyAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; @@ -1799,9 +1799,9 @@ sal_Bool OFieldDescControl::isCopyAllowed() sal_Bool OFieldDescControl::isCutAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue) && static_cast<Edit*>(m_pActFocusWindow)->GetSelected().Len() != 0; return bAllowed; @@ -1810,9 +1810,9 @@ sal_Bool OFieldDescControl::isCutAllowed() sal_Bool OFieldDescControl::isPasteAllowed() { sal_Bool bAllowed = (m_pActFocusWindow != NULL) && - (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || - m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || - m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || + (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample || + m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength || + m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName || m_pActFocusWindow == m_pAutoIncrementValue); if ( bAllowed ) { @@ -1915,7 +1915,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes ::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale; sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey); - if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE + if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE || (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME ) { nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0687b61d7b8e..d4a70092980f 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ #include <algorithm> -#define SOURCE_COLUMN 1 -#define DEST_COLUMN 2 +#define SOURCE_COLUMN 1 +#define DEST_COLUMN 2 namespace dbaui { @@ -67,20 +67,20 @@ namespace dbaui friend class OTableListBoxControl; ::std::auto_ptr< ::svt::ListBoxControl> m_pListCell; - TTableConnectionData::value_type m_pConnData; - const OJoinTableView::OTableWindowMap* m_pTableMap; - OTableListBoxControl* m_pBoxControl; - long m_nDataPos; - Reference< XPropertySet> m_xSourceDef; - Reference< XPropertySet> m_xDestDef; + TTableConnectionData::value_type m_pConnData; + const OJoinTableView::OTableWindowMap* m_pTableMap; + OTableListBoxControl* m_pBoxControl; + long m_nDataPos; + Reference< XPropertySet> m_xSourceDef; + Reference< XPropertySet> m_xDestDef; void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId); /** returns the column id for the editbrowsebox - @param _nColId + @param _nColId the column id SOURCE_COLUMN or DEST_COLUMN - @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data + @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data */ USHORT getColumnIdent( USHORT _nColId ) const; public: @@ -88,9 +88,9 @@ namespace dbaui virtual ~ORelationControl(); /** searches for a connection between these two tables - @param _pSource + @param _pSource the left table - @param _pDest + @param _pDest the right window */ void setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest); @@ -125,7 +125,7 @@ namespace dbaui private: DECL_LINK( AsynchActivate, void* ); - + }; //======================================================================== @@ -177,12 +177,12 @@ namespace dbaui ////////////////////////////////////////////////////////////////////// // set browse mode - SetMode( BROWSER_COLUMNSELECTION | - BROWSER_HLINESFULL | - BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | - BROWSER_HIDESELECT | - BROWSER_AUTO_HSCROLL | + SetMode( BROWSER_COLUMNSELECTION | + BROWSER_HLINESFULL | + BROWSER_VLINESFULL | + BROWSER_HIDECURSOR | + BROWSER_HIDESELECT | + BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL); } else @@ -209,7 +209,7 @@ namespace dbaui PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate)); else if (rNEvt.GetType() == EVENT_GETFOCUS) PostUserEvent(LINK(this, ORelationControl, AsynchActivate)); - + return EditBrowseBox::PreNotify(rNEvt); } @@ -234,8 +234,8 @@ namespace dbaui long nRow = GetCurRow(); USHORT nCol = GetCurColumnId(); - BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) - || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); + BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) + || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); return bRet && EditBrowseBox::IsTabAllowed(bForward); } @@ -304,18 +304,18 @@ namespace dbaui void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId ) { DBG_CHKTHIS(ORelationControl,NULL); - + ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) { case SOURCE_COLUMN: - xDef = m_xSourceDef; + xDef = m_xSourceDef; nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; break; case DEST_COLUMN: - xDef = m_xDestDef; + xDef = m_xDestDef; nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; break; default: @@ -359,7 +359,7 @@ namespace dbaui DBG_CHKTHIS(ORelationControl,NULL); String aText =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId ); - Point aPos( rRect.TopLeft() ); + Point aPos( rRect.TopLeft() ); Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText )); if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() || @@ -409,7 +409,7 @@ namespace dbaui { m_xSourceDef = _pSource->GetTable(); SetColumnTitle(1, _pSource->GetName()); - + m_xDestDef = _pDest->GetTable(); SetColumnTitle(2, _pDest->GetName()); @@ -465,11 +465,11 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent ,IRelationControlInterface* _pParentDialog) : Window(_pParent,_rResId) , m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES,*_rResId.GetResMgr())) - , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) - , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) + , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr())) + , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr())) , m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS,*_rResId.GetResMgr())) , m_pTableMap(_pTableMap) - , m_pParentDialog(_pParentDialog) + , m_pParentDialog(_pParentDialog) { m_pRC_Tables = new ORelationControl( this,m_pTableMap ); m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS); @@ -530,7 +530,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_pRC_Tables->setWindowTables(pInitialLeft,pInitialRight); // die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen - + if ( m_pTableMap->size() > 2 ) { m_lmbLeftTable.RemoveEntry(m_strCurrentRight); @@ -547,8 +547,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox ) { String strSelected(pListBox->GetSelectEntry()); - OTableWindow* pLeft = NULL; - OTableWindow* pRight = NULL; + OTableWindow* pLeft = NULL; + OTableWindow* pRight = NULL; // eine Sonderbehandlung : wenn es nur zwei Tabellen gibt, muss ich bei Wechsel in einer LB auch in der anderen umschalten if ( m_pTableMap->size() == 2 ) @@ -567,13 +567,13 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetName()) ) { - pLeft = pFirst; - pRight = pSecond; + pLeft = pFirst; + pRight = pSecond; } else { - pLeft = pSecond; - pRight = pFirst; + pLeft = pSecond; + pRight = pFirst; } } else @@ -592,10 +592,10 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent m_lmbRightTable.InsertEntry(m_strCurrentLeft); // und den jetzt selektierten raus m_lmbRightTable.RemoveEntry(strSelected); - m_strCurrentLeft = strSelected; - + m_strCurrentLeft = strSelected; + pLeft = pLoop; - + OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_lmbRightTable.GetSelectEntry()); OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name"); if ( aIter != m_pTableMap->end() ) @@ -700,8 +700,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent return bRet; } // ----------------------------------------------------------------------------- - TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const - { + TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const + { return m_pRC_Tables->getData()->getReferencingTable(); } // ----------------------------------------------------------------------------- @@ -710,7 +710,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent if ( !_bEnable ) PostUserEvent(LINK(m_pRC_Tables, ORelationControl, AsynchDeactivate)); m_pRC_Tables->Enable(_bEnable); - + } // ----------------------------------------------------------------------------- } diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 47cac018ffc5..2299e47688a5 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "ScrollHelper.hxx" #include <tools/debug.hxx> -#define LISTBOX_SCROLLING_AREA 12 +#define LISTBOX_SCROLLING_AREA 12 namespace dbaui { DBG_NAME(OScrollHelper) @@ -47,7 +47,7 @@ DBG_NAME(OScrollHelper) // ----------------------------------------------------------------------------- OScrollHelper::~OScrollHelper() { - + DBG_DTOR(OScrollHelper,NULL); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 5acc67d433a6..8e05e67fb2cc 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ namespace dbaui //------------------------------------------------------------------ sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars) { - return ( + return ( (_cChar >= 'A' && _cChar <= 'Z') || _cChar == '_' || _sAllowedChars.indexOf(_cChar) != -1 || @@ -43,16 +43,16 @@ namespace dbaui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, + sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, const ::rtl::OUString& _sToCheck, ::rtl::OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; if ( m_bCheck ) { - XubString sSavedValue = _sOldValue; - XubString sText = _sToCheck; - xub_StrLen nMatch = 0; + XubString sSavedValue = _sOldValue; + XubString sText = _sToCheck; + xub_StrLen nMatch = 0; for ( xub_StrLen i=nMatch;i < sText.Len(); ++i ) { if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 991dca50d804..57ea25f505a2 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,13 +47,13 @@ using namespace ::dbaui; using namespace ::svt; const USHORT COL_TABLE_NAME = 1; -const USHORT COL_SELECT = 2; -const USHORT COL_INSERT = 3; -const USHORT COL_DELETE = 4; -const USHORT COL_UPDATE = 5; -const USHORT COL_ALTER = 6; -const USHORT COL_REF = 7; -const USHORT COL_DROP = 8; +const USHORT COL_SELECT = 2; +const USHORT COL_INSERT = 3; +const USHORT COL_DELETE = 4; +const USHORT COL_UPDATE = 5; +const USHORT COL_ALTER = 6; +const USHORT COL_REF = 7; +const USHORT COL_DROP = 8; DBG_NAME(OTableGrantControl) @@ -72,7 +72,7 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId) ////////////////////////////////////////////////////////////////////// // Spalten einfuegen USHORT i=1; - InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); + InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75); FreezeColumn(i++); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_SELECT)), 75); InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_INSERT)), 75); @@ -99,7 +99,7 @@ OTableGrantControl::~OTableGrantControl() delete m_pCheckCell; delete m_pEdit; - m_xTables = NULL; + m_xTables = NULL; } // ----------------------------------------------------------------------------- void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _xTablesSup) @@ -131,7 +131,7 @@ void OTableGrantControl::UpdateTables() if(m_xTables.is()) RowInserted(0, m_aTableNames.getLength()); - // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); + // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser(); } //------------------------------------------------------------------------ void OTableGrantControl::Init() @@ -143,10 +143,10 @@ void OTableGrantControl::Init() // ComboBox instanzieren if(!m_pCheckCell) { - m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); + m_pCheckCell = new CheckBoxControl( &GetDataWindow() ); m_pCheckCell->GetBox().EnableTriState(FALSE); - m_pEdit = new Edit( &GetDataWindow() ); + m_pEdit = new Edit( &GetDataWindow() ); m_pEdit->SetReadOnly(); m_pEdit->Enable(FALSE); } @@ -155,7 +155,7 @@ void OTableGrantControl::Init() ////////////////////////////////////////////////////////////////////// // Browser Mode setzen BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | - BROWSER_HIDECURSOR | BROWSER_HIDESELECT; + BROWSER_HIDECURSOR | BROWSER_HIDESELECT; SetMode(nMode); } @@ -219,10 +219,10 @@ BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const return EditBrowseBox::IsTabAllowed(bForward); } //------------------------------------------------------------------------------ -#define GRANT_REVOKE_RIGHT(what) \ - if(m_pCheckCell->GetBox().IsChecked()) \ +#define GRANT_REVOKE_RIGHT(what) \ + if(m_pCheckCell->GetBox().IsChecked()) \ xAuth->grantPrivileges(sTableName,PrivilegeObject::TABLE,what);\ - else \ + else \ xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what) //------------------------------------------------------------------------------ @@ -238,7 +238,7 @@ BOOL OTableGrantControl::SaveModified() BOOL bErg = TRUE; try { - + if ( m_xUsers->hasByName(m_sUserName) ) { Reference<XAuthorizable> xAuth(m_xUsers->getByName(m_sUserName),UNO_QUERY); @@ -291,7 +291,7 @@ String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const DBG_CHKTHIS(OTableGrantControl,NULL); if(COL_TABLE_NAME == nColId) return m_aTableNames[nRow]; - + sal_Int32 nPriv = 0; TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow); if(aFind != m_aPrivMap.end()) @@ -316,9 +316,9 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon } } // ----------------------------------------------------------------------------- -void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const +void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { - + if ( m_xUsers->hasByName(m_sUserName) ) { try @@ -328,7 +328,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const { // get the privileges TPrivileges nRights; - nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); + nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); if(m_xGrantUser.is()) nRights.nWithGrant = m_xGrantUser->getGrantablePrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE); else @@ -429,7 +429,7 @@ BOOL OTableGrantControl::SeekRow( long nRow ) void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const { DBG_CHKTHIS(OTableGrantControl,NULL); - + if(nColumnId != COL_TABLE_NAME) { TTablePrivilegeMap::const_iterator aFind = findPrivilege(m_nDataPos); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src index 8da72a1f9fe1..9ed55e529906 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ b/dbaccess/source/ui/control/TableGrantCtrl.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 929b5c050743..c3eed83c5d43 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/debug.hxx> -#define SPLITTER_WIDTH 80 +#define SPLITTER_WIDTH 80 using namespace ::dbaui; @@ -46,8 +46,8 @@ OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pPa ,m_pRight(NULL) ,m_bVertical(_bVertical) { - DBG_CTOR(OSplitterView,NULL); - ImplInitSettings( sal_True, sal_True, sal_True ); + DBG_CTOR(OSplitterView,NULL); + ImplInitSettings( sal_True, sal_True, sal_True ); } // ----------------------------------------------------------------------------- OSplitterView::~OSplitterView() @@ -59,7 +59,7 @@ OSplitterView::~OSplitterView() IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ ) { OSL_ENSURE(m_pSplitter, "Splitter is NULL!"); - if ( m_bVertical ) + if ( m_bVertical ) { long nPosY = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nPosY ) ); @@ -81,7 +81,7 @@ void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_ if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); +// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) @@ -130,18 +130,18 @@ void OSplitterView::Resize() Window::Resize(); OSL_ENSURE( m_pRight, "No init called!"); - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( 0,0 ); - Size aPlaygroundSize( GetOutputSizePixel() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( 0,0 ); + Size aPlaygroundSize( GetOutputSizePixel() ); if ( m_pLeft && m_pLeft->IsVisible() && m_pSplitter ) { - aSplitPos = m_pSplitter->GetPosPixel(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); - if ( m_bVertical ) + aSplitPos = m_pSplitter->GetPosPixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); + if ( m_bVertical ) { - // calculate the splitter pos and size + // calculate the splitter pos and size aSplitPos.Y() = aPlaygroundPos.Y(); aSplitSize.Height() = aPlaygroundSize.Height(); @@ -152,8 +152,8 @@ void OSplitterView::Resize() aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -174,8 +174,8 @@ void OSplitterView::Resize() aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y()); // set the size of treelistbox m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -188,7 +188,7 @@ void OSplitterView::Resize() if ( m_pRight ) { - if ( m_bVertical ) + if ( m_bVertical ) m_pRight->SetPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(), aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height()); else diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index bd72946958ca..df1d6261fd44 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 43f8ae2e6a57..ec8c6e3faf7b 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ OConnectionURLEdit::~OConnectionURLEdit() Edit* pSubEdit = GetSubEdit(); SetSubEdit(NULL); delete pSubEdit; - delete m_pForcedPrefix; + delete m_pForcedPrefix; } //------------------------------------------------------------------------- @@ -128,7 +128,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe GetSubEdit()->Show(); // do the real SetTex -// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); +// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection); String sNewText( _rStr ); if ( !bIsEmpty ) sNewText = m_pTypeCollection->cutPrefix( _rStr ); @@ -150,7 +150,7 @@ void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix) m_pForcedPrefix->Show(m_bShowPrefix); } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 381c7036677f..c2d057037c9f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,7 +66,7 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::view; DBG_NAME(DBTreeListBox) -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== // class DBTreeListBox //======================================================================== @@ -92,7 +92,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac ,m_xORB(_rxORB) { DBG_CTOR(DBTreeListBox,NULL); - init(); + init(); } // ----------------------------------------------------------------------------- void DBTreeListBox::init() @@ -119,7 +119,7 @@ DBTreeListBox::~DBTreeListBox() //------------------------------------------------------------------------ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const { - SvLBoxTreeList* myModel = GetModel(); + SvLBoxTreeList* myModel = GetModel(); SvTreeEntryList* pChilds = myModel->GetChildList(pStart); SvLBoxEntry* pEntry = NULL; if ( pChilds ) @@ -349,7 +349,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt ) void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) { KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); - USHORT nCode = rKEvt.GetKeyCode().GetCode(); + USHORT nCode = rKEvt.GetKeyCode().GetCode(); sal_Bool bHandled = sal_False; if(eFunc != KEYFUNC_DONTKNOW) @@ -407,7 +407,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) // 2002-12-02 - 105831 - fs@openoffice.org } - if ( !bHandled ) + if ( !bHandled ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- @@ -427,7 +427,7 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText m_aSelectedEntries.erase( pEntry ); } SetEntryText(pEntry,aEntry.aNewText); - + return FALSE; // we never want that the base change our text } @@ -592,20 +592,20 @@ namespace throw IllegalArgumentException(); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException) { return m_aSelection; } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } - + //-------------------------------------------------------------------- void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) { @@ -711,7 +711,7 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) { implStopSelectionTimer(); - m_aSelChangeHdl.Call( NULL ); + m_aSelChangeHdl.Call( NULL ); return 0L; } // ----------------------------------------------------------------------------- @@ -721,7 +721,7 @@ void DBTreeListBox::StateChanged( StateChangedType nStateChange ) implStopSelectionTimer(); } // ......................................................................... -} // namespace dbaui +} // namespace dbaui // ......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 2f2c7afd2a60..7de4fc35bf56 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaui } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 1ecb15575ca9..bca4ebe053cf 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace dbaui using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; //......................................................................... -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 //======================================================================== //= OMarkableTreeListBox //======================================================================== DBG_NAME(OMarkableTreeListBox) //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) : DBTreeListBox(pParent,_rxORB,nWinStyle) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -53,7 +53,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XM InitButtonData(); } //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) : DBTreeListBox(pParent,_rxORB,rResId) { DBG_CTOR(OMarkableTreeListBox,NULL); @@ -205,7 +205,7 @@ void OMarkableTreeListBox::CheckButtonHdl() void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); - if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken + if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); @@ -220,7 +220,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) while(pEntry) { SetCheckButtonState(pEntry,eState); - if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken + if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken { SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); @@ -237,7 +237,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) //------------------------------------------------------------------------ //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 78fd8f4fdd1c..5672fc94941c 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 3eee26f30959..066085de70b1 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ void OSqlEdit::SetText(const String& rNewText) { DBG_CHKTHIS(OSqlEdit,NULL); if (m_timerUndoActionCreation.IsActive()) - { // die noch anstehenden Undo-Action erzeugen + { // die noch anstehenden Undo-Action erzeugen m_timerUndoActionCreation.Stop(); LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL); } diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx index 37cb9c85f990..ddf46a3f0479 100644 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ b/dbaccess/source/ui/control/statusbarontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 832459021f1e..fa593339152b 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -318,7 +318,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn TNames::const_iterator aEnd = _rTables.end(); Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); - for ( ; aIter != aEnd; ++aIter ) + for ( ; aIter != aEnd; ++aIter ) { // add the entry implAddEntry( @@ -409,8 +409,8 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, // special emphasizing handling for the "all objects" entry // 89709 - 16.07.2001 - frank.schoenheit@sun.com sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry); - if ( GetModel()->HasChilds(_pEntry) // the entry has children - || bAllObjectsEntryAffected // or it is the "all objects" entry + if ( GetModel()->HasChilds(_pEntry) // the entry has children + || bAllObjectsEntryAffected // or it is the "all objects" entry ) { OBoldListboxString* pTextItem = static_cast<OBoldListboxString*>(_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING)); @@ -690,7 +690,7 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/tabletree.hrc b/dbaccess/source/ui/control/tabletree.hrc index 1566e1ec10ce..b5450948e978 100644 --- a/dbaccess/source/ui/control/tabletree.hrc +++ b/dbaccess/source/ui/control/tabletree.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ //------------------------------------------------------------------------ //- menu ids -#define MID_SORT_ASCENDING 1 -#define MID_SORT_DECENDING 2 +#define MID_SORT_ASCENDING 1 +#define MID_SORT_DECENDING 2 #endif // _DBAUI_TABLETREE_HRC_ diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index d08535f3e8da..26342fe28ba2 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 57618dea47b1..ad90d8a35e04 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -122,7 +122,7 @@ namespace dbaui m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True)); - m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); + m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True)); m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True)); } diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx index 39e44be96f3f..ae527a9080a1 100644 --- a/dbaccess/source/ui/control/undosqledit.cxx +++ b/dbaccess/source/ui/control/undosqledit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src index 814a304d18c0..09884a24b906 100644 --- a/dbaccess/source/ui/control/undosqledit.src +++ b/dbaccess/source/ui/control/undosqledit.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |