[Libreoffice-commits] .: dbaccess/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Nov 18 08:11:26 PST 2010
dbaccess/source/ui/app/AppController.cxx | 3 ---
dbaccess/source/ui/app/AppControllerDnD.cxx | 2 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 17 ++++-------------
dbaccess/source/ui/app/AppDetailView.cxx | 15 ++-------------
dbaccess/source/ui/app/AppSwapWindow.cxx | 2 +-
dbaccess/source/ui/app/AppTitleWindow.cxx | 3 +--
dbaccess/source/ui/app/AppView.cxx | 13 ++-----------
7 files changed, 11 insertions(+), 44 deletions(-)
New commits:
commit 458566b62a7771940b7349388bdc0972a275d773
Author: Wol <anthony at youngman.org.uk>
Date: Wed Nov 10 13:44:48 2010 +0000
More spelling mistakes, translations and dead code deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index fa4d239..40a4fad 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2500,9 +2500,6 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const
nAction = DND_ACTION_NONE;
}
}
- /*else
- nAction = nActionAskedFor & DND_ACTION_COPYMOVE;
- */
}
return nAction;
}
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index a5d3f33..b22b28f 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -568,7 +568,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType )
{
- // read all nescessary data
+ // read all necessary data
::rtl::OUString sCommand;
sal_Bool bEscapeProcessing = sal_True;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 2d3d55b..ad45dd8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -193,7 +193,7 @@ namespace
{
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- } // if( bForeground || bFont )
+ }
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
@@ -543,13 +543,11 @@ sal_Bool OAppDetailPageHelper::isCutAllowed()
// -----------------------------------------------------------------------------
sal_Bool OAppDetailPageHelper::isCopyAllowed()
{
- //int nPos = getVisibleControlIndex();
return sal_True;
}
// -----------------------------------------------------------------------------
sal_Bool OAppDetailPageHelper::isPasteAllowed()
{
- //int nPos = getVisibleControlIndex();
return sal_True;
}
// -----------------------------------------------------------------------------
@@ -992,8 +990,7 @@ IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, void*, /*NOINTERESTEDIN*/ )
// -----------------------------------------------------------------------------
void OAppDetailPageHelper::Resize()
{
- //////////////////////////////////////////////////////////////////////
- // Abmessungen parent window
+ // parent window dimension
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
@@ -1130,12 +1127,6 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
{
m_aPreview.Hide();
m_aDocumentInfo.Hide();
-
- // Why the below code? It might have side effects, as the tree view needs to know
- // its current selection for other purposes than the preview, too.
-// DBTreeListBox* pTreeView = getCurrentView();
-// if ( pTreeView )
-// pTreeView->clearCurrentSelection();
}
}
catch( const Exception& )
@@ -1164,7 +1155,7 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
// work-around for #150518#: no layout manager (and thus no toolbars) in the preview
// Must be called after initialize ... but before any other call to this frame.
- // Otherwhise frame throws "life time exceptions" as e.g. NON_INITIALIZED
+ // Otherwise frame throws "life time exceptions" as e.g. NON_INITIALIZED
Reference< XPropertySet > xFrameProps( m_xFrame, UNO_QUERY_THROW );
xFrameProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ), makeAny(Reference< XLayoutManager >()) );
@@ -1413,7 +1404,7 @@ void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal
{
SetTextColor( rStyleSettings.GetFieldTextColor() );
SetTextFillColor();
- } // if( bForeground || bFont )
+ }
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index b532b64..4c9e50b 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -409,8 +409,6 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
m_aHelpText.SetTextFillColor();
m_aDescription.SetTextColor( rStyleSettings.GetFieldTextColor() );
m_aDescription.SetTextFillColor();
- //m_aFL.SetTextColor( rStyleSettings.GetFieldTextColor() );
- //m_aFL.SetTextFillColor();
}
if( bBackground )
@@ -433,11 +431,6 @@ void OTasksWindow::setHelpText(USHORT _nId)
{
String sText = ModuleRes(_nId);
- // calulate the size of the text field
- // Size aHelpTextSize = m_aHelpText.GetSizePixel();
- // Size aHelpTextPixelSize = LogicToPixel( aHelpTextSize, MAP_APPFONT );
- // Rectangle aPrimaryRect( Point(0,0), aHelpTextSize );
- // Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sText, TEXT_DRAW_MULTILINE | TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK ) );
m_aHelpText.SetText(sText);
}
else
@@ -458,8 +451,8 @@ IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/)
void OTasksWindow::Resize()
{
DBG_CHKTHIS(OTasksWindow,NULL);
- //////////////////////////////////////////////////////////////////////
- // Abmessungen parent window
+
+ // parent window dimension
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
@@ -471,9 +464,6 @@ void OTasksWindow::Resize()
m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) );
// i77897 make the m_aHelpText a little bit smaller. (-5)
sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5;
- // m_aHelpText.SetBackground( MAKE_SALCOLOR( 0xe0, 0xe0, 0xe0 ) );
- // Wallpaper aLightGray(Color(0xe0, 0xe0, 0xe0));
- // m_aHelpText.SetBackground( aLightGray );
m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) );
Size aDesc = m_aDescription.CalcMinimumSize();
m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) );
@@ -615,7 +605,6 @@ void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForegro
if( bBackground )
SetBackground( rStyleSettings.GetFieldColor() );
- //SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) );
m_aHorzSplitter.SetBackground( rStyleSettings.GetDialogColor() );
m_aHorzSplitter.SetFillColor( rStyleSettings.GetDialogColor() );
m_aHorzSplitter.SetTextFillColor(rStyleSettings.GetDialogColor() );
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 5becb11..fc508e2 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -169,7 +169,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
if ( _eType != E_NONE )
m_eLastType = _eType;
return true;
- } // if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) )
+ }
PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ) );
return false;
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 3c5c236..817d8ce 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -77,8 +77,7 @@ void OTitleWindow::setChildWindow(Window* _pChild)
// -----------------------------------------------------------------------------
void OTitleWindow::Resize()
{
- //////////////////////////////////////////////////////////////////////
- // Abmessungen parent window
+ // parent window dimension
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 889d716..8eceb9b 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -101,8 +101,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
// -----------------------------------------------------------------------------
OAppBorderWindow::~OAppBorderWindow()
{
- //////////////////////////////////////////////////////////////////////
- // Childs zerstoeren
+ // destroy children
if ( m_pPanel )
{
m_pPanel->Hide();
@@ -127,8 +126,7 @@ void OAppBorderWindow::GetFocus()
// -----------------------------------------------------------------------------
void OAppBorderWindow::Resize()
{
- //////////////////////////////////////////////////////////////////////
- // Abmessungen parent window
+ // parent window dimension
Size aOutputSize( GetOutputSize() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
@@ -185,10 +183,6 @@ void OAppBorderWindow::ImplInitSettings()
if( true )
SetBackground( rStyleSettings.GetDialogColor() );
-
- /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
- SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
- SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/
}
// -----------------------------------------------------------------------------
OApplicationView* OAppBorderWindow::getView() const
@@ -601,9 +595,6 @@ void OApplicationView::ImplInitSettings()
if( true )
SetBackground( rStyleSettings.GetFieldColor() );
- /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) );
- SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
- SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/
}
//-----------------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list