Cheers,
Wol
From 024ac9b3bd2c83d8cec89edd3aa5149c8e031261 Mon Sep 17 00:00:00 2001
From: Wol <anthony@youngman.org.uk>
Date: Thu, 25 Nov 2010 01:16:20 +0000
Subject: [PATCH 2/2] Spelling, dead code removal
---
.../source/ui/querydesign/ConnectionLineAccess.cxx | 1 -
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 1 -
dbaccess/source/ui/querydesign/JoinTableView.cxx | 10 --------
.../source/ui/querydesign/QTableConnection.cxx | 6 -----
.../source/ui/querydesign/QTableConnectionData.cxx | 3 --
dbaccess/source/ui/querydesign/QTableWindow.cxx | 5 +---
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 20 +---------------
.../source/ui/querydesign/QueryTabWinUndoAct.cxx | 4 ---
dbaccess/source/ui/querydesign/QueryTableView.cxx | 7 +-----
dbaccess/source/ui/querydesign/QueryTextView.cxx | 1 -
.../source/ui/querydesign/SelectionBrowseBox.cxx | 23 +++++++-------------
.../source/ui/querydesign/TableConnectionData.cxx | 1 -
dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +-
.../source/ui/querydesign/TableWindowAccess.cxx | 1 -
.../source/ui/querydesign/TableWindowListBox.cxx | 4 ---
.../source/ui/querydesign/TableWindowTitle.cxx | 12 ----------
.../source/ui/querydesign/querycontainerwindow.cxx | 11 ++++-----
dbaccess/source/ui/querydesign/querycontroller.cxx | 14 ++---------
dbaccess/source/ui/querydesign/querydlg.cxx | 2 -
19 files changed, 21 insertions(+), 107 deletions(-)
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 0a0419c..8cdf8a6 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -46,7 +46,6 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
- // using namespace ::com::sun::star::awt;
using namespace ::com::sun::star;
OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine)
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 17ad8bd..86545a6 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -95,7 +95,6 @@ void OJoinDesignView::Construct()
// -----------------------------------------------------------------------------
void OJoinDesignView::initialize()
{
- // getAddTableDialog()->Update();
}
// -------------------------------------------------------------------------
void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 1437a57..3a9552e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -171,8 +171,6 @@ void OScrollWindowHelper::Resize()
// class OJoinTableView
//==================================================================
-//const long WINDOW_WIDTH = 1000;
-//const long WINDOW_HEIGHT = 1000;
DBG_NAME(OJoinTableView);
//------------------------------------------------------------------------------
OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
@@ -466,7 +464,6 @@ namespace
Point aUpperLeft = _rPoint;
// normalize with respect to visibility
aUpperLeft -= _pView->GetScrollOffset();
- // aUpperLeft.Y() -= _pView->GetScrollOffset().Y();
Point aLowerRight(aUpperLeft.X() + _rSize.Width(), aUpperLeft.Y() + _rSize.Height());
// data about ourself
@@ -485,7 +482,6 @@ namespace
_nScrollX = aLowerRight.X() - aSize.Width() + TABWIN_SPACING_X;
// ensure the visibility of the left border (higher priority)
- // if ( (aUpperLeft.X() - _nScrollX) < 0 )
if ( aUpperLeft.X() < 0 )
_nScrollX = aUpperLeft.X() - TABWIN_SPACING_X;
}
@@ -496,7 +492,6 @@ namespace
if ( aLowerRight.Y() > aSize.Height() )
_nScrollY = aLowerRight.Y() - aSize.Height() + TABWIN_SPACING_Y;
// upper border
- // if ( (aUpperLeft.Y() - _nScrollY) < 0 )
if ( aUpperLeft.Y() < 0 )
_nScrollY = aUpperLeft.Y() - TABWIN_SPACING_Y;
}
@@ -534,7 +529,6 @@ void OJoinTableView::EnsureVisible(const OTableWindow* _pWin)
{
// data about the tab win
TTableWindowData::value_type pData = _pWin->GetData();
- // Point aUpperLeft = pData->GetPosition();
EnsureVisible( pData->GetPosition() , pData->GetSize());
Invalidate(INVALIDATE_NOCHILDREN);
}
@@ -1228,10 +1222,6 @@ BOOL OJoinTableView::IsAddAllowed()
return FALSE;
}
- // nicht wenn keine Joins moeglich
-// if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount())
-// return FALSE;
-
return TRUE;
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx
b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 3720e53..fff4d5b 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -46,7 +46,6 @@ OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const
DBG_CTOR(OQueryTableConnection,NULL);
}
-
//------------------------------------------------------------------------
OQueryTableConnection::OQueryTableConnection(const OQueryTableConnection& rConn)
:OTableConnection( rConn )
@@ -97,9 +96,4 @@ sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare
}
// -----------------------------------------------------------------------------
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index 40111be..4f7e2d3 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -166,7 +166,4 @@ BOOL OQueryTableConnectionData::Update()
}
// -----------------------------------------------------------------------------
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx
b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 4700ebf..cde173a 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -120,11 +120,10 @@ sal_Bool OQueryTableWindow::Init()
sAliasName = String(sAliasName).EraseAllChars('"');
SetAliasName(sAliasName);
// SetAliasName reicht das als WinName weiter, dadurch benutzt es die Basisklasse
- // reset the titel
+ // reset the title
m_aTitle.SetText( pWinData->GetWinName() );
m_aTitle.Show();
- // sal_Bool bSuccess(sal_True);
if (!bSuccess)
{ // es soll nur ein Dummy-Window aufgemacht werden ...
DBG_ASSERT(GetAliasName().getLength(), "OQueryTableWindow::Init : kein Alias- UND kein
Tabellenname geht nicht !");
@@ -239,6 +238,4 @@ void OQueryTableWindow::KeyInput( const KeyEvent& rEvt )
}
// -----------------------------------------------------------------------------
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 1f24d18..920fb54 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -481,8 +481,6 @@ namespace
if ( pEntryConnData->GetJoinType() == INNER_JOIN && !pEntryConnData->isNatural() )
return;
- // Reference< XConnection> xConnection =
static_cast<OQueryController&>(_pView->getController()).getConnection();
-
if(!aJoin.getLength())
{
OQueryTableWindow* pEntryTabFrom =
static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
@@ -580,7 +578,6 @@ namespace
if ( pLeftTable )
{
OQueryTableWindow* pLeftWindow =
static_cast<OQueryTableView*>(_pView->getTableView())->FindTable(
getTableRange(_pView,pLeftTable->getByRule(OSQLParseNode::table_ref) ));
- // OQueryTableWindow* pRightWindow =
static_cast<OQueryTableView*>(_pView->getTableView())->FindTable(
getTableRange(_pView,pRightTable->getByRule(OSQLParseNode::table_ref) ));
if ( pLeftWindow == aDragLeft->GetTabWindow() )
insertConnection(_pView,_eJoinType,aDragLeft,aDragRight);
else
@@ -1549,13 +1546,6 @@ namespace
&rController.getParser().getContext(),
sal_True,
sal_True); // quote is to true because we need quoted
elements inside the function
- // i75557
- //pFunction->parseNodeToPredicateStr(aColumnName,
- // xConnection,
- //
rController.getNumberFormatter(),
- // _pView->getLocale(),
- //
static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
- //
&rController.getParser().getContext());
// don't display the column name
aCondition = aCondition.copy(aColumnName.getLength());
aCondition = aCondition.trim();
@@ -2205,11 +2195,6 @@ namespace
_pView->getLocale(),
static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
&rController.getParser().getContext());
- //pColumnRef->parseNodeToStr( aColumns,
- // xConnection,
- //
&rController.getParser().getContext(),
- // sal_True,
- // sal_True); // quote
is to true because we need quoted elements inside the function
sal_Int32 nFunctionType = FKT_NONE;
::connectivity::OSQLParseNode* pParamRef = NULL;
@@ -2279,7 +2264,7 @@ namespace
eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField);
bFirstField = sal_False;
}
- else //if(SQL_ISRULE(pColumnRef,num_value_exp) ||
SQL_ISRULE(pColumnRef,term))
+ else
{
::rtl::OUString aColumns;
pColumnRef->parseNodeToStr( aColumns,
@@ -2839,7 +2824,7 @@ sal_Bool OQueryDesignView::checkStatement()
{
sal_Bool bRet = sal_True;
if ( m_pSelectionBox )
- bRet = m_pSelectionBox->Save(); // a error occured so we return no
+ bRet = m_pSelectionBox->Save(); // an error occured so we return no
return bRet;
}
//-------------------------------------------------------------------------------
@@ -3029,7 +3014,6 @@ void OQueryDesignView::SaveUIConfig()
{
OQueryController& rCtrl = static_cast<OQueryController&>(getController());
rCtrl.SaveTabWinsPosSize( m_pTableView->GetTabWinMap(),
m_pScrollWindow->GetHScrollBar()->GetThumbPos(), m_pScrollWindow->GetVScrollBar()->GetThumbPos() );
- // rCtrl.SaveTabFieldsWidth( m_pSelectionBox );
rCtrl.setVisibleRows( m_pSelectionBox->GetNoneVisibleRows() );
if ( m_aSplitter.GetSplitPosPixel() != 0 )
rCtrl.setSplitPos( m_aSplitter.GetSplitPosPixel() );
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index 21c4d3a..9c1de0a 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -134,8 +134,4 @@ void OTabFieldMovedUndoAct::Undo()
}
// -----------------------------------------------------------------------------
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index faef87d..ff2da95 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -812,7 +812,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
if ( m_pAccessible )
m_pAccessible->notifyAccessibleEvent( AccessibleEventId::CHILD,
makeAny(pTabWin->GetAccessible()),
- Any()
+ Any()
);
}
@@ -832,8 +832,6 @@ void OQueryTableView::GetConnection(OQueryTableConnection* pConn)
// bei mir und dem Dokument einfuegen
addConnection( pConn );
- // invalidieren (damit es neu gezeichnet wird)
- // pConn->Invalidate();
}
//------------------------------------------------------------------------
@@ -963,9 +961,6 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUn
for(;aIter != aEnd;++aIter)
addConnection(*aIter); // add all connections from the undo action
- // each connection should invalidated inside addConnection so we don't need this here
any longer
-// if ( !pOwnList->empty() )
-// InvalidateConnections();
pTableCon->clear();
// und die Daten des Fensters ebenfalls in Liste (des Docs)
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx
b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 5644e88..745b9e4 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -62,7 +62,6 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
m_pEdit->SaveValue();
m_pEdit->SetPosPixel( Point( 0, 0 ) );
m_pEdit->Show();
- // m_pEdit->GrabFocus();
}
// -----------------------------------------------------------------------------
OQueryTextView::~OQueryTextView()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 6b10e23..4f02a1f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -136,7 +136,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
| BROWSER_HEADERBAR_NEW ;
m_pTextCell = new Edit(&GetDataWindow(), 0);
- // m_pTextCell->EnableSpecialCheck(sal_False);
m_pVisibleCell = new CheckBoxControl(&GetDataWindow());
m_pTableCell = new ListBoxControl(&GetDataWindow());
m_pTableCell->SetDropDownLineCount( 20 );
m_pFieldCell = new ComboBoxControl(&GetDataWindow());
m_pFieldCell->SetDropDownLineCount( 20 );
@@ -153,9 +152,6 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
// TriState der ::com::sun::star::form::CheckBox abschalten
m_pVisibleCell->GetBox().EnableTriState( sal_False );
-// m_pEmptyEntry = new OTableFieldDesc();
-// m_pEmptyEntry->SetColWidth(DEFAULT_SIZE);
-
Font aTitleFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_SANS_UNICODE,Window::GetSettings().GetLanguage(),DEFAULTFONT_FLAGS_ONLYONE);
aTitleFont.SetSize(Size(0, 6));
SetTitleFont(aTitleFont);
@@ -217,7 +213,7 @@ void OSelectionBrowseBox::initialize()
m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
m_aFunctionStrings +=
String(ByteString(rContext.getIntlKeywordAscii(eFunctions[i])),RTL_TEXTENCODING_UTF8);
- } // for (sal_Int32 i = 0; i < SAL_N_ELEMENTS(eFunctions) ; ++i)
+ }
m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
m_aFunctionStrings += sGroup;
@@ -336,7 +332,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
pUndoAct->SetTabFieldDescr(pOldEntry);
getDesignView()->getController().addUndoActionAndInvalidate(pUndoAct);
- } // if ( !m_bInUndoMode && _bCreateUndo )
+ }
}
}
else
@@ -367,7 +363,7 @@ void OSelectionBrowseBox::Init()
const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
if ( aTemp.Height() > aHeight.Height() )
aHeight.Height() = aTemp.Height();
- } // for(int i= 0; i < SAL_N_ELEMENTS(pControls);++i
+ }
SetDataRowHeight(aHeight.Height());
SetTitleLines(1);
// Anzahl der sichtbaren Zeilen ermitteln
@@ -1138,7 +1134,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
delete pParseNode;
}
else
- {
+ {
if(xColumn.is())
{
sal_Int32 nType = 0;
@@ -1194,7 +1190,6 @@ sal_Bool OSelectionBrowseBox::SaveModified()
bError = sal_True;
}
}
- // }
}
strOldCellContents = pEntry->GetCriteria(nIdx);
pEntry->SetCriteria(nIdx, aCrit);
@@ -1798,8 +1793,8 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
++m_nVisibleCount;
}
m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = sal_True;
- } // if (!pEntry->GetCriteria(nLevel).getLength() )
- } // for(;aIter != getFields().end();++aIter)
+ }
+ }
}
//------------------------------------------------------------------------------
void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const String& rValue,
const sal_uInt16 nLevel,bool _bAddOrOnOneLine )
@@ -1833,7 +1828,6 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo,
const S
pEntry->SetGroupBy(sal_False);
else
{
-// pEntry->SetGroupBy(rInfo->IsGroupBy());
if(!m_bGroupByUnRelated && pEntry->IsGroupBy())
pEntry->SetVisible(sal_True);
}
@@ -1848,13 +1842,13 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo,
const S
}
m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True;
break;
- } // if (!pEntry->GetCriteria(nLevel).getLength() )
+ }
if ( _bAddOrOnOneLine )
{
pLastEntry = pEntry;
}
}
- } // for(;aIter != getFields().end();++aIter)
+ }
if ( pLastEntry.is() )
{
String sCriteria = rValue;
@@ -2339,7 +2333,6 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32
_nFunctionTokenId,Strin
String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
{
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
- // DBG_ASSERT(nCellIndex < (GetRowCount()-1),"CellIndex ist zu gross");
if ( GetCurColumnId() == nColId && !m_bInUndoMode )
SaveModified();
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 27d4f73..fca8f9f 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -83,7 +83,6 @@ OTableConnectionData::~OTableConnectionData()
DBG_DTOR(OTableConnectionData,NULL);
// LineDataList loeschen
OConnectionLineDataVec().swap(m_vConnLineData);
- //ResetConnLines(FALSE);
}
//------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 0c7562a..c86204f 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -121,7 +121,7 @@ OTableWindow::~OTableWindow()
OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!");
::std::auto_ptr<Window> aTemp(m_pListBox);
m_pListBox = NULL;
- } // if (m_pListBox)
+ }
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index da43c14..9ffe63e 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -49,7 +49,6 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
- // using namespace ::com::sun::star::awt;
using namespace ::com::sun::star;
OTableWindowAccess::OTableWindowAccess(OTableWindow* _pTable)
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index e6f8965..414a941 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -166,7 +166,6 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
if(m_pTabWin)
{
bHandled = m_pTabWin->HandleKeyInput(*pKeyEvent);
- // bHandled = TRUE;
}
break;
}
@@ -196,7 +195,6 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
ScrollOutputArea( -1 );
pEntry = GetEntry( m_aMousePos );
Select( pEntry, TRUE );
-// m_aScrollTimer.Start();
}
return 0;
@@ -214,7 +212,6 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
ScrollOutputArea( 1 );
pEntry = GetEntry( m_aMousePos );
Select( pEntry, TRUE );
-// m_aScrollTimer.Start();
}
return 0;
@@ -247,7 +244,6 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
&& OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) )
{ // don't drop into the window if it's the drag source itself
-
// remove the selection if the dragging operation is leaving the window
if (_rEvt.mbLeaving)
SelectAll(FALSE);
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 55b141b..5887547 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -129,15 +129,6 @@ void OTableWindowTitle::Command( const CommandEvent& rEvt )
}
//------------------------------------------------------------------------------
-//void OTableWindowTitle::Paint( const Rectangle& rRect )
-//{
-// //////////////////////////////////////////////////////////////////////
-// // Ausgabe des Textes in der Titelzeile
-// Rectangle aWinRect( Point(0,0), GetSizePixel() );
-// DrawText( aWinRect, GetText(), TEXT_DRAW_CENTER|TEXT_DRAW_VCENTER|TEXT_DRAW_ENDELLIPSIS );
-//}
-
-//------------------------------------------------------------------------------
void OTableWindowTitle::KeyInput( const KeyEvent& rEvt )
{
if ( m_pTabWin )
@@ -216,7 +207,4 @@ void OTableWindowTitle::StateChanged( StateChangedType nType )
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index fea12cd..43123df 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -86,12 +86,11 @@ namespace dbaui
m_xBeamer = NULL;
if(xCloseable.is())
xCloseable->close(sal_False); // false - holds the owner ship of this frame
- // m_xBeamer->setComponent(NULL,NULL);
- }
- {
- ::std::auto_ptr<Window> aTemp(m_pSplitter);
- m_pSplitter = NULL;
}
+
+ ::std::auto_ptr<Window> aTemp(m_pSplitter);
+ m_pSplitter = NULL;
+
}
// -----------------------------------------------------------------------------
bool OQueryContainerWindow::switchView( ::dbtools::SQLExceptionInfo* _pErrorInfo )
@@ -253,7 +252,7 @@ namespace dbaui
m_pSplitter->Show();
Resize();
- }
+ }
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index b08e616..7e7d1bb 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -699,7 +699,6 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
if(m_bGraphicalDesign)
InvalidateFeature(ID_BROWSER_ADDTABLE);
}
- // InvalidateFeature(ID_BROWSER_QUERY_EXECUTE);
break;
case SID_QUERY_VIEW_FUNCTIONS:
case SID_QUERY_VIEW_TABLES:
@@ -739,15 +738,10 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
&
break;
case ID_QUERY_ZOOM_IN:
{
-// m_aZoom *= Fraction(1,10);
-// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
}
break;
case ID_QUERY_ZOOM_OUT:
{
-// if(m_aZoom != Fraction(1,1))
-// m_aZoom /= Fraction(1,10);
-// static_cast<OQueryViewSwitch*>(getView())->zoomTableView(m_aZoom);
}
break;
#if OSL_DEBUG_LEVEL > 1
@@ -784,11 +778,10 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue
&
pNodeTmp = pTemp->getChild(1);
OSQLParseNode::compress(pNodeTmp);
pNodeTmp = pTemp->getChild(1);
- } // if ( pCondition ) // no where clause
+ }
::rtl::OUString sTemp;
pNode->parseNodeToStr(sTemp,getConnection());
getContainer()->setStatement(sTemp);
-
}
}
@@ -1170,7 +1163,7 @@ void SAL_CALL OQueryController::disposing( const EventObject& Source )
throw(Run
if ( getContainer() && Source.Source.is() )
{
if ( Source.Source == m_aCurrentFrame.getFrame() )
- { // our frame is beeing disposed -> close the preview window (if we have one)
+ { // our frame is being disposed -> close the preview window (if we have one)
Reference< XFrame > xPreviewFrame( getContainer()->getPreviewFrame() );
::comphelper::disposeComponent( xPreviewFrame );
}
@@ -1387,7 +1380,6 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>&
_xElement
{
String sName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) );
aDefaultName = sName.GetToken(0,' ');
- //aDefaultName = getPrivateTitle( );
aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName);
}
@@ -1553,7 +1545,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs)
// now check if our datasource has set a tablefilter and if so, append the new
table name to it
::dbaui::appendToFilter( getConnection(), m_sName, getORB(), getView() );
- } // if ( editingView() )
+ }
Reference< XTitleChangeListener> xEventListener(impl_getTitleHelper_throw(),UNO_QUERY);
if ( xEventListener.is() )
{
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx
b/dbaccess/source/ui/querydesign/querydlg.cxx
index b5db294..b3e277b 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -320,8 +320,6 @@ TTableConnectionData::value_type DlgQryJoin::getConnectionData() const
// -----------------------------------------------------------------------------
void DlgQryJoin::setValid(sal_Bool _bValid)
{
- //LBChangeHdl(&aLB_JoinType);
-
aPB_OK.Enable(_bValid || eJoinType == CROSS_JOIN );
}
// -----------------------------------------------------------------------------
--
1.7.2.2
Context
- [Libreoffice] [PATCH] Another Base spelling, dead code patch · Wols Lists
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.