[Libreoffice-commits] .: connectivity/source cppuhelper/source cui/source
Miklos Vajna
vmiklos at kemper.freedesktop.org
Tue Apr 17 02:32:03 PDT 2012
connectivity/source/commontools/dbconversion.cxx | 12
connectivity/source/drivers/calc/CTable.cxx | 4
connectivity/source/drivers/dbase/DIndexIter.cxx | 2
connectivity/source/drivers/dbase/dindexnode.cxx | 4
connectivity/source/drivers/jdbc/Array.cxx | 2
connectivity/source/drivers/mozab/MResultSetMetaData.hxx | 2
connectivity/source/drivers/odbcbase/OConnection.cxx | 4
connectivity/source/drivers/odbcbase/OResultSet.cxx | 4
connectivity/source/inc/file/FTable.hxx | 4
connectivity/source/inc/flat/EConnection.hxx | 6
connectivity/source/inc/java/io/InputStream.hxx | 2
cppuhelper/source/propshlp.cxx | 2
cui/source/customize/cfgutil.cxx | 41 +-
cui/source/customize/macropg.cxx | 2
cui/source/customize/selector.cxx | 7
cui/source/dialogs/SpellDialog.cxx | 20 -
cui/source/dialogs/cuifmsearch.cxx | 85 ++---
cui/source/dialogs/cuigaldlg.cxx | 6
cui/source/dialogs/dlgname.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 2
cui/source/dialogs/hyphen.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 21 -
cui/source/dialogs/insdlg.cxx | 8
cui/source/dialogs/linkdlg.cxx | 41 +-
cui/source/dialogs/pastedlg.cxx | 2
cui/source/dialogs/plfilter.cxx | 2
cui/source/dialogs/postdlg.cxx | 4
cui/source/dialogs/scriptdlg.cxx | 2
cui/source/dialogs/thesdlg.cxx | 2
cui/source/dialogs/zoom.cxx | 14
cui/source/inc/autocdlg.hxx | 4
cui/source/inc/backgrnd.hxx | 6
cui/source/inc/bbdlg.hxx | 2
cui/source/inc/connect.hxx | 6
cui/source/inc/cuifmsearch.hxx | 65 ++--
cui/source/inc/cuitabarea.hxx | 22 -
cui/source/inc/cuitabline.hxx | 4
cui/source/inc/gallery.hrc | 6
cui/source/inc/iconcdlg.hxx | 43 +-
cui/source/inc/macroass.hxx | 4
cui/source/inc/macropg.hxx | 2
cui/source/inc/measure.hxx | 6
cui/source/inc/numfmt.hxx | 2
cui/source/inc/numpages.hxx | 8
cui/source/inc/page.hxx | 8
cui/source/inc/paragrph.hxx | 30 +-
cui/source/inc/postdlg.hxx | 8
cui/source/inc/tabstpge.hxx | 12
cui/source/inc/textanim.hxx | 2
cui/source/inc/textattr.hxx | 2
cui/source/inc/transfrm.hxx | 4
cui/source/options/dbregister.cxx | 4
cui/source/options/fontsubs.cxx | 12
cui/source/options/optHeaderTabListbox.cxx | 2
cui/source/options/optdict.cxx | 30 +-
cui/source/options/optfltr.cxx | 2
cui/source/options/optgenrl.cxx | 6
cui/source/options/optgenrl.hrc | 2
cui/source/options/opthtml.cxx | 2
cui/source/options/optinet2.cxx | 2
cui/source/options/optlingu.cxx | 12
cui/source/options/optmemory.cxx | 2
cui/source/options/optpath.cxx | 4
cui/source/options/optsave.cxx | 4
cui/source/options/treeopt.cxx | 24 -
cui/source/tabpages/autocdlg.cxx | 84 ++---
cui/source/tabpages/backgrnd.cxx | 162 ++++-------
cui/source/tabpages/border.cxx | 58 +---
cui/source/tabpages/border.hrc | 2
cui/source/tabpages/chardlg.cxx | 29 --
cui/source/tabpages/connect.cxx | 14
cui/source/tabpages/grfpage.cxx | 40 +-
cui/source/tabpages/labdlg.cxx | 26 -
cui/source/tabpages/macroass.cxx | 15 -
cui/source/tabpages/numfmt.cxx | 217 +++++++--------
cui/source/tabpages/numfmt.hrc | 2
cui/source/tabpages/numpages.cxx | 88 +++---
cui/source/tabpages/page.cxx | 124 +++-----
cui/source/tabpages/paragrph.cxx | 74 ++---
cui/source/tabpages/swpossizetabpage.cxx | 40 +-
cui/source/tabpages/tabarea.cxx | 18 -
cui/source/tabpages/tabarea.hrc | 4
cui/source/tabpages/textanim.cxx | 28 -
cui/source/tabpages/textattr.cxx | 30 --
cui/source/tabpages/tparea.cxx | 99 +++---
cui/source/tabpages/tpbitmap.cxx | 72 ++--
cui/source/tabpages/tpcolor.cxx | 85 ++---
cui/source/tabpages/tpgradnt.cxx | 81 ++---
cui/source/tabpages/tphatch.cxx | 64 +---
cui/source/tabpages/tpline.cxx | 4
cui/source/tabpages/tplnedef.cxx | 64 +---
cui/source/tabpages/tplneend.cxx | 46 +--
cui/source/tabpages/tpshadow.cxx | 59 +---
cui/source/tabpages/transfrm.cxx | 22 -
94 files changed, 1072 insertions(+), 1244 deletions(-)
New commits:
commit 223b99165a249d77c1658eff8ce2262875170ec9
Author: Florian Allmann-Rahn <f.allmann-rahn at gmx.de>
Date: Sun Apr 15 17:50:21 2012 +0200
translated or removed german comments in connectivity, cppuhelper and cui
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 7c6f10d..2e31620 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -133,7 +133,7 @@ namespace dbtools
//------------------------------------------------------------------------------
sal_Int32 DBTypeConversion::toINT32(const Time& rVal)
{
- // Zeit normalisieren
+ // normalize time
sal_Int32 nSeconds = rVal.Seconds + rVal.HundredthSeconds / 100;
sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
sal_Int32 nMinutes = rVal.Minutes + nSeconds / 60;
@@ -141,14 +141,14 @@ namespace dbtools
sal_Int32 nHours = rVal.Hours + nMinutes / 60;
nMinutes = nMinutes % 60;
- // Zeit zusammenbauen
+ // assemble time
return (sal_Int32)(nHundredthSeconds + (nSeconds*100) + (nMinutes*10000) + (nHours*1000000));
}
//------------------------------------------------------------------------------
sal_Int64 DBTypeConversion::toINT64(const DateTime& rVal)
{
- // Zeit normalisieren
+ // normalize time
sal_Int32 nSeconds = rVal.Seconds + rVal.HundredthSeconds / 100;
sal_Int32 nHundredthSeconds = rVal.HundredthSeconds % 100;
sal_Int32 nMinutes = rVal.Minutes + nSeconds / 60;
@@ -156,7 +156,7 @@ namespace dbtools
sal_Int32 nHours = rVal.Hours + nMinutes / 60;
nMinutes = nMinutes % 60;
- // Zeit zusammenbauen
+ // assemble time
sal_Int32 nTime = (sal_Int32)(nHundredthSeconds + (nSeconds*100) + (nMinutes*10000) + (nHours*1000000));
sal_Int32 nDate = ((sal_Int32)(rVal.Day%100)) + (((sal_Int32)(rVal.Month%100))*100) + (((sal_Int32) rVal.Year%10000)*10000);
sal_Int64 nRet;
@@ -369,7 +369,7 @@ namespace dbtools
nSign = 1;
Time xRet;
- // Zeit normalisieren
+ // normalize time
// we have to sal_Int32 here because otherwise we get an overflow
sal_Int32 nHundredthSeconds = nMS/10;
sal_Int32 nSeconds = nHundredthSeconds / 100;
@@ -380,7 +380,7 @@ namespace dbtools
xRet.Hours = (sal_uInt16)(nMinutes / 60);
xRet.Minutes = (sal_uInt16)(nMinutes % 60);
- // Zeit zusammenbauen
+ // assemble time
sal_Int32 nTime = (sal_Int32)(xRet.HundredthSeconds + (xRet.Seconds*100) + (xRet.Minutes*10000) + (xRet.Hours*1000000)) * nSign;
if(nTime < 0)
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index b4b841a..c1bfc58 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -749,7 +749,7 @@ sal_Bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::seekRow" );
// ----------------------------------------------------------
- // Positionierung vorbereiten:
+ // prepare positioning:
sal_uInt32 nNumberOfRecords = m_nDataRows;
sal_uInt32 nTempPos = m_nFilePos;
@@ -808,7 +808,7 @@ Error:
m_nFilePos = 0;
break;
case IResultSetHelper::BOOKMARK:
- m_nFilePos = nTempPos; // vorherige Position
+ m_nFilePos = nTempPos; // previous position
}
// aStatus.Set(SDB_STAT_NO_DATA_FOUND);
return sal_False;
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 1f86d3d..546daec 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -256,7 +256,7 @@ sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
ONDXKey* pKey;
if (bFirst)
{
- // erst alle NULL werte abklappern
+ // go through all NULL values first
for (sal_uIntPtr nRec = GetNull(bFirst);
nRec != STRING_NOTFOUND;
nRec = GetNull(sal_False))
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index d0e9f5a..e04ec3d 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -75,7 +75,7 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
// -----------------------------------------------------------------------------
//==================================================================
-// Index Seite
+// index page
//==================================================================
ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
:nPagePos(nPos)
@@ -204,7 +204,7 @@ sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
--nCount; // (otherwise we might get Assertions and GPFs - 60593)
bResult = Insert(rIndex.m_nCurNode + 1, rNode);
}
- else // Position unbekannt
+ else // position unknown
{
sal_uInt16 nPos = NODE_NOTFOUND;
while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 71abde0..d7ccb2a 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -126,7 +126,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc:
// initialize temporary variable
static const char * cSignature = "(Ljava/util/Map;)Ljava/sql/ResultSet;";
static const char * cMethodName = "getResultSetAtIndex";
- // Java-Call absetzen
+ // submit Java-Call
static jmethodID mID(NULL);
obtainMethodId(t.pEnv, cMethodName,cSignature, mID);
t.pEnv->CallObjectMethod( object, mID, index,count,obj);
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e046680..71ecad1 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
@@ -54,7 +54,7 @@ namespace connectivity
protected:
virtual ~OResultSetMetaData();
public:
- // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird:
+ // a constructor that is needed to return the object:
// OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){}
OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 323e9d2..b206ab4 100644
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -122,7 +122,6 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
#ifndef MACOSX
N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,(SQLPOINTER)(sal_IntPtr)nTimeOut,SQL_IS_UINTEGER);
- // Verbindung aufbauen
#endif
#ifdef LINUX
@@ -176,7 +175,7 @@ SQLRETURN OConnection::OpenConnection(const ::rtl::OUString& aConnectStr,sal_Int
}
- // autocoomit ist immer default
+ // autocoomit is always default
if (!m_bReadOnly)
N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_AUTOCOMMIT,(SQLPOINTER)SQL_AUTOCOMMIT_ON,SQL_IS_INTEGER);
@@ -190,7 +189,6 @@ SQLRETURN OConnection::Construct(const ::rtl::OUString& url,const Sequence< Prop
m_sURL = url;
setConnectionInfo(info);
- // Connection allozieren
N3SQLAllocHandle(SQL_HANDLE_DBC,m_pDriverHandleCopy,&m_aConnectionHandle);
if(m_aConnectionHandle == SQL_NULL_HANDLE)
throw SQLException();
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index a882c21..43f9616 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -285,11 +285,11 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
break;
case DataType::LONGVARCHAR:
case DataType::CLOB:
- aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // dient nur zum auffinden
+ aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // only for finding
break;
case DataType::LONGVARBINARY:
case DataType::BLOB:
- aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // dient nur zum auffinden
+ aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new char[2]),_nType); // only for finding
break;
case DataType::DATE:
aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new DATE_STRUCT),_nType);
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 23a1086..17224fa 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -50,9 +50,9 @@ namespace connectivity
OConnection* m_pConnection;
SvStream* m_pFileStream;
::rtl::Reference<OSQLColumns> m_aColumns;
- sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement
+ sal_Int32 m_nFilePos; // current IResultSetHelper::Movement
sal_uInt8* m_pBuffer;
- sal_uInt16 m_nBufferSize; // Groesse des ReadBuffer, wenn pBuffer != NULL
+ sal_uInt16 m_nBufferSize; // size of the ReadBuffer, if pBuffer != NULL
sal_Bool m_bWriteable; // svstream cann't say if we are writeable
// so we have to
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 23c4d40..986812a 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -42,9 +42,9 @@ namespace connectivity
sal_Int32 m_nMaxRowsToScan;
sal_Bool m_bHeaderLine; // column names in first row
sal_Unicode m_cFieldDelimiter; // look at the name
- sal_Unicode m_cStringDelimiter; // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter
- sal_Unicode m_cDecimalDelimiter; // Dezimal-delimiter (Dezimalpoint)
- sal_Unicode m_cThousandDelimiter; //
+ sal_Unicode m_cStringDelimiter;
+ sal_Unicode m_cDecimalDelimiter;
+ sal_Unicode m_cThousandDelimiter;
public:
OFlatConnection(ODriver* _pDriver);
virtual ~OFlatConnection();
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 889408f..c1f60b7 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -42,7 +42,7 @@ namespace connectivity
public ::cppu::WeakImplHelper1< ::com::sun::star::io::XInputStream>
{
protected:
- // statische Data for the class
+ // static Data for the Class
static jclass theClass;
virtual ~java_io_InputStream();
public:
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 9c5610f..f1ce426 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -86,7 +86,7 @@ class OPropertySetHelperInfo_Impl
public:
OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(());
- // XPropertySetInfo-Methoden
+ // XPropertySetInfo-methods
virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException);
virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException);
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 9b0cf67..932b1fb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -293,10 +293,10 @@ void SfxConfigFunctionListBox_Impl::MouseMove( const MouseEvent& )
}
IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer)
-/* Beschreibung
- Timer-Handler f"ur die Einblendung eines Hilfetextes. Wenn nach Ablauf des Timers
- der Mauszeiger immer noch auf dem aktuell selektierten Eintrag steht, wird der
- Helptext des Entries als Balloon-Help eingeblendet.
+/* Description
+ Timer-handler for showing a help-text. If the mouse pointer is
+ still on the currently selected entry after the timer has run out,
+ the entry's help-text is shown as a balloon-help.
*/
{
(void)pTimer; // unused
@@ -304,9 +304,9 @@ IMPL_LINK( SfxConfigFunctionListBox_Impl, TimerHdl, Timer*, pTimer)
}
void SfxConfigFunctionListBox_Impl::ClearAll()
-/* Beschreibung
- L"oscht alle Eintr"age in der FunctionListBox, alle UserDaten und alle evtl.
- vorhandenen MacroInfos.
+/* Description
+ Deletes all entries in the FunctionListBox, all UserData and all
+ possibly existing MacroInfo.
*/
{
sal_uInt16 nCount = aArr.Count();
@@ -374,9 +374,9 @@ String SfxConfigFunctionListBox_Impl::GetCurLabel()
}
void SfxConfigFunctionListBox_Impl::FunctionSelected()
-/* Beschreibung
- Setzt die Balloonhelp zur"uck, da diese immer den Helptext des selektierten
- Entry anzeigen soll.
+/* Description
+ Resets the balloon-help because it shall
+ always show the help-text of the selected entry.
*/
{
}
@@ -465,9 +465,8 @@ void SfxConfigGroupListBox_Impl::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
}
String SfxConfigGroupListBox_Impl::GetGroup()
-/* Beschreibung
- Gibt den Namen der selektierten Funktionsgruppe bzw. des selektierten
- Basics zur"uck.
+/* Description
+ Returns the name of the selected function group/the selected basic.
*/
{
SvLBoxEntry *pEntry = FirstSelected();
@@ -893,9 +892,9 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
//-----------------------------------------------
void SfxConfigGroupListBox_Impl::GroupSelected()
-/* Beschreibung
- Eine Funktionsgruppe oder eine Basicmodul wurde selektiert. Alle Funktionen bzw.
- Macros werden in der Functionlistbox anzeigt.
+/* Description
+ A function group or a basic module has been selected.
+ All functions/macros are displayed in the functionlistbox.
*/
{
SvLBoxEntry *pEntry = FirstSelected();
@@ -1028,21 +1027,16 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
sal_Bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
- // Wieviele Entries k"onnen angezeigt werden ?
sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
- // Wieviele Kinder sollen angezeigt werden ?
sal_uLong nChildCount = GetVisibleChildCount( pParent );
- // Passen alle Kinder und der parent gleichzeitig in die View ?
if ( nChildCount+1 > nEntries )
{
- // Wenn nicht, wenigstens parent ganz nach oben schieben
MakeVisible( pParent, sal_True );
}
else
{
- // An welcher relativen ViewPosition steht der aufzuklappende parent
SvLBoxEntry *pEntry = GetFirstEntryInView();
sal_uLong nParentPos = 0;
while ( pEntry && pEntry != pParent )
@@ -1051,7 +1045,6 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
pEntry = GetNextEntryInView( pEntry );
}
- // Ist unter dem parent noch genug Platz f"ur alle Kinder ?
if ( nParentPos + nChildCount + 1 > nEntries )
ScrollOutputArea( (short)( nEntries - ( nParentPos + nChildCount + 1 ) ) );
}
@@ -1061,8 +1054,8 @@ sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
}
void SfxConfigGroupListBox_Impl::RequestingChildren( SvLBoxEntry *pEntry )
-/* Beschreibung
- Ein Basic oder eine Bibliothek werden ge"offnet
+/* Description
+ A basic or a library is opened.
*/
{
SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 6f8b8d5..94719ff 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -90,7 +90,7 @@ _SvxMacroTabPage_Impl::~_SvxMacroTabPage_Impl()
delete pEventLB;
}
-// Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert
+// attention, this array is indexed directly (0, 1, ...) in the code
static long nTabs[] =
{
2, // Number of Tabs
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 6343692..21b5e61 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -153,7 +153,6 @@ void SvxConfigFunctionListBox_Impl::ClearAll()
String SvxConfigFunctionListBox_Impl::GetHelpText( SvLBoxEntry *pEntry )
{
- // Information zum selektierten Entry aus den Userdaten holen
SvxGroupInfo_Impl *pInfo =
pEntry ? (SvxGroupInfo_Impl*) pEntry->GetUserData(): 0;
@@ -864,21 +863,16 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
sal_Bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
- // Wieviele Entries k"onnen angezeigt werden ?
sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
- // Wieviele Kinder sollen angezeigt werden ?
sal_uLong nChildCount = GetVisibleChildCount( pParent );
- // Passen alle Kinder und der parent gleichzeitig in die View ?
if ( nChildCount+1 > nEntries )
{
- // Wenn nicht, wenigstens parent ganz nach oben schieben
MakeVisible( pParent, sal_True );
}
else
{
- // An welcher relativen ViewPosition steht der aufzuklappende parent
SvLBoxEntry *pEntry = GetFirstEntryInView();
sal_uLong nParentPos = 0;
while ( pEntry && pEntry != pParent )
@@ -887,7 +881,6 @@ sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
pEntry = GetNextEntryInView( pEntry );
}
- // Ist unter dem parent noch genug Platz f"ur alle Kinder ?
if ( nParentPos + nChildCount + 1 > nEntries )
ScrollOutputArea( (short)( nEntries - ( nParentPos + nChildCount + 1 ) ) );
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 23b3aa4..04f8185 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -308,7 +308,7 @@ SpellDialog::~SpellDialog()
void SpellDialog::Init_Impl()
{
- // Handler initialisieren
+ // initialize handler
aClosePB.SetClickHdl(LINK( this, SpellDialog, CancelHdl ) );
aChangePB.SetClickHdl(LINK( this, SpellDialog, ChangeHdl ) );
aChangeAllPB.SetClickHdl(LINK( this, SpellDialog, ChangeAllHdl ) );
@@ -368,7 +368,7 @@ void SpellDialog::UpdateBoxes_Impl()
SetSelectedLang_Impl( nAltLanguage );
InitUserDicts();
- // Alternativen eintragen
+ // enter alternatives
const ::rtl::OUString *pNewWords = aNewWords.getConstArray();
const sal_Int32 nSize = aNewWords.getLength();
for ( i = 0; i < nSize; ++i )
@@ -620,8 +620,6 @@ void SpellDialog::StartSpellOptDlg_Impl()
pDlg->SetTabPage( pPage );
if(RET_OK == pDlg->Execute())
{
-
- // Benutzerb"ucher anzeigen
InitUserDicts();
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
if(pOutSet)
@@ -888,17 +886,13 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
// -----------------------------------------------------------------------
void SpellDialog::SetLanguage( sal_uInt16 nLang )
-
-/* [Beschreibung]
-
- wenn die Sprache im Thesaurus umgestellt wurde,
- muss auch hier die Sprache umgestellt werden.
+/*
+ Description:
+ If the language has been changed in thesaurus,
+ it must be changed here, too.
*/
-
{
SetTitle_Impl( nLang );
-
- // den richtigen Eintrag finden, da sortiert
aLanguageLB.SelectLanguage( nLang );
}
@@ -1050,7 +1044,7 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
if (DIC_ERR_NONE != nAddRes)
{
SvxDicError( this, nAddRes );
- return 0; // Nicht weitermachen
+ return 0; // don't continue
}
// go on
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 2d28672..db1b7f8 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -135,7 +135,6 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const UniString& sInitialText, c
{
DBG_ASSERT(m_lnkContextSupplier.IsSet(), "FmSearchDialog::FmSearchDialog : have no ContextSupplier !");
- // erst mal die Informationen fuer den initialen Kontext
FmSearchContext fmscInitial;
fmscInitial.nContext = nInitialContext;
m_lnkContextSupplier.Call(&fmscInitial);
@@ -345,18 +344,17 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
{
if (m_pbClose.IsEnabled())
- { // der Button hat die Funktion 'Suchen'
+ { // the button has the function 'search'
UniString strThisRoundText = m_cmbSearchText.GetText();
- // zur History dazu
+ // to history
m_cmbSearchText.RemoveEntry(strThisRoundText);
m_cmbSearchText.InsertEntry(strThisRoundText, 0);
- // das Remove/Insert stellt a) sicher, dass der UniString nicht zweimal auftaucht, b), dass die zuletzt gesuchten Strings am
- // Anfang stehen
- // und die Listenlaenge beschraenken
+ // the remove/insert makes sure that a) the UniString does not appear twice and
+ // that b) the last searched strings are at the beginning and limit the list length
while (m_cmbSearchText.GetEntryCount() > MAX_HISTORY_ENTRIES)
m_cmbSearchText.RemoveEntry(m_cmbSearchText.GetEntryCount()-1);
- // den 'Ueberlauf'-Hint rausnehmen
+ // take out the 'overflow' hint
m_ftHint.SetText(UniString());
m_ftHint.Invalidate();
@@ -379,11 +377,11 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
}
}
else
- { // der Button hat die Fukntion 'Abbrechen'
+ { // the button has the function 'cancel'
DBG_ASSERT(m_pSearchEngine->GetSearchMode() != SM_BRUTE, "FmSearchDialog, OnClickedSearchAgain : falscher Modus !");
- // der CancelButton wird normalerweise nur disabled, wenn ich in einem Thread oder mit Reschedule arbeite
+ // the CancelButton is usually only disabled, when working in a thread or with reschedule
m_pSearchEngine->CancelSearch();
- // mein ProgressHandler wird gerufen, wenn es wirklich zu Ende ist, das hier war nur eine Anforderung
+ // the ProgressHandler is called when it's really finished, here it's only a demand
}
return 0;
}
@@ -464,7 +462,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
DBG_ASSERT(pBox->GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unerwartet : nicht genau ein Eintrag selektiert !");
m_pSearchEngine->RebuildUsedFields(m_rbAllFields.IsChecked() ? -1 : (sal_Int16)m_lbField.GetSelectEntryPos());
- // ruft auch m_pSearchEngine->InvalidatePreviousLoc auf
+ // calls m_pSearchEngine->InvalidatePreviousLoc too
sal_Int32 nCurrentContext = m_lbForm.GetSelectEntryPos();
if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
@@ -477,21 +475,20 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
{
sal_Bool bChecked = pBox->IsChecked();
- // Formatter oder case -> an die Engine weiterreichen
+ // formatter or case -> pass on to the engine
if (pBox == &m_cbUseFormat)
m_pSearchEngine->SetFormatterUsing(bChecked);
else if (pBox == &m_cbCase)
m_pSearchEngine->SetCaseSensitive(bChecked);
- // Richtung -> weiterreichen und Checkbox-Text fuer StartOver neu setzen
+ // direction -> pass on and reset the checkbox-text for StartOver
else if (pBox == &m_cbBackwards)
{
m_cbStartOver.SetText( String( CUI_RES( bChecked ? RID_STR_FROM_BOTTOM : RID_STR_FROM_TOP ) ) );
m_pSearchEngine->SetDirection(!bChecked);
}
- // Aehnlichkeitssuche oder regulaerer Ausdruck
+ // similarity-search or regular expression
else if ((pBox == &m_cbApprox) || (pBox == &m_cbRegular) || (pBox == &m_cbWildCard))
{
- // die beiden jeweils anderen Boxes disablen oder enablen
CheckBox* pBoxes[] = { &m_cbWildCard, &m_cbRegular, &m_cbApprox };
for (sal_uInt32 i=0; i< SAL_N_ELEMENTS(pBoxes); ++i)
{
@@ -504,13 +501,13 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
}
}
- // an die Engine weiterreichen
+ // pass on to the engine
m_pSearchEngine->SetWildcard(m_cbWildCard.IsEnabled() ? m_cbWildCard.IsChecked() : sal_False);
m_pSearchEngine->SetRegular(m_cbRegular.IsEnabled() ? m_cbRegular.IsChecked() : sal_False);
m_pSearchEngine->SetLevenshtein(m_cbApprox.IsEnabled() ? m_cbApprox.IsChecked() : sal_False);
- // (Boxes, die disabled sind, muessen als sal_False an die Engine gehen)
+ // (disabled boxes have to be passed to the engine as sal_False)
- // die Position-Listbox anpassen (ist bei Wildcard-Suche nicht erlaubt)
+ // adjust the Position-Listbox (which is not allowed during Wildcard-search)
if (pBox == &m_cbWildCard)
{
if (bChecked)
@@ -525,7 +522,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
}
}
- // und den Button fuer die Aehnlichkeitssuche
+ // and the button for similarity-search
if (pBox == &m_cbApprox)
{
if (bChecked)
@@ -570,7 +567,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
m_lnkContextSupplier.Call(&fmscContext);
DBG_ASSERT(nResult > 0, "FmSearchDialog::InitContext : ContextSupplier didn't give me any controls !");
- // packen wir zuerst die Feld-Namen in die entsprechende Listbox
+ // put teh field names into the respective listbox
m_lbField.Clear();
if (fmscContext.sFieldDisplayNames.Len() != 0)
@@ -599,11 +596,9 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
m_lbField.GrabFocus();
}
- // dann geben wir der Engine Bescheid
m_pSearchEngine->SwitchToContext(fmscContext.xCursor, fmscContext.strUsedFields, fmscContext.arrFields,
m_rbAllFields.IsChecked() ? -1 : 0);
- // und die Position des neuen Cursors anzeigen
m_ftRecord.SetText(String::CreateFromInt32(fmscContext.xCursor->getRow()));
}
@@ -617,17 +612,17 @@ IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox)
//------------------------------------------------------------------------
void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
{
- // wenn die Controls disabled werden sollen, schalte ich mal eben kurz ihr Paint aus und verzoegert wieder an
+ // when the controls shall be disabled their paint is turned off and then turned on again after a delay
if (!bEnable)
EnableControlPaint(sal_False);
else
- { // beim Enablen teste ich, ob der Timer fuer das delayed paint aktiv ist und stoppe ihn wenn noetig
+ {
if (m_aDelayedPaint.IsActive())
m_aDelayedPaint.Stop();
}
- // (das ganze geht unten noch weiter)
- // diese kleine Verrenkung fuehrt hoffentlich dazu, dass es nicht flackert, wenn man die SearchUI schnell hintereinander
- // aus- und wieder einschaltet (wie das bei einem kurzen Suchvorgang zwangslaeufig der Fall ist)
+ // (the whole thing goes on below)
+ // this small intricateness hopfully leads to no flickering when turning the SearchUI off
+ // and on again shortly after (like it's the case during a short search process)
if ( !bEnable )
{
@@ -639,11 +634,10 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
m_pPreSearchFocus = NULL;
}
- // der Suchen-Button hat einen Doppelfunktion, seinen Text entsprechend anpassen
+ // the search button has two functions -> adjust its text accordingly
String sButtonText( bEnable ? m_sSearch : m_sCancel );
m_pbSearchAgain.SetText( sButtonText );
- // jetzt Controls en- oder disablen
if (m_pSearchEngine->GetSearchMode() != SM_BRUTE)
{
m_flSearchFor.Enable (bEnable);
@@ -670,7 +664,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
}
}
- // und den Rest fuer das delayed paint
if (!bEnable)
m_aDelayedPaint.Start();
else
@@ -750,19 +743,17 @@ void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_I
{
FmFoundRecordInformation friInfo;
friInfo.nContext = m_lbForm.GetSelectEntryPos();
- // wenn ich keine Suche in Kontexten mache, steht hier was ungueltiges drin, aber dann ist es auch egal
+ // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = aCursorPos;
if (m_rbAllFields.IsChecked())
friInfo.nFieldPos = nFieldPos;
else
friInfo.nFieldPos = m_lbField.GetSelectEntryPos();
- // das setzt natuerlich voraus, dass ich wirklich in dem Feld gesucht habe, dass in der Listbox ausgewaehlt ist,
- // genau das wird auch in RebuildUsedFields sichergestellt
+ // this of course implies that I have really searched in the field that is selected in the listbox,
+ // which is made sure in RebuildUsedFields
- // dem Handler Bescheid sagen
m_lnkFoundHandler.Call(&friInfo);
- // und wieder Focus auf mich
m_cmbSearchText.GrabFocus();
}
@@ -770,8 +761,8 @@ void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_I
IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
{
SolarMutexGuard aGuard;
- // diese eine Methode Thread-sicher machen (das ist ein Overkill, die ganze restliche Applikation dafuer zu blockieren,
- // aber im Augenblick haben wir kein anderes Sicherheitskonpzept)
+ // make this single method thread-safe (it's an overkill to block the whole application for this,
+ // but we don't have another safety concept at the moment)
switch (pProgress->aSearchState)
{
@@ -815,7 +806,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
{
FmFoundRecordInformation friInfo;
friInfo.nContext = m_lbForm.GetSelectEntryPos();
- // wenn ich keine Suche in Kontexten mache, steht hier was ungueltiges drin, aber dann ist es auch egal
+ // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway
friInfo.aPosition = pProgress->aBookmark;
m_lnkCanceledNotFoundHdl.Call(&friInfo);
}
@@ -837,22 +828,22 @@ void FmSearchDialog::LoadParams()
for (; pHistory != pHistoryEnd; ++pHistory)
m_cmbSearchText.InsertEntry( *pHistory );
- // die Einstellungen nehme ich an meinen UI-Elementen vor und rufe dann einfach den entsprechenden Change-Handler auf,
- // dadurch werden die Daten an die SearchEngine weitergereicht und alle abhaengigen Enstellungen vorgenommen
+ // I do the settings at my UI-elements and then I simply call the respective change-handler,
+ // that way the data is handed on to the SearchEngine and all dependent settings are done
- // aktuelles Feld
+ // current field
sal_uInt16 nInitialField = m_lbField.GetEntryPos( String( aParams.sSingleSearchField ) );
if (nInitialField == COMBOBOX_ENTRY_NOTFOUND)
nInitialField = 0;
m_lbField.SelectEntryPos(nInitialField);
LINK(this, FmSearchDialog, OnFieldSelected).Call(&m_lbField);
- // alle/einzelnes Feld (NACH dem Selektieren des Feldes, da OnClickedFieldRadios dort einen gueltigen Eintrag erwartet)
+ // all fields/single field (AFTER selcting the field because OnClickedFieldRadios expects a valid value there)
if (aParams.bAllFields)
{
m_rbSingleField.Check(sal_False);
m_rbAllFields.Check(sal_True);
LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbAllFields);
- // OnClickedFieldRadios ruft auch um RebuildUsedFields
+ // OnClickedFieldRadios also calls to RebuildUsedFields
}
else
{
@@ -861,11 +852,10 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbSingleField);
}
- // Position im Feld
m_lbPosition.SelectEntryPos(aParams.nPosition);
LINK(this, FmSearchDialog, OnPositionSelected).Call(&m_lbPosition);
- // Feld-Formatierung/Case-Sensitivitaet/Richtung
+ // field formatting/case sensitivity/direction
m_cbUseFormat.Check(aParams.bUseFormatter);
m_cbCase.Check( aParams.isCaseSensitive() );
m_cbBackwards.Check(aParams.bBackwards);
@@ -878,8 +868,6 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aHalfFullFormsCJK);
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_aSoundsLikeCJK);
- // die drei Checkboxen fuer spezielle Sucharten
- // erst mal alle ruecksetzen
m_cbWildCard.Check(sal_False);
m_cbRegular.Check(sal_False);
m_cbApprox.Check(sal_False);
@@ -887,7 +875,6 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbRegular);
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(&m_cbApprox);
- // dann die richtige setzen
CheckBox* pToCheck = NULL;
if (aParams.bWildcard)
pToCheck = &m_cbWildCard;
@@ -903,7 +890,7 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnCheckBoxToggled).Call(pToCheck);
}
- // die Levenshtein-Parameter direkt an der SearchEngine setzen
+ // set Levenshtein-parameters directly at the SearchEngine
m_pSearchEngine->SetLevRelaxed(aParams.bLevRelaxed);
m_pSearchEngine->SetLevOther(aParams.nLevOther);
m_pSearchEngine->SetLevShorter(aParams.nLevShorter);
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 49b2106..fd80ad3 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -323,13 +323,11 @@ void TakeThread::execute()
for( sal_uInt16 i = 0; i < nEntries && schedule(); i++ )
{
- // kompletten Filenamen aus FoundList holen
if( mpBrowser->bTakeAll )
aURL = INetURLObject( *mpBrowser->aFoundList[ nPos = i ] );
else
aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]);
- // Position in Taken-Liste uebernehmen
mrTakenList.push_back( (sal_uLong)nPos );
{
@@ -707,7 +705,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
aFtMSShowType.SetText( aType );
aFtMSShowPath.SetText( pThm->GetSdgURL().GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
- // Ein- oder Mehrzahl?
+ // singular or plural?
if ( 1 == pThm->GetObjectCount() )
aObjStr = aObjStr.GetToken( 0 );
else
@@ -728,7 +726,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
aAccess += aLocaleData.getTime( pData->aThemeChangeTime );
aFtMSShowChangeDate.SetText( aAccess );
- // Image setzen
+ // set image
sal_uInt16 nId;
if( pThm->IsImported() )
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 7239b4a..a742cbd 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -151,7 +151,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog(
/*************************************************************************
|*
-|* Dialog zum Abbrechen, Speichern oder Hinzufuegen
+|* dialog for cancelling, saving or adding
|*
\************************************************************************/
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 04e90b5..e26d043 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -141,7 +141,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) );
maLbTree.SetDoubleClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
- // Tree-ListBox mit Linien versehen
+ // add lines to the Tree-ListBox
maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | //WB_HASLINESATROOT |
WB_HSCROLL | WB_HASBUTTONSATROOT );
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 35c1fd1..064231c 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -89,7 +89,7 @@ void HyphenEdit_Impl::KeyInput( const KeyEvent& rKEvt )
Edit::KeyInput(rKEvt);
break;
default:
- Control::KeyInput( rKEvt ); // An den Dialog weiterleiten
+ Control::KeyInput( rKEvt ); // pass on to the dialog
break;
}
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index db3fe8b..8b98a6f 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -499,7 +499,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit )
maIconCtrl.ArrangeIcons();
////////////////////////////////////////
- // Pages resizen & positionieren
+ // resize & position the pages
//
for ( size_t i = 0; i < maPageList.size(); i++ )
{
@@ -544,7 +544,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit )
}
////////////////////////////////////////
- // Buttons positionieren
+ // position the buttons
//
sal_uLong nXOffset=0;
if ( meChoicePos == PosRight )
@@ -697,7 +697,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
if ( pData->bOnDemand )
{
- // CSet auf AIS hat hier Probleme, daher getrennt
+ // CSet on AIS has problems here, therefore seperated
const SfxItemSet* _pSet = &( pData->pPage->GetItemSet() );
pData->pPage->Reset( *(SfxItemSet*)_pSet );
}
@@ -829,11 +829,11 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl ()
{
pSet = GetRefreshedSet();
DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" );
- // alle Pages als neu zu initialsieren flaggen
+ // flag all pages to be newly initialized
for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i )
{
IconChoicePageData* pObj = maPageList[ i ];
- if ( pObj->pPage != pPage ) // eigene Page nicht mehr refreshen
+ if ( pObj->pPage != pPage )
pObj->bRefresh = sal_True;
else
pObj->bRefresh = sal_False;
@@ -857,7 +857,7 @@ void IconChoiceDialog::ResetPageImpl ()
if ( pData->bOnDemand )
{
- // CSet auf AIS hat hier Probleme, daher getrennt
+ // CSet on AIS has problems here, therefore seperated
const SfxItemSet* _pSet = &pData->pPage->GetItemSet();
pData->pPage->Reset( *(SfxItemSet*)_pSet );
}
@@ -906,7 +906,6 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
aUS[i] = rPool.GetWhich( aUS[i] );
}
- // sortieren
if ( aUS.size() > 1 )
{
std::sort( aUS.begin(), aUS.end() );
@@ -1010,15 +1009,15 @@ void IconChoiceDialog::Start_Impl()
else
nActPage = mnCurrentPageId;
- // Konfiguration vorhanden?
+ // configuration existing?
SvtViewOptions aTabDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
if ( aTabDlgOpt.Exists() )
{
- // ggf. Position aus Konfig
+ // possibly position from config
SetWindowState(rtl::OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
- // initiale TabPage aus Programm/Hilfe/Konfig
+ // initial TabPage from program/help/config
nActPage = (sal_uInt16)aTabDlgOpt.GetPageID();
if ( USHRT_MAX != mnCurrentPageId )
@@ -1114,7 +1113,7 @@ short IconChoiceDialog::Ok()
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
- pOutSet = pSet->Clone( sal_False ); // ohne Items
+ pOutSet = pSet->Clone( sal_False ); // without items
else if ( pExampleSet )
pOutSet = new SfxItemSet( *pExampleSet );
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 5216b00..d7ccde6 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -309,7 +309,7 @@ short SvInsertOleDlg::Execute()
{
if( aFileName.Len() ) // from OLE Dialog
{
- // Objekt konnte nicht aus Datei erzeugt werden
+ // object couldn't be created from file
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
aErr.SearchAndReplace( String( '%' ), aFileName );
@@ -317,7 +317,7 @@ short SvInsertOleDlg::Execute()
}
else
{
- // Objekt konnte nicht erzeugt werden
+ // object couldn't be created
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE ) );
aErr.SearchAndReplace( String( '%' ), aServerName );
@@ -370,7 +370,7 @@ short SvInsertOleDlg::Execute()
if ( !m_xObj.is() )
{
- // Objekt konnte nicht aus Datei erzeugt werden
+ // object couldn't be created from file
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_FROM_FILE ) );
aErr.SearchAndReplace( String( '%' ), aFileName );
@@ -526,7 +526,7 @@ short SvInsertPlugInDialog::Execute()
}
else
{
- // PlugIn konnte nicht erzeugt werden
+ // PlugIn couldn't be created
// global Resource from svtools (former so3 resource)
String aErr( impl_getSvtResString( STR_ERROR_OBJNOCREATE_PLUGIN ) );
aErr.SearchAndReplace( String( '%' ), aURL );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index e6d4e5e..11c714a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -64,7 +64,7 @@ using namespace sfx2;
SV_DECL_IMPL_REF_LIST(SvBaseLink,SvBaseLink*)
-// Achtung im Code wird dieses Array direkt (0, 1, ...) indiziert
+// attention, this array is indexed directly (0, 1, ...) in the code
static long nTabs[] =
{ 4, // Number of Tabs
0, 77, 144, 209
@@ -109,9 +109,9 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bH
aTbLinks.SetHelpId(HID_LINKDLG_TABLB);
aTbLinks.SetSelectionMode( MULTIPLE_SELECTION );
aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT );
- aTbLinks.Resize(); // OS: Hack fuer richtige Selektion
+ aTbLinks.Resize(); // OS: hack for correct selection
- // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird
+ // UpdateTimer for DDE-/Grf-links, which are waited for
aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateTimer.SetTimeout( 1000 );
//IAccessibility2 Implementation 2009-----
@@ -150,7 +150,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
(sal_uInt16)pSvTabListBox->GetSelectionCount() : 0;
if(nSelectionCount > 1)
{
- //bei Mehrfachselektion ggf. alte Eintraege deselektieren
+ // possibly deselect old entries in case of multi-selection
SvLBoxEntry* pEntry = 0;
SvBaseLink* pLink = 0;
pEntry = pSvTabListBox->GetHdlEntry();
@@ -287,7 +287,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
{
SvBaseLinkRef xLink = aLnkArr[ n ];
- // suche erstmal im Array nach dem Eintrag
+ // first look for the entry in the array
for( sal_uInt16 i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
if( &xLink == *pLinkMgr->GetLinks()[ i ] )
{
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
}
}
- // falls jemand der Meinung ist, seine Links auszutauschen (SD)
+ // if somebody is of the opinion to swap his links (SD)
LinkManager* pNewMgr = pLinkMgr;
pLinkMgr = 0;
SetManager( pNewMgr );
@@ -307,7 +307,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl)
if( 0 == (pE = rListBox.GetEntry( aPosArr[ 0 ] )) ||
pE->GetUserData() != aLnkArr[ 0 ] )
{
- // suche mal den Link
+ // search the link
pE = rListBox.First();
while( pE )
{
@@ -412,13 +412,13 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
{
Links().GetModel()->Remove( Links().GetEntry( nPos ) );
- // falls Object noch vorhanden, dann das schliessen
+ // close object, if it's still existing
sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
- // dem Link sagen, das er aufgeloest wird!
+ // tell the link that it will be resolved!
xLink->Closed();
- // falls einer vergessen hat sich auszutragen
+ // if somebody has forgotten to deregister himself
if( xLink.Is() )
pLinkMgr->Remove( &xLink );
@@ -455,21 +455,20 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
for( sal_uLong i = 0; i < aLinkList.Count(); i++ )
{
SvBaseLinkRef xLink = aLinkList.GetObject( i );
- // dem Link sagen, das er aufgeloest wird!
+ // tell the link that it will be resolved!
xLink->Closed();
- // falls einer vergessen hat sich auszutragen
+ // if somebody has forgotten to deregister himself
pLinkMgr->Remove( &xLink );
bModified = sal_True;
}
- //Danach alle selektierten Eintraege entfernen
+ // then remove all selected entries
}
}
if(bModified)
{
if( !Links().GetEntryCount() )
{
- // Der letzte macht das Licht aus
Automatic().Disable();
Manual().Disable();
UpdateNow().Disable();
@@ -514,10 +513,10 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
if( _pLink && _pLink->WasLastEditOK() )
{
- // StarImpress/Draw tauschen die LinkObjecte selbst aus!
- // also suche den Link im Manager, wenn der nicht mehr existiert,
- // dann setze fuelle die Liste komplett neu. Ansonsten braucht
- // nur der editierte Linkt aktualisiert werden.
+ // StarImpress/Draw swap the LinkObjects themselves!
+ // So search for the link in the manager; if it does not exist
+ // anymore, fill the list completely new. Otherwise only the
+ // edited link needs to be refreshed.
sal_Bool bLinkFnd = sal_False;
for( sal_uInt16 n = pLinkMgr->GetLinks().Count(); n; )
if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) )
@@ -572,7 +571,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
return;
if( pNewMgr )
- // Update muss vor Clear gestoppt werden
+ // update has to be stopped before clear
Links().SetUpdateMode( sal_False );
Links().Clear();
@@ -613,8 +612,8 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_
pLinkMgr->GetDisplayNames( (SvBaseLink*)&rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter );
- // GetTab(0) gibt die Position der von der TabListBox automatisch eingefuegten
- // Bitmap. Die Breite der ersten Textspalte ergibt sich deshalb aus Tab(2)-Tab(1)
+ // GetTab(0) gives the position of the bitmap which is automatically inserted by the TabListBox.
+ // So the first text column's width is Tab(2)-Tab(1).
long nWidthPixel = Links().GetLogicTab( 2 ) - Links().GetLogicTab( 1 );
nWidthPixel -= SV_TAB_BORDER;
XubString aTxt = Links().GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 1051782..83d3698 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -134,7 +134,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
if ( !pFormats )
pFormats = &rHelper.GetDataFlavorExVector();
- //Dialogbox erzeugen und fuellen
+ // create and fill dialog box
String aSourceName, aTypeName;
sal_uLong nSelFormat = 0;
SvGlobalName aEmptyNm;
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 3987544..678db75 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -65,7 +65,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
{
FilterMap aMap;
- // mimetypes zusammenfassen: eine description, mehrere extensions
+ // sum up the mimetypes: one description, multiple extensions
Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() );
const PluginDescription * pDescriptions = aDescriptions.getConstArray();
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 329d876..28ad7ee 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -85,7 +85,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
pOutSet ( 0 )
{
- if (bRedline) // HelpIDs fuer Redlining
+ if (bRedline) // HelpIDs for redlining
{
SetHelpId(HID_REDLINING_DLG);
aEditED.SetHelpId(HID_REDLINING_EDIT);
@@ -154,7 +154,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
if ( !bNew )
SetText( CUI_RESSTR( STR_NOTIZ_EDIT ) );
else
- // neu anlegen
+ // create newly
SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) );
FreeResource();
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 30be39a..616ee0f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -97,7 +97,7 @@ SFTreeListBox::SFTreeListBox( Window* pParent, const ResId& rResId ) :
WB_HASLINES | WB_HASLINESATROOT );
SetNodeDefaultImages();
- nMode = 0xFF; // Alles
+ nMode = 0xFF; // everything
}
SFTreeListBox::~SFTreeListBox()
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 64ea8a7..17db923 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -667,7 +667,7 @@ SvxThesaurusDialog::~SvxThesaurusDialog()
void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
{
- // Sprache anpassen
+ // adjust language
String aStr( GetText() );
aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 );
aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) );
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 2fd600c..51d9d17 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -111,15 +111,15 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId )
{
switch ( nBtnId )
{
- case ZOOMBTN_OPTIMAL: // Optimal-Button
+ case ZOOMBTN_OPTIMAL:
aOptimalBtn.Hide();
break;
- case ZOOMBTN_PAGEWIDTH: // Seitenbreite-Button
+ case ZOOMBTN_PAGEWIDTH:
aPageWidthBtn.Hide();
break;
- case ZOOMBTN_WHOLEPAGE: // Ganze Seite-Button
+ case ZOOMBTN_WHOLEPAGE:
aWholePageBtn.Hide();
break;
@@ -191,12 +191,12 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
aOKBtn.SetClickHdl( LINK( this, SvxZoomDialog, OKHdl ) );
aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
- // Default-Werte
+ // default values
sal_uInt16 nValue = 100;
sal_uInt16 nMin = 10;
sal_uInt16 nMax = 1000;
- // ggf. erst den alten Wert besorgen
+ // maybe get the old value first
const SfxUInt16Item* pOldUserItem = 0;
SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -206,7 +206,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
if ( pOldUserItem )
nValue = pOldUserItem->GetValue();
- // UserEdit initialisieren
+ // initialize UserEdit
if ( nMin > nValue )
nMin = nValue;
if ( nMax < nValue )
@@ -469,7 +469,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
if ( aViewLayoutFl.IsEnabled() )
pOutSet->Put( aViewLayoutItem );
- // Wert aus dem UserEdit "uber den Dialog hinaus merken
+ // memorize value from the UserEdit beyond the dialog
SfxObjectShell* pSh = SfxObjectShell::Current();
if ( pSh )
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 5771fa9..ee2798a 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -220,7 +220,7 @@ struct DoubleString
{
String sShort;
String sLong;
- void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext
+ void* pUserData; // CheckBox -> form. Text Bool -> selection text
};
typedef std::vector<DoubleString> DoubleStringArray;
typedef std::map<LanguageType, DoubleStringArray> DoubleStringTable;
@@ -260,7 +260,7 @@ private:
DECL_LINK(NewDelHdl, PushButton*);
DECL_LINK(ModifyHdl, Edit*);
- void RefillReplaceBox(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
+ void RefillReplaceBox(sal_Bool bFromReset,
LanguageType eOldLanguage,
LanguageType eNewLanguage);
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 148248a..ce3b0cb 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -39,9 +39,9 @@
// class SvxBackgroundTabPage --------------------------------------------
/*
{k:\svx\prototyp\dialog\backgrnd.bmp}
- [Beschreibung]
- Mit dieser TabPage kann eine Brush (z.B. fuer die Hintergrundfarbe eines
- Rahmens) eingestellt werden.
+ [Description]
+ With this TabPage a Brush (e. g. for a frame's background color)
+ can be set.
[Items]
<SvxBrushItem>: <SID_ATTR_BRUSH>;
*/
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 1627493..7497855 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -33,7 +33,7 @@
#include <sfx2/tabdlg.hxx>
/*--------------------------------------------------------------------
- Beschreibung: Border Background Pages buendeln
+ Description: bunch the border background pages
--------------------------------------------------------------------*/
class SvxBorderBackgroundDlg: public SfxTabDialog
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 00898a5..57cdcc3 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -42,7 +42,7 @@ class SdrView;
/*************************************************************************
|*
-|* Dialog zum Aendern von Konnektoren (Connectors)
+|* Dialog for changing connectors.
|*
\************************************************************************/
@@ -101,8 +101,8 @@ public:
/*************************************************************************
|*
-|* Von SfxSingleTabDialog abgeleitet, um vom Control "uber virtuelle Methode
-|* benachrichtigt werden zu k"onnen.
+|* Derived from SfxSingleTabDialog, in order to be informed about
+|* virtual methods by the control.
|*
\************************************************************************/
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 04c9d13..3ca5e29 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -103,10 +103,9 @@ class FmSearchDialog : public ModalDialog
Link m_lnkContextSupplier; // for search in contexts
- // an Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
+ // memorize the currently selected field for every context
::std::vector<String> m_arrContextFields;
- // fuer die eigentliche Arbeit ...
FmSearchEngine* m_pSearchEngine;
Timer m_aDelayedPaint;
@@ -114,38 +113,38 @@ class FmSearchDialog : public ModalDialog
::svxform::FmSearchConfigItem* m_pConfig;
public:
- /** hiermit kann in verschiedenen Saetzen von Feldern gesucht werden. Es gibt eine Reihe von Kontexten, deren Namen in
- strContexts stehen (getrennt durch ';'), der Benutzer kann einen davon auswaehlen.
- Wenn der Benutzer einen Kontext auswaehlt, wird lnkContextSupplier aufgerufen, er bekommt einen Zeiger auf eine
- FmSearchContext-Struktur, die gefuellt werden muss.
- Fuer die Suche gilt dann :
- a) bei formatierter Suche wird der Iterator selber verwendet (wie beim ersten Constructor auch)
- b) bei formatierter Suche wird NICHT der FormatKey an den Fields des Iterators verwendet, sondern die entsprechende
- TextComponent wird gefragt (deshalb auch die Verwendung des originalen Iterator, durch dessen Move werden hoffentlich
- die hinter den TextComponent-Interfaces stehenden Controls geupdatet)
- c) bei nicht formatierter Suche wird ein Clone des Iterators verwendet (da ich hier die TextComponent-Interfaces nicht
- fragen muss)
- (natuerlich zwingend erforderlich : der String Nummer i in strUsedFields eines Kontexts muss mit dem Interface Nummer i
- in arrFields des Kontexts korrespondieren)
+ /** This can search in different sets of fields. There is a number of contexts; their names are in strContexts (seperated
+ by ';'), the user can choose one of them.
+ When the user chooses a context, lnkContextSupplier is called, it gets a pointer on an FmSearchContext-structure,
+ that has to be filled.
+ The following counts for the search :
+ a) in case of formatted search the iterator itself is used (like in the first constructor)
+ b) in case of formatted search NOT the FormatKey at the fields of the iterator is used, but the respective TextComponent
+ is asked (that's why the original iterator is used; by its move the controls behind the TextComponent-interface are
+ updated hopefully)
+ c) in case of not-formatted search a clone of the iterator is used (because the TextComponent-interfaces don't need to
+ be asked)
+ (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the
+ arrFields of the context)
*/
FmSearchDialog(Window* pParent, const String& strInitialText, const ::std::vector< String >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier);
virtual ~FmSearchDialog();
- /** der Found-Handler bekommt im "gefunden"-Fall einen Zeiger auf eine FmFoundRecordInformation-Struktur
- (dieser ist nur im Handler gueltig, wenn man sich also die Daten merken muss, nicht den Zeiger, sondern die
- Struktur kopieren)
- Dieser Handler MUSS gesetzt werden.
- Ausserdem sollte beachtet werden, dass waehrend des Handlers der Suchdialog immer noch modal ist
+ /** The found-handler gets in the 'found'-case a pointer on a FmFoundRecordInformation-structure
+ (which is only valid in the handler; so if one needs to memorize the data, don't copy the pointer but
+ the structure).
+ This handler MUST be set.
+ Furthermore, it should be considered, that during the handler the search-dialog is still modal.
*/
void SetFoundHandler(const Link& lnk) { m_lnkFoundHandler = lnk; }
/**
- Wenn die Suche abgebrochen oder erfolglos beendet wurde, wird im Suchdialog immer der aktuelle Datensatz angezeigt
- Damit das mit der eventuellen Anzeige des Aufrufers synchron geht, existiert dieser Handler (der nicht undbedingt gesetzt
- werden muss).
- Der dem Handler uebergebene Zeiger zeigt auf eine FmFoundRecordInformation-Struktur, bei der aPosition und eventuell
- (bei Suche mit Kontexten) nContext gueltig sind.
+ If the search has been cancelled or has been finished without success, the current data set is always displayed in the
+ search dialog. This handler exists to make this synchronous with the possible display of the caller (it does not
+ necessarily need to be set).
+ The pointer that is passed to the handler points to a FmFoundRecordInformation-structure, for which aPosition and
+ possibly (in a search with contexts) nContext are valid.
*/
void SetCanceledNotFoundHdl(const Link& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
@@ -155,21 +154,22 @@ protected:
virtual sal_Bool Close();
void Init(const String& strVisibleFields, const String& strInitialText);
- // nur von den Constructoren aus zu verwenden
+ // only to be used out of the constructors
void OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos);
void EnableSearchUI(sal_Bool bEnable);
- // beim Suchen in einem eigenen Thread moechte ich natuerlich die UI zum Starten/Parameter-Setzen der Suche disablen
- // Bei bEnable == sal_False wird fuer alle betroffenen Controls das Painten kurz aus- und mittels m_aDelayedPaint nach
- // einer kurzen Weile wieder angeschaltet. Wenn inzwischen eine Anforderung mit bEnable==sal_True kommt, wird der Timer gestoppt
- // und das Painten gleich wieder angeschaltet. Als Konsequenz dieses umstaendlichen Vorgehens ist kein Flackern zu sehen,
- // wenn man schnell hintereinander aus- und wieder einschaltet.
+
+ /* When searching in an own thread I naturally want to disable the UI for starting the search and for setting search
+ parameters. If bEnalbe == sal_False, for all affected controls painting is turned off and shortly after turned on
+ again using m_aDelayedPaint. If there is a demand with bEnable == sal_True inbetween, the timer is stopped and
+ painting is turned on immediately. As a consequence for this intricateness there is no flickering when turning
+ off and on quickly.
+ */
void EnableSearchForDependees(sal_Bool bEnable);
void EnableControlPaint(sal_Bool bEnable);
- // enabled (disabled) fuer alle wichtigen Controls ihr Paint
void InitContext(sal_Int16 nContext);
@@ -191,7 +191,6 @@ private:
DECL_LINK( OnContextSelection, ListBox* );
- // Such-Fortschritt
DECL_LINK( OnSearchProgress, FmSearchProgress* );
DECL_LINK( OnDelayedPaint, void* );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index a3c2214..b7f5fa6 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -746,18 +746,18 @@ private:
void FillValueSet_Impl( ValueSet& rVs );
//-----------------------------------------------------------------------------------------------------
- DECL_LINK( ClickAddHdl_Impl, void * ); // Button 'Hinzufuegen'
- DECL_LINK( ClickModifyHdl_Impl, void * ); // Button 'Aendern'
- DECL_LINK( ClickDeleteHdl_Impl, void * ); // Button 'loeschen'
- DECL_LINK( ClickWorkOnHdl_Impl, void * ); // Button 'Bearbeiten'
-
- DECL_LINK( SelectColorLBHdl_Impl, void * ); // Farbe aus Listbox ausw�hlen
- DECL_LINK( SelectValSetHdl_Impl, void * ); // Farbe aus Farbpalette (links) ausw�hlen
- DECL_LINK( SelectColorModelHdl_Impl, void * ); // Auswahl Listbox 'Farbmodell'
+ DECL_LINK( ClickAddHdl_Impl, void * );
+ DECL_LINK( ClickModifyHdl_Impl, void * );
+ DECL_LINK( ClickDeleteHdl_Impl, void * );
+ DECL_LINK( ClickWorkOnHdl_Impl, void * );
+
+ DECL_LINK( SelectColorLBHdl_Impl, void * );
+ DECL_LINK( SelectValSetHdl_Impl, void * );
+ DECL_LINK( SelectColorModelHdl_Impl, void * );
long ChangeColorHdl_Impl( void* p );
- DECL_LINK( ModifiedHdl_Impl, void * ); // Inhalt der Farbwerte-Felder wurde ver�ndert
- DECL_LINK( ClickLoadHdl_Impl, void * ); // Button 'Farbtabelle laden'
- DECL_LINK( ClickSaveHdl_Impl, void * ); // Button 'Farbtabelle sichern'
+ DECL_LINK( ModifiedHdl_Impl, void * );
+ DECL_LINK( ClickLoadHdl_Impl, void * );
+ DECL_LINK( ClickSaveHdl_Impl, void * );
long CheckChanges_Impl();
#endif
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 6a0881c..7fb7e04 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -126,7 +126,7 @@ private:
FixedText maFTEdgeStyle;
LineEndLB maLBEdgeStyle;
- //#58425# Symbole auf einer Linie (z.B. StarChart) ->
+ //#58425# symbols on a line (e. g. StarChart) ->
SdrObjList* pSymbolList; //a list of symbols to be shown in menu. Symbol at position SID_ATTR_SYMBOLTYPE is to be shown in preview. The list position is to be used cyclic.
bool bNewSize;
Graphic aAutoSymbolGraphic; //a graphic to be displayed in the preview in case that an automatic symbol is choosen
@@ -177,7 +177,7 @@ private:
// #63083#
sal_Int32 nActLineWidth;
- //Handler f�r Gallery-Popup-Menue-Button + Size
+ // handler for gallery popup menu button + size
DECL_LINK( GraphicHdl_Impl, MenuButton * );
DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index d813fa7..8188e30 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -26,7 +26,7 @@
************************************************************************/
#include <cuires.hrc>
-// Gallery-TabDialoge/-TabPages
+// Gallery TabDialogs/TabPages
#define RID_SVXTABDLG_GALLERY (RID_CUI_GALLERY_START )
#define RID_SVXTABDLG_GALLERYTHEME (RID_CUI_GALLERY_START + 2)
#define RID_SVXDLG_GALLERY_TITLE (RID_CUI_GALLERY_START + 82)
@@ -34,7 +34,7 @@
#define RID_SVXTABPAGE_GALLERY_GENERAL (RID_CUI_GALLERY_START + 1)
#define RID_SVXTABPAGE_GALLERYTHEME_FILES (RID_CUI_GALLERY_START + 4)
-// Dialoge
+// Dialogs
#define RID_SVXDLG_GALLERY_SEARCH_PROGRESS (RID_CUI_GALLERY_START + 6)
#define RID_SVXDLG_GALLERY_TAKE_PROGRESS (RID_CUI_GALLERY_START + 7)
#define RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS (RID_CUI_GALLERY_START + 8)
@@ -54,7 +54,7 @@
#define RID_SVXBMP_THEME_READONLY_BIG (RID_CUI_GALLERY_START + 53)
#define RID_SVXBMP_THEME_DEFAULT_BIG (RID_CUI_GALLERY_START + 55)
-// lokale Defines
+// local Defines
#define BTN_OK 1
#define BTN_CANCEL 1
#define BTN_HELP 1
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 496e375..41bdf61 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -51,7 +51,7 @@ class IconChoicePage;
// Create-Function
typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef sal_uInt16* (*GetPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16* (*GetPageRanges)(); // gives international Which-value
// position of iconchoicectrl
enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
@@ -64,14 +64,14 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
struct IconChoicePageData
{
- sal_uInt16 nId; // Die ID
- CreatePage fnCreatePage; // Pointer auf die Factory
- GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
- IconChoicePage* pPage; // die TabPage selber
- sal_Bool bOnDemand; // Flag: ItemSet onDemand
- sal_Bool bRefresh; // Flag: Seite mu\s neu initialisiert werden
-
- // Konstruktor
+ sal_uInt16 nId;
+ CreatePage fnCreatePage; // pointer to the factory
+ GetPageRanges fnGetRanges; // pointer to the ranges-function
+ IconChoicePage* pPage; // the TabPage itself
+ sal_Bool bOnDemand; // Flag: ItemSet onDemand
+ sal_Bool bRefresh; // Flag: page has to be newly initialized
+
+ // constructor
IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand )
: nId ( Id ),
fnCreatePage ( fnPage ),
@@ -125,12 +125,11 @@ public :
void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; }
enum {
- KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln
- // 2. F"ullen eines ItemSets f"ur die Aktualilsierung
- // "ubergeordneter Beispiele; dieser Pointer kann immer
- // NULL sein!!
+ KEEP_PAGE = 0x0000, // error handling
+ // 2nd filling of an ItemSet for updating superior examples;
+ // this pointer can always be NULL!!
LEAVE_PAGE = 0x0001,
- // Set aktualisieren und andere Page aktualisieren
+ // refresh set and update other pages
REFRESH_SET = 0x0002
};
@@ -157,12 +156,12 @@ class IconChoiceDialog : public ModalDialog
private :
friend class IconChoicePage;
- EIconChoicePos meChoicePos; // Position des IconChoiceCtrl's
- ::std::vector< IconChoicePageData* > maPageList; // Liste von PageData-Pointer
+ EIconChoicePos meChoicePos;
+ ::std::vector< IconChoicePageData* > maPageList;
- SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control
+ SvtIconChoiceCtrl maIconCtrl;
- sal_uInt16 mnCurrentPageId; // Id der aktuell sichtbaren Page
+ sal_uInt16 mnCurrentPageId;
// Buttons
OKButton aOKBtn;
@@ -216,20 +215,20 @@ protected :
public :
- // im Ctor k�nnte auch die Position des IconChoiceCtrl's gesetzt werden.
+ // the IconChoiceCtrl's could also be set in the Ctor
IconChoiceDialog ( Window* pParent, const ResId &rResId,
const EIconChoicePos ePos = PosLeft, const SfxItemSet * pItemSet = 0 );
~IconChoiceDialog ();
///////////////////////////////////////////////////////////////////////////////////
- // virtuelle Methoden
+ // virtual methods
//
virtual void Paint( const Rectangle& rRect );
virtual void Resize();
///////////////////////////////////////////////////////////////////////////////////
- // Schnittstelle
+ // interface
//
SvxIconChoiceCtrlEntry* AddTabPage(
@@ -241,7 +240,7 @@ public :
sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
void ShowPage( sal_uInt16 nId );
- // liefert ggf. per Map konvertierte lokale Slots
+ // gives via map converted local slots if applicable
const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index bca7bf4..238638d 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -81,7 +81,7 @@ public:
virtual void ScriptChanged();
virtual void PageCreated (SfxAllItemSet aSet);
- // --------- Erben aus der Basis -------------
+ // --------- inherit from the base -------------
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
@@ -113,7 +113,7 @@ public:
const SfxItemSet& rSet
);
- // --------- Erben aus der Basis -------------
+ // --------- inherit from the base -------------
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
};
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 142b416..cf94436 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -123,7 +123,7 @@ public:
// class SvxMacroAssignDlg --------------------------------------------------
-typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // gives international Which-values
class SvxMacroAssignSingleTabDialog : public SfxModalDialog
{
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 1d7a561..746f2ba 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -40,7 +40,7 @@ class SdrView;
/*************************************************************************
|*
-|* Dialog zum "Andern von TextAttributen
+|* Dialog for changing TextAtrributes
|*
\************************************************************************/
@@ -110,8 +110,8 @@ public:
/*************************************************************************
|*
-|* Von SfxSingleTabDialog abgeleitet, um vom Control "uber virtuelle Methode
-|* benachrichtigt werden zu k"onnen.
+|* Derived from SfxSingleTabDialog, in order to be able to be
+|* informed about virtual methods by the control.
|*
\************************************************************************/
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index a87940f..3a9e027 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -131,7 +131,7 @@ private:
sal_uLong nInitFormat;
Link fnOkHdl;
- sal_Bool bNumItemFlag; //Fuer Handling mit DocShell
+ sal_Bool bNumItemFlag; // for handling with DocShell
sal_Bool bOneAreaFlag;
short nFixedCategory;
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b0e9fa1..00f0ddd 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -149,9 +149,9 @@ class SvxBulletPickTabPage : public SfxTabPage
};
/*--------------------------------------------------
- TabPage fuer vollstaendig Numerierung
+ TabPage for complete numeration
--------------------------------------------------*/
-#define NUMTYPE_MEMBER 4 // Anzahl der Elemente des FormatStrings je Ebene
+#define NUMTYPE_MEMBER 4 // number of elements of the FormatString per level
#define NUM_VALUSET_COUNT 16
class SvxNumPickTabPage : public SfxTabPage
{
@@ -163,7 +163,7 @@ class SvxNumPickTabPage : public SfxTabPage
String sNumCharFmtName;
String sBulletCharFmtName;
- SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // wird mit den fuenf Formaten initialisiert
+ SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // is initialized with the five formats
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
@@ -409,7 +409,7 @@ class SvxNumPositionTabPage : public SfxTabPage
sal_Bool bModified : 1;
sal_Bool bPreset : 1;
- sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
+ sal_Bool bInInintControl : 1; // workaround for Modify-error, is said to be correctet from 391 on
bool bLabelAlignmentPosAndSpaceModeActive;
void InitControls();
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index da59f29..4c78455 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -45,8 +45,8 @@
/* {k:\svx\prototyp\dialog\page.bmp}
- [Beschreibung]
- TabPage zur Einstellung einer Seite (Groesse, Raender, ...)
+ [Description]
+ TabPage for page settings (size, margins, ...)
[Items]
<SvxPageItem>: <SID_ATTR_PAGE>
@@ -176,20 +176,16 @@ class SvxPageDescPage : public SfxTabPage
DECL_LINK(CenterHdl_Impl, void *);
void UpdateExample_Impl( bool bResetbackground = false );
- // Papiergroesse
DECL_LINK( PaperSizeSelect_Impl, ListBox* );
DECL_LINK(PaperSizeModify_Impl, void *);
DECL_LINK( FrameDirectionModify_Impl, ListBox* );
- // Hintergrund
void ResetBackground_Impl( const SfxItemSet& rSet );
- // Grenzwerte
DECL_LINK(RangeHdl_Impl, void *);
void CalcMargin_Impl();
- // Registerhaltigkeit
DECL_LINK( RegisterModify, CheckBox * );
// page direction
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 1267298..4ac6312 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -48,9 +48,9 @@ class SvxParagraphControllerItem;
/* {k:\svx\prototyp\dialog\parastd.bmp}
- [Beschreibung]
- Mit dieser TabPage koennen Standard-Attribute eines Absatzes eingestellt
- werden (Einzug, Abstand, Ausrichtung, Zeilenabstand).
+ [Description]
+ With this TabPage standard attributes of a paragraph can be set
+ (indention, distance, alignment, line spacing).
[Items]
<SvxAdjustItem><SID_ATTR_PARA_ADJUST>
@@ -67,7 +67,7 @@ private:
SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
FixedLine aIndentFrm;
- // Einzug
+ // indention
FixedText aLeftLabel;
SvxRelativeField aLeftIndent;
@@ -80,14 +80,14 @@ private:
FixedLine aDistFrm;
- // Abstaende
+ // distance
FixedText aTopLabel;
SvxRelativeField aTopDist;
FixedText aBottomLabel;
SvxRelativeField aBottomDist;
CheckBox aContextualCB;
- // Zeilenabstand
+ // line spacing
FixedLine aLineDistFrm;
ListBox aLineDist;
FixedText aLineDistAtLabel;
@@ -96,7 +96,7 @@ private:
String sAbsDist;
SvxParaPrevWindow aExampleWin;
- //Registerhaltigkeit - nur Writer
+ // only writer
FixedLine aRegisterFL;
CheckBox aRegisterCB;
@@ -146,7 +146,7 @@ class SvxParaAlignTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
- // Ausrichtung
+ // alignment
FixedLine aAlignFrm;
RadioButton aLeft;
RadioButton aRight;
@@ -199,9 +199,9 @@ public:
/* {k:\svx\prototyp\dialog\paraext.bmp}
- [Beschreibung]
- Mit dieser TabPage koennen Spezial-Attribute eines Absatzes eingestellt
- werden (Silbentrennung, Seitenumbruch, Schusterjungen, Hurenkinder, ...).
+ [Description]
+ With this TabPage special attributes of a paragraph can be set
+ (hyphenation, pagebreak, orphan, widow, ...).
[Items]
<SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
@@ -233,7 +233,7 @@ protected:
private:
SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
- // Silbentrennung
+ // hyphenation
FixedLine aExtFL;
TriStateBox aHyphenBox;
FixedText aBeforeText;
@@ -243,7 +243,7 @@ private:
FixedText aMaxHyphenLabel;
NumericField aMaxHyphenEdit;
- // Seitenumbruch
+ // pagebreak
FixedLine aBreaksFL;
TriStateBox aPageBreakBox;
FixedText aBreakTypeFT;
@@ -257,11 +257,11 @@ private:
FixedLine aExtendFL;
- // Absatzteilung
+ // paragraph division
TriStateBox aKeepTogetherBox;
TriStateBox aKeepParaBox;
- // Witwen/Waisen
+ // orphan/widow
TriStateBox aOrphanBox;
NumericField aOrphanRowNo;
FixedText aOrphanRowLabel;
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index c98041c..7d66cc9 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -41,10 +41,10 @@
/*
{k:\svx\prototyp\dialog\memo.bmp}
- [Beschreibung]
- In diesem Dialog kann eine Notiz erstellt oder bearbeitet werden. Wenn die
- Applikation eine Liste von Notizen haelt, kann mit Hilfe von Links, ueber
- diese Liste iteriert werden.
+ [Description]
+ In this dialog a note can be created or edited. If the
+ application holds a list of notes, it can be iterated
+ over this list with links.
[Items]
<SvxPostitAuthorItem><SID_ATTR_POSTIT_AUTHOR>
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index a002a03..1f054d3 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -47,8 +47,8 @@ class TabWin_Impl;
/*
{k:\svx\prototyp\dialog\tabstop.bmp}
- [Beschreibung]
- In dieser TabPage werden Tabulatoren verwaltet.
+ [Description]
+ In this TabPage tabulators are managed.
[Items]
<SvxTabStopItem><SID_ATTR_TABSTOP>
@@ -78,7 +78,7 @@ protected:
private:
SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
- // Tabulatoren und Positionen
+ // tabulators and positions
FixedLine aTabLabel;
MetricBox aTabBox;
FixedLine aTabLabelVert;
@@ -99,19 +99,19 @@ private:
Edit aDezChar;
FixedLine aFillLabel;
- // Fuellzeichen
+
RadioButton aNoFillChar;
RadioButton aFillPoints;
RadioButton aFillDashLine ;
RadioButton aFillSolidLine;
RadioButton aFillSpecial;
Edit aFillChar;
- // Buttons
+
PushButton aNewBtn;
PushButton aDelAllBtn;
PushButton aDelBtn;
- // lokale Variablen, interne Funktionen
+ // local variables, internal functions
SvxTabStop aAktTab;
SvxTabStopItem aNewTabs;
long nDefDist;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 92bb1b3..0c4f5c4 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -41,7 +41,7 @@ class SdrView;
/*************************************************************************
|*
-|* Page zum "Andern von TextAnimationen (Lauftext etc.)
+|* Page for changing TextAnimations (running text etc.)
|*
\************************************************************************/
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index acecce5..ced0825 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -41,7 +41,7 @@ class SdrView;
/*************************************************************************
|*
-|* Dialog zum "Andern von TextAttributen
+|* Dialog for changing TextAttributes
|*
\************************************************************************/
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index ffb98ba..2cfd74f 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -189,7 +189,7 @@ public:
/*************************************************************************
|*
-|* Drehwinkel-Tab-Page
+|* rotation angle tab page
|*
\************************************************************************/
class SvxAngleTabPage : public SvxTabPage
@@ -246,7 +246,7 @@ public:
/*************************************************************************
|*
-|* Schraegstellen/Eckenradius-Tab-Page
+|* slant/corner radius tab page
|*
\************************************************************************/
class SvxSlantTabPage : public SvxTabPage
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index a17d4f8..97030c1 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -248,10 +248,10 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
String aUserData = GetUserData();
if ( aUserData.Len() )
{
- // Spaltenbreite restaurieren
+ // restore column width
pHeaderBar->SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() );
HeaderEndDrag_Impl( NULL );
- // Sortierrichtung restaurieren
+ // restore sort direction
sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32();
HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 44e7cef..0646287 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -42,7 +42,7 @@
/*********************************************************************/
/* */
-/* TabPage Fontersetzung */
+/* TabPage font replacement */
/* */
/*********************************************************************/
@@ -312,8 +312,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
if (pWin == &aNewDelTBX)
{
SvLBoxEntry* pEntry;
- // nCol ist behaemmerterweise die nCol'te Textspalte, werden nicht gezaehlt!
- // Daher als Spalte "0".
+ // nCol is stupidly the nCol'th text column, not counted!
+ // Therefor "0" as column.
sal_uLong nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0);
switch (aNewDelTBX.GetCurItemId())
@@ -322,13 +322,13 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
{
if (nPos != 0xffffffff)
{
- // Eintrag aendern
+ // change entry
aCheckLB.SetEntryText(aFont2CB.GetText(), nPos, 1);
pEntry = aCheckLB.GetEntry(nPos);
}
else
{
- // Neuer Eintrag
+ // new entry
String sFont1 = aFont1CB.GetText();
String sFont2 = aFont2CB.GetText();
@@ -422,7 +422,7 @@ void SvxFontSubstTabPage::CheckEnable()
sEntry += '\t';
sEntry += aFont2CB.GetText();
- // Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher:
+ // because of OS/2 optimization error (Bug #56267) a bit more intricate:
if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
bApply = sal_False;
else if(aFont1CB.GetText() == aFont2CB.GetText())
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 64a7f49..dc87a4d 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -74,7 +74,7 @@ void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt,
for ( sal_uInt16 nCol = 1; nCol < _nTabCount; ++nCol )
{
- // alle Spalten mit eigener Klasse initialisieren (Spalte 0 == Bitmap)
+ // initialize all columns with own class (column 0 == Bitmap)
SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nCol );
OptLBoxString_Impl* pStr = new OptLBoxString_Impl( pEntry, 0, pCol->GetText() );
pEntry->ReplaceItem( pStr, nCol );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d33fa83..30f74ec 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -108,12 +108,12 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
aHelpBtn ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
xSpell( xSpl )
{
- // Handler installieren
+ // install handler
aNameEdit.SetModifyHdl(
LINK( this, SvxNewDictionaryDialog, ModifyHdl_Impl ) );
aOKBtn.SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) );
- // Sprachen anzeigen
+ // display languages
aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
aLanguageLB.SelectEntryPos(0);
@@ -150,13 +150,13 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
if ( bFound )
{
- // Doppelte Namen?
+ // duplicate names?
InfoBox( this, CUI_RESSTR( RID_SVXSTR_OPT_DOUBLE_DICTS ) ).Execute();
aNameEdit.GrabFocus();
return 0;
}
- // Erzeugen und hinzufuegen
+ // create and add
sal_uInt16 nLang = aLanguageLB.GetSelectLanguage();
try
{
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
{
xNewDic = NULL;
- // Fehler: konnte neues W"orterbuch nicht anlegen
+ // error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
this, RID_SVXERRCTX, &CUI_MGR() );
ErrorHandler::HandleError( *new StringErrorInfo(
@@ -262,7 +262,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
nWidth=aWordED.GetSizePixel().Width();
- // Handler installieren
+ // install handler
aNewReplacePB.SetClickHdl(
LINK( this, SvxEditDictionaryDialog, NewDelHdl));
aDeletePB.SetClickHdl(
@@ -278,7 +278,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
aWordED.SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
aReplaceED.SetActionHdl(LINK(this, SvxEditDictionaryDialog, NewDelHdl));
- // Listbox mit allen verfuegbaren WB's fuellen
+ // fill listbox with all available WB's
const Reference< XDictionary > *pDic = aDics.getConstArray();
sal_Int32 nCount = aDics.getLength();
@@ -433,7 +433,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
{
aNewReplacePB.Enable( sal_False );
aDeletePB .Enable( sal_False );
- // Dictionary anzeigen
+ // display dictionary
ShowWords_Impl( nPos );
// enable or disable new and delete button according to file attributes
Reference< XDictionary > xDic( aDics.getConstArray()[ nPos ], UNO_QUERY );
@@ -565,8 +565,8 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
{
SvLBoxEntry* pEntry = pBox->FirstSelected();
String sTmpShort(pBox->GetEntryText(pEntry, 0));
- // wird der Text ueber den ModifyHdl gesetzt, dann steht der Cursor
- //sonst immer am Wortanfang, obwohl man gerade hier editiert
+ // without this the curser is always at the beginning of a word, if the text
+ // is set over the ModifyHdl, although you're editing there at the moment
if(aWordED.GetText() != sTmpShort)
aWordED.SetText(sTmpShort);
aReplaceED.SetText(pBox->GetEntryText(pEntry, 1));
@@ -666,15 +666,15 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
aWordsLB.MakeVisible( pNewEntry );
aWordsLB.SetUpdateMode(sal_True);
- // falls der Request aus dem ReplaceEdit kam, dann Focus in das ShortEdit setzen
+ // if the request came from the ReplaceEdit, give focus to the ShortEdit
if(aReplaceED.HasFocus())
aWordED.GrabFocus();
}
}
else
{
- // das kann nur ein Enter in einem der beiden Edit-Felder sein und das
- // bedeutet EndDialog() - muss im KeyInput ausgewertet werden
+ // this can only be an enter in one of the two edit fields
+ // which means EndDialog() - has to be evaluated in KeyInput
return 0;
}
ModifyHdl(&aWordED);
@@ -793,8 +793,8 @@ void SvxDictEdit::KeyInput( const KeyEvent& rKEvt )
const sal_uInt16 nModifier = aKeyCode.GetModifier();
if( aKeyCode.GetCode() == KEY_RETURN )
{
- //wird bei Enter nichts getan, dann doch die Basisklasse rufen
- // um den Dialog zu schliessen
+ // if there's nothing done on enter, call the
+ // base class after all to close the dialog
if(!nModifier && !aActionLink.Call(this))
Edit::KeyInput(rKEvt);
}
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 1e612df..8a3edd6 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -342,7 +342,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
{
- // Sortierung durch diese Ueberladung abgeklemmt
+ // sorting is stopped by this overloading
}
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 9300bed..ddf7361 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -113,7 +113,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe
if ( LANGUAGE_ENGLISH_US == eLang )
{
- // amerikanische Postadresse aufbauen
+ // construct American post/mail address
aPLZEdit.Hide();
aCityEdit.Hide();
aCityLbl.SetText( CUI_RES( STR_US_STATE ) );
@@ -190,7 +190,7 @@ SvxGeneralTabPage::SvxGeneralTabPage( Window* pParent, const SfxItemSet& rCoreSe
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
@@ -245,7 +245,7 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS
sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
{
- // Eingaben trimmen (f"uhrende und nachfolgende Leerzeichen entfernen)
+ // remove leading and trailing whitespaces
aCompanyEdit.SetText( TRIM(aCompanyEdit.GetText()) );
aFirstName.SetText( TRIM(aFirstName.GetText()) );
aName.SetText( TRIM(aName.GetText()) );
diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index ed4afd2..ce5d498 100644
--- a/cui/source/options/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
@@ -65,7 +65,7 @@
#define STR_US_STATE 10
#define STR_QUERY_REG 11
-// Positionierungshilfen f"ur den Dialog
+// positioning help for the dialog
#define HSPACE 2
#define VSPACE 3
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 62dacb0..3483e67 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -37,7 +37,7 @@
#include <dialmgr.hxx>
#include <sal/macros.h>
-// Umwandlung der Modi zu den Positionen in der Listbox
+// modus convertion to the positions in the listbox
const sal_uInt16 aPosToExportArr[] =
{
HTML_CFG_MSIE,
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 81fc6f1..1fee25e 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -147,7 +147,7 @@ void SvxNoSpaceEdit::Modify()
rtl::OUString aValue = GetText();
if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX )
- // der H�chstwert einer Portnummer ist USHRT_MAX
+ // the maximum value of a port number is USHRT_MAX
ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
}
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index de28f0f..7e2cb75 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -486,7 +486,7 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16,
Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
- //??? das untere byte aus dem user data in string wandeln
+ //??? convert the lower byte from the user date into a string
OptionsUserData aData( (sal_uLong) pEntry->GetUserData() );
if(aData.HasNumericValue())
{
@@ -1206,7 +1206,7 @@ SvxLinguTabPage::~SvxLinguTabPage()
//------------------------------------------------------------------------
-//nicht �berladen wegschmeissen
+// don't throw away overloaded
sal_uInt16* SvxLinguTabPage::GetRanges()
{
//TL???
@@ -1910,8 +1910,8 @@ SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, sal_uInt16 nCol )
if (CBCOL_FIRST == nCol)
pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) );
if (CBCOL_SECOND == nCol)
- pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte
- pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff!
+ pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // empty column
+ pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) );
return pEntry;
@@ -2075,8 +2075,8 @@ SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol )
if (CBCOL_FIRST == nCol)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list