summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx18
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx18
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx5
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx18
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx6
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx34
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx10
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx2
14 files changed, 69 insertions, 72 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 0e9c68d14240..e4cf2969071c 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -759,7 +759,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
if ( xGridSet.is() )
xGridSet->setPropertyValue(PROPERTY_BORDER, makeAny((sal_Int16)2));
- // ----------
+
// marry them
Reference< ::com::sun::star::container::XNameContainer > xNameCont(m_xRowSet, UNO_QUERY);
{
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 4ae9f848e82c..de516292be6e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -32,13 +32,11 @@
namespace dbaui
{
-
struct BooleanSettingDesc;
typedef ::std::vector< BooleanSettingDesc > BooleanSettingDescs;
// SpecialSettingsPage
- /** implements the "Special Settings" page of the advanced database settings
- */
+ // implements the "Special Settings" page of the advanced database settings
class SpecialSettingsPage : public OGenericAdministrationPage
{
protected:
@@ -115,7 +113,7 @@ namespace dbaui
GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
- // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
+ // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
virtual ~GeneratedValuesPage();
// must be overloaded by subclasses, but it isn't pure virtual
@@ -131,7 +129,7 @@ namespace dbaui
DECL_LINK( OnCheckBoxClick, CheckBox * );
};
-} // namespace dbaui
+}
#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index f84984f28304..c05f561c2515 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -35,7 +35,7 @@ ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContain
ORelationTableConnection::ORelationTableConnection( const ORelationTableConnection& rConn )
: OTableConnection( rConn )
{
- // keine eigenen Members, also reicht die Basisklassenfunktionalitaet
+ // no own members, thus the base class functionality is enough
}
ORelationTableConnection::~ORelationTableConnection()
@@ -44,7 +44,7 @@ ORelationTableConnection::~ORelationTableConnection()
ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn )
{
- // nicht dass es was aendern wuerde, da die Basisklasse das auch testet und ich keine eigenen Members zu kopieren habe
+ // this doesn't change anything, since the base class tests this, too and I don't have my own members to copy
if (&rConn == this)
return *this;
@@ -59,7 +59,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) )
return;
- // Linien nach oberster Linie durchsuchen
+ // search lines for top line
Rectangle aBoundingRect;
long nTop = GetBoundingRect().Bottom();
long nTemp;
@@ -82,7 +82,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
}
}
- // Kardinalitaet antragen
+ // cardinality
if( !pTopLine )
return;
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index aa7c5c83a606..a046a0ea9675 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -78,7 +78,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData()
sal_Bool ORelationTableConnectionData::DropRelation()
{
::osl::MutexGuard aGuard( m_aMutex );
- // Relation loeschen
+ // delete relation
Reference< XIndexAccess> xKeys = getReferencingTable()->getKeys();
if( !m_aConnName.isEmpty() && xKeys.is() )
{
@@ -107,7 +107,7 @@ sal_Bool ORelationTableConnectionData::DropRelation()
void ORelationTableConnectionData::ChangeOrientation()
{
- // Source- und DestFieldName der Linien austauschen
+ // exchange Source- and DestFieldName of the lines
OUString sTempString;
OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin();
OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end();
@@ -118,7 +118,7 @@ void ORelationTableConnectionData::ChangeOrientation()
(*aIter)->SetDestFieldName( sTempString );
}
- // Member anpassen
+ // adapt member
TTableWindowData::value_type pTemp = m_pReferencingTable;
m_pReferencingTable = m_pReferencedTable;
m_pReferencedTable = pTemp;
@@ -184,7 +184,7 @@ sal_Bool ORelationTableConnectionData::IsConnectionPossible()
{
::osl::MutexGuard aGuard( m_aMutex );
- // Wenn die SourceFelder ein PrimKey sind, ist nur die Orientierung falsch
+ // if the SourceFields are a PrimKey, it's only the orientation which is wrong
if ( IsSourcePrimKey() && !IsDestPrimKey() )
ChangeOrientation();
@@ -203,7 +203,7 @@ OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OC
void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
{
- // wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator=
+ // retract to the (non-virtual) operator= like in the base class
*this = *static_cast<const ORelationTableConnectionData*>(&rSource);
}
@@ -251,7 +251,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
sal_Bool ORelationTableConnectionData::Update()
{
::osl::MutexGuard aGuard( m_aMutex );
- // Alte Relation loeschen
+ // delete old relation
{
DropRelation();
if( !IsConnectionPossible() )
@@ -264,7 +264,7 @@ sal_Bool ORelationTableConnectionData::Update()
if ( !xKeys.is() )
return sal_False;
- // Neue Relation erzeugen
+ // create new relation
Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY);
OSL_ENSURE(xKeyFactory.is(),"No XDataDescriptorFactory Interface!");
Reference<XAppend> xAppend(xKeyFactory,UNO_QUERY);
@@ -318,7 +318,7 @@ sal_Bool ORelationTableConnectionData::Update()
// to get the key we have to reget it because after append it is no longer valid
}
- // get the name of foreign key // search for columns
+ // get the name of foreign key; search for columns
m_aConnName = OUString();
xKey.clear();
bool bDropRelation = false;
@@ -418,7 +418,7 @@ xKey.clear();
}
// NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine)
- // Kardinalitaet bestimmen
+ // determine cardinality
SetCardinality();
return sal_True;
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index ea7b14200f73..dece62710d8a 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -114,14 +114,14 @@ void ORelationTableView::ReSync()
}
(*GetTabWinMap())[pData->GetComposedName()] = pTabWin; // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe
- // wenn in den Daten keine Position oder Groesse steht -> Default
+ // if there's no position or size contained in the data -> Default
if (!pData->HasPosition() && !pData->HasSize())
SetDefaultTabWinPosSize(pTabWin);
pTabWin->Show();
}
- // Verbindungen einfuegen
+ // insert connection
TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData();
TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin();
@@ -137,7 +137,8 @@ void ORelationTableView::ReSync()
bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end();
if (bInvalid)
- { // nein -> Pech gehabt, die Connection faellt weg
+ {
+ // no -> bad luck, die Connection faellt weg
pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
continue;
}
@@ -176,15 +177,14 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
}
}
// insert table connection into view
-
TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(),
pDestWin->GetData()));
- // die Namen der betroffenen Felder
+ // the names of the affected fields
OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry);
OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry);
- // die Anzahl der PKey-Felder in der Quelle
+ // the number of PKey-Fields in the source
const Reference< XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(pSourceWin->GetData()->getTable());
bool bAskUser = xPrimaryKeyColumns.is() && Reference< XIndexAccess>(xPrimaryKeyColumns,UNO_QUERY)->getCount() > 1;
@@ -196,10 +196,10 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
{
try
{
- // Daten der Datenbank uebergeben
+ // hand over data to the database
if( pTabConnData->Update() )
{
- // UI-Object in ConnListe eintragen
+ // enter UI-object into ConnList
addConnection( new ORelationTableConnection( this, pTabConnData ) );
}
}
@@ -288,7 +288,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
return;
}
- // Neue Datenstruktur in DocShell eintragen
+ // enter the new data structure into DocShell
TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
pNewTabWinData->ShowAll(sal_False);
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 980da26282f7..058ae3489cf8 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -28,7 +28,6 @@
using namespace dbaui;
// class OFieldDescGenWin
-
OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) :
TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
{
@@ -69,7 +68,7 @@ OUString OFieldDescGenWin::GetControlText( sal_uInt16 nControlId )
void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rText )
{
- // Texte der Controls setzen
+ // set texts of the controls
m_pFieldControl->SetControlText(nControlId,rText);
}
@@ -94,7 +93,7 @@ void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr )
void OFieldDescGenWin::GetFocus()
{
- // Setzt den Focus auf das zuletzt aktive Control
+ // sets the focus to the control that was active last
TabPage::GetFocus();
if(m_pFieldControl)
m_pFieldControl->GetFocus();
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 545e89aa132d..40f8e071d543 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -52,8 +52,8 @@ namespace dbaui
#if OSL_DEBUG_LEVEL > 0
OTableEditorCtrl* GetEditorCtrl();
#endif
- // short GetFormatCategory(OFieldDescription* pFieldDescr);
- // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...)
+ // short GetFormatCategory(OFieldDescription* pFieldDescr);
+ // gives you one of the CAT_xxx-values (CAT_NUMBER, CAT_DATE ...) belonging to the format specified by the field
OUString BoolStringPersistent(const OUString& rUIString) const;
OUString BoolStringUI(const OUString& rPersistentString) const;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index fe794e2d9ac4..f0b549243c46 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -105,7 +105,7 @@ void OTableEditorCtrl::Init()
{
OTableRowView::Init();
- // Should it be opened ReadOnly ?
+ // Should it be opened ReadOnly?
sal_Bool bRead(GetView()->getController().isReadOnly());
SetReadOnly( bRead );
@@ -474,7 +474,7 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool bGrabFocus)
void OTableEditorCtrl::CursorMoved()
{
- // New line ?
+ // New line?
m_nDataPos = GetCurRow();
if( m_nDataPos != nOldDataPos && m_nDataPos != -1)
{
@@ -549,7 +549,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
// Store DescrCell
case HELP_TEXT:
{
- // Wenn aktuelle Feldbeschreibung NULL, Default setzen
+ // if the current field description is NULL, set Default
if( !pActFieldDescr )
{
pHelpTextCell->SetText(OUString());
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index f6dace202c9f..d47bbe71338d 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -94,7 +94,7 @@ using namespace ::dbtools;
using namespace ::dbaui;
using namespace ::comphelper;
-// Anzahl Spalten beim Neuanlegen
+// number of columns when creating it from scratch
#define NEWCOLS 128
namespace
@@ -182,7 +182,7 @@ void OTableController::disposing()
FeatureState OTableController::GetState(sal_uInt16 _nId) const
{
FeatureState aReturn;
- // (disabled automatically)
+ // disabled automatically
switch (_nId)
{
@@ -785,12 +785,12 @@ void OTableController::appendPrimaryKey(Reference<XKeysSupplier>& _rxSup,sal_Boo
void OTableController::loadData()
{
- // Wenn Datenstruktur bereits vorhanden, Struktur leeren
+ // if the data structure already exists, empty it
m_vRowList.clear();
::boost::shared_ptr<OTableRow> pTabEdRow;
Reference< XDatabaseMetaData> xMetaData = getMetaData( );
- // Datenstruktur mit Daten aus DatenDefinitionsObjekt fuellen
+ // fill data structure with data from DataDefinitionObject
if(m_xTable.is() && xMetaData.is())
{
Reference<XColumnsSupplier> xColSup(m_xTable,UNO_QUERY);
@@ -798,9 +798,9 @@ void OTableController::loadData()
Reference<XNameAccess> xColumns = xColSup->getColumns();
OFieldDescription* pActFieldDescr = NULL;
// ReadOnly-Flag
- // Bei Drop darf keine Zeile editierbar sein.
- // Bei Add duerfen nur die leeren Zeilen editierbar sein.
- // Bei Add und Drop koennen alle Zeilen editiert werden.
+ // For Drop no row may be editable
+ // For Add only the empty rows may be editable
+ // For Add and Drop all rows can be edited
// sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn();
sal_Bool bIsAlterAllowed = isAlterAllowed();
Sequence< OUString> aColumns = xColumns->getElementNames();
@@ -865,7 +865,7 @@ void OTableController::loadData()
pActFieldDescr->SetHorJustify(dbaui::mapTextJustify(nAlign));
pActFieldDescr->SetCurrency(bIsCurrency);
- // Spezielle Daten
+ // special data
pActFieldDescr->SetIsNullable(nNullable);
pActFieldDescr->SetControlDefault(aControlDefault);
pActFieldDescr->SetPrecision(nPrecision);
@@ -897,7 +897,7 @@ void OTableController::loadData()
}
}
- // Leere Zeilen fuellen
+ // fill empty rows
OTypeInfoMap::iterator aTypeIter = m_aTypeInfo.find(DataType::VARCHAR);
if(aTypeIter == m_aTypeInfo.end())
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index ec7986dac4d1..90dafa2287be 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -31,7 +31,7 @@ using namespace ::svt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
-//--- Defines
+// Defines
#define HANDLE_ID 0
OTableRowView::OTableRowView(Window* pParent)
@@ -61,12 +61,12 @@ void OTableRowView::Init()
aFont.SetWeight( WEIGHT_NORMAL );
GetDataWindow().SetFont( aFont );
- // Font fuer die Ueberschriften auf Light setzen
+ // set font for the headings to light
aFont = GetFont();
aFont.SetWeight( WEIGHT_LIGHT );
SetFont(aFont);
- // HandleColumn, fuer maximal fuenf Ziffern einrichten
+ // set up HandleColumn for at maximum 5 digits
InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index 08e7d9230a48..4cceb45dcae7 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -32,7 +32,7 @@ namespace dbaui
protected:
virtual void ActivateAggregate( EControlType eType );
virtual void DeactivateAggregate( EControlType eType );
- // Sind von den abgeleiteten Klassen zu impl.
+ // are to be implemented by the derived classes
virtual void CellModified(long nRow, sal_uInt16 nColId );
virtual sal_Bool IsReadOnly();
virtual void SetModified(sal_Bool bModified);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 2f28b09333ea..b87c9994c389 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -66,7 +66,7 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
OTableFieldDescWin::~OTableFieldDescWin()
{
- // Children zerstoeren
+ // destroy children
m_pHelpBar->Hide();
getGenPage()->Hide();
m_pHeader->Hide();
@@ -108,13 +108,13 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
{
- // 3D-Linie am oberen Fensterrand
+ // 3D-line at the top window border
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
SetLineColor( rStyleSettings.GetLightColor() );
DrawLine( Point(0,0), Point(GetSizePixel().Width(),0) );
- // 3D-Linie zum Abtrennen des Headers
+ // 3D-line for the separation of the header
DrawLine( Point(3, DETAILS_HEADER_HEIGHT), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT) );
SetLineColor( rStyleSettings.GetShadowColor() );
DrawLine( Point(3, DETAILS_HEADER_HEIGHT-1), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT-1) );
@@ -122,56 +122,56 @@ void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
void OTableFieldDescWin::Resize()
{
- // Abmessungen parent window
+ // dimensions of the parent window
Size aOutputSize( GetOutputSizePixel() );
long nOutputWidth = aOutputSize.Width();
long nOutputHeight = aOutputSize.Height();
- // da die GenPage scrollen kann, ich selber aber nicht, positioniere ich das HelpFenster, wenn ich zu schmal werde,
- // _unter_ der Genpage, nicht rechts daneben. Zuvor versuche ich aber noch, es etwas schmaler zu machen
+ // since the GenPage can scroll, but I can't, I position the HelpWindow, in case I become too slim,
+ // _below_ the Genpage, not on the right side. But before that I try to make it a bit smaller
long nHelpX, nHelpY;
long nHelpWidth, nHelpHeight;
long nPageWidth, nPageHeight;
- // passen beide nebeneinander (Rand + Page + Rand + Help) ?
+ // do both fit next to each other (margin + page + margin + help)?
if (STANDARD_MARGIN + DETAILS_OPT_PAGE_WIDTH + STANDARD_MARGIN + DETAILS_MIN_HELP_WIDTH <= nOutputWidth)
- { // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann
+ { // yes -> then we wonder if can give the help its optimum width
nHelpWidth = DETAILS_OPT_HELP_WIDTH;
nPageWidth = nOutputWidth - nHelpWidth - STANDARD_MARGIN - STANDARD_MARGIN;
if (nPageWidth < DETAILS_OPT_PAGE_WIDTH)
- { // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse
+ { // rather resize the help from its optimal width to it's minimum width
long nTransfer = DETAILS_OPT_PAGE_WIDTH - nPageWidth;
nPageWidth += nTransfer;
nHelpWidth -= nTransfer;
}
nHelpX = nOutputWidth - nHelpWidth;
- // die Hoehen sind dann einfach ...
+ // the heights are simple in that case...
nHelpY = DETAILS_HEADER_HEIGHT + 1;
nHelpHeight = nOutputHeight - nHelpY;
nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
}
else
- { // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help)
+ { // doesn't work next to each other, thus below each other (margin + header + page + help)
if (STANDARD_MARGIN + DETAILS_HEADER_HEIGHT + DETAILS_OPT_PAGE_HEIGHT + DETAILS_MIN_HELP_HEIGHT <= nOutputHeight)
- { // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen
+ { // it's at least enough, to fit both below each other (page optimal, help minimal)
nHelpHeight = DETAILS_OPT_HELP_HEIGHT;
nPageHeight = nOutputHeight - nHelpHeight - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
if (nPageHeight < DETAILS_OPT_PAGE_HEIGHT)
- { // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum)
+ { // like above: page optimal, help gets whatever is left (which is bigger/equal to its minimum)
long nTransfer = DETAILS_OPT_PAGE_HEIGHT - nPageHeight;
nPageHeight += nTransfer;
nHelpHeight -= nTransfer;
}
nHelpY = nOutputHeight - nHelpHeight;
- // und ueber die ganze Breite
- nHelpX = 0; // ohne Margin, da das HelpCtrl einen eigenen hat
+ // and across the entire width
+ nHelpX = 0; // without margin, since the HelpCtrl has its own one
nHelpWidth = nOutputWidth; // dito
nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN;
}
else
- { // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen
- nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster
+ { // unfortunately that's not even enough, to show page at its optimum and help with minimum widthn
+ nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // thus no help window
nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN;
nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
}
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 31d84a779cb7..d079c82a9342 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -116,7 +116,7 @@ namespace dbaui
void BasicInteractionHandler::implHandle(const ParametersRequest& _rParamRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
{
SolarMutexGuard aGuard;
- // want to open a dialog ....
+ // want to open a dialog...
sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations);
sal_Int32 nParamPos = getContinuation(SUPPLY_PARAMETERS, _rContinuations);
@@ -154,7 +154,7 @@ namespace dbaui
void BasicInteractionHandler::implHandle(const SQLExceptionInfo& _rSqlInfo, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
{
SolarMutexGuard aGuard;
- // want to open a dialog ....
+ // want to open a dialog...
sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations);
sal_Int32 nDisapprovePos = getContinuation(DISAPPROVE, _rContinuations);
@@ -182,7 +182,7 @@ namespace dbaui
// execute the dialog
OSQLMessageBox aDialog(NULL, _rSqlInfo, nDialogStyle);
- // TODO: need a way to specify the parent window
+ // TODO: need a way to specify the parent window
sal_Int16 nResult = aDialog.Execute();
try
{
@@ -227,7 +227,7 @@ namespace dbaui
void BasicInteractionHandler::implHandle(const DocumentSaveRequest& _rDocuRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
{
SolarMutexGuard aGuard;
- // want to open a dialog ....
+ // want to open a dialog ....
sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations);
sal_Int32 nDisApprovePos = getContinuation(DISAPPROVE, _rContinuations);
@@ -236,7 +236,7 @@ namespace dbaui
short nRet = RET_YES;
if ( -1 != nApprovePos )
{
- // fragen, ob gespeichert werden soll
+ // ask whether it should be saved
nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name);
}
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 6a5030bd9c3f..702138310548 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -32,7 +32,7 @@
// --- needed because of the solar mutex
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-// ---
+
namespace dbaui
{
generated by cgit (git 2.34.1) at 2024-07-28 10:42:23 +0000