Hi,
After some time I have another load of translated German comments ready.
The patch is attached and after applying it the directories
connectivity, cppuhelper and cui should be completely cleared of German
comments. The changes are as always under LGPL/MPL. I hope the patch is
fine and will work :)
Best regards
Florian
From 371814792bc4642b81208a8d6ebefb269366e035 Mon Sep 17 00:00:00 2001
From: Florian Allmann-Rahn <f.allmann-rahn@gmx.de>
Date: Sun, 15 Apr 2012 17:50:21 +0200
Subject: [PATCH] translated or removed german comments in connectivity,
cppuhelper and cui
---
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 +-
.../source/drivers/mozab/MResultSetMetaData.hxx | 2 +-
.../source/drivers/odbcbase/OConnection.cxx | 4 +-
.../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(-)
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@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 71abde00..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..8a43aca 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..c7a5a1d 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..ec50247 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..5ba51cd 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..326fb87 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 24d6a00..10e31f3 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -147,7 +147,7 @@ void SvxNoSpaceEdit::Modify()
XubString 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)
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 BrwStringDic_Impl( pEntry, 0, rTxt ) );
return pEntry;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index ec1ca16..05b3211 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -186,7 +186,6 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
- // Undo-Schritte
if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() )
officecfg::Office::Common::Undo::Steps::set(
aUndoEdit.GetValue(), batch);
@@ -236,7 +235,6 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- // Undo-Schritte
aUndoEdit.SetValue(officecfg::Office::Common::Undo::Steps::get());
aUndoEdit.SaveValue();
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index ad03c20..f1f4d86 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -363,10 +363,10 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
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/optsave.cxx b/cui/source/options/optsave.cxx
index e2138e7..6abeaed 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -328,7 +328,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
(sal_uInt16)aAutoSaveEdit.GetValue() ) );
bModified |= sal_True;
}
- // relativ speichern
+ // save relatively
if ( aRelativeFsysCB.IsChecked() != aRelativeFsysCB.GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
@@ -511,7 +511,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() );
- // relativ speichern
+ // save relatively
aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() );
aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 72a41ce..391f715 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -618,7 +618,7 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
return pPageInfo;
}
-// der ItemSet* geht in den Besitz des Dialogs
+// the ItemSet* is passed on to the dialog's ownership
sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName,
SfxShell* pCreateShell,
SfxModule* pCreateModule,
@@ -681,7 +681,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
int nLeave = pPageInfo->m_pPage->DeactivatePage(pGroupInfo->m_pOutItemSet);
if ( nLeave == SfxTabPage::KEEP_PAGE )
{
- //die Seite darf nicht verlassen werden!
+ // the page mustn't be left
aTreeLB.Select(pCurrentPageEntry);
return 0;
}
@@ -715,7 +715,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
return 0;
}
-// Eine aufgeklappte Gruppe soll vollstaendig sichtbar sein
+// an opened group shall be completely visible
IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
{
pBox->Update();
@@ -1031,7 +1031,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
}
if(bIdentical)
pGroupInfo->m_pShell = pGroupInfo->m_pModule;
- //jetzt noch testen, ob es auch in anderen Gruppen das gleiche Module gab (z.B.
Text+HTML)
+ // now test whether there was the same module in other groups, too (e. g.
Text+HTML)
SvLBoxEntry* pTemp = aTreeLB.First();
while(pTemp)
{
@@ -1281,7 +1281,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
{
SfxDispatcher* pDispatch = pViewFrame->GetDispatcher();
- // Sonstiges - Year2000
+ // miscellaneous - Year2000
if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const
SfxUInt16Item*)pItem)->GetValue() ) );
else
@@ -1291,7 +1291,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (sal_uInt16)aMisc.GetYear2000() ) );
- // Sonstiges - Tabulator
+ // miscellaneous - Tabulator
pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning()));
sal_uInt16 nFlag = aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0;
@@ -1309,7 +1309,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
SID_SET_DOCUMENT_LANGUAGE, SID_SET_DOCUMENT_LANGUAGE,
0 );
- // fuer die Linguistik
+ // for linguistic
Reference< XSpellChecker1 > xSpell = SvxGetSpellChecker();
pRet->Put(SfxSpellCheckItem( xSpell, SID_ATTR_SPELL ));
@@ -1415,10 +1415,10 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet&
rSet
aOptSet.Put(rSet);
if(aOptSet.Count())
SFX_APP()->SetOptions( aOptSet );
- // Dispatcher neu holen, weil SetOptions() ggf. den Dispatcher zerst"ort hat
+ // get dispatcher anew, because SetOptions() might have destroyed the dispatcher
SfxViewFrame *pViewFrame = SfxViewFrame::Current();
// -------------------------------------------------------------------------
-// Year2000 auswerten
+// evaluate Year2000
// -------------------------------------------------------------------------
sal_uInt16 nY2K = USHRT_MAX;
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
@@ -1434,7 +1434,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet&
rSet
}
// -------------------------------------------------------------------------
-// Drucken auswerten
+// evaluate print
// -------------------------------------------------------------------------
if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem))
aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
@@ -1690,7 +1690,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
SvtModuleOptions aModuleOpt;
if ( aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
{
- // Textdokument
+ // text document
ResStringArray& rTextArray = aDlgResource.GetTextArray();
if ( aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument"
) )
|| aFactory.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.WebDocument"
) )
@@ -1719,7 +1719,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
#endif
}
- // HTML-Dokument
+ // HTML documents
if ( !lcl_isOptionHidden( SID_SW_ONLINEOPTIONS, aOptionsDlgOpt ) )
{
ResStringArray& rHTMLArray = aDlgResource.GetHTMLArray();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a2f16f6..a6fbca8 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -185,7 +185,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox)
sal_uInt16 nPos = pBox->GetSelectEntryPos();
void* pVoid = pBox->GetEntryData(nPos);
LanguageType eNewLang = (LanguageType)(long)pVoid;
- //alte Einstellungen speichern und neu fuellen
+ // save old settings and fill anew
if(eNewLang != eLastDialogLanguage)
{
sal_uInt16 nPageId = GetCurPageId();
@@ -288,7 +288,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
/*********************************************************************/
/* */
-/* Hilfs-struct fuer dUserDaten der Checklistbox */
+/* helping struct for dUserData of the Checklistbox */
/* */
/*********************************************************************/
@@ -304,7 +304,7 @@ struct ImpUserData
/*********************************************************************/
/* */
-/* Dialog fuer Prozenteinstellung */
+/* dialog for per cent settings */
/* */
/*********************************************************************/
@@ -331,7 +331,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog
/*********************************************************************/
/* */
-/* veraenderter LBoxString */
+/* changed LBoxString */
/* */
/*********************************************************************/
@@ -393,7 +393,7 @@ void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlag
/*********************************************************************/
/* */
-/* TabPage Autoformat anwenden */
+/* use TabPage autoformat */
/* */
/*********************************************************************/
@@ -458,7 +458,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
{
FreeResource();
- //typ. Anfuehrungszeichen einsetzen
+ // set typ. inverted commas
SvtSysLocale aSysLcl;
aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB);
@@ -497,16 +497,16 @@ SvLBoxEntry* OfaSwAutoFmtOptionsPage::CreateEntry(String& rTxt, sal_uInt16
nCol)
aCheckLB.SetCheckButtonData( pCheckButtonData );
}
- pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff!
+ pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
String sEmpty;
if (nCol == CBCOL_SECOND)
- pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte
+ pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );
else
pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0,
pCheckButtonData ) );
if (nCol == CBCOL_FIRST)
- pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte
+ pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );
else
pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0,
pCheckButtonData ) );
pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) );
@@ -676,8 +676,8 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
aCheckLB.SetUpdateMode(sal_False);
aCheckLB.Clear();
- // Die folgenden Eintraege muessen in der selben Reihenfolge, wie im
- // OfaAutoFmtOptions-enum eingefuegt werden!
+ // The following entries have to be inserted in the same order
+ // as in the OfaAutoFmtOptions-enum!
aCheckLB.GetModel()->Insert(CreateEntry(sUseReplaceTbl, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttWord, CBCOL_BOTH ));
aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH ));
@@ -784,7 +784,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
}
else if( MERGE_SINGLE_LINE_PARA == nSelEntryPos )
{
- // Dialog fuer Prozenteinstellung
+ // dialog for per cent settings
OfaAutoFmtPrcntSet aDlg(this);
aDlg.GetPrcntFld().SetValue(nPercent);
if(RET_OK == aDlg.Execute())
@@ -895,7 +895,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sa
void OfaACorrCheckListBox::HBarClick()
{
- // Sortierung durch diese Ueberladung abgeklemmt
+ // sorting is stopped by this overload
}
void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
@@ -1007,21 +1007,21 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
{
LanguageType eCurLang = it->first;
DoubleStringArray& rDoubleStringArray = it->second;
- if(eCurLang != eLang) // die aktuelle Sprache wird weiter hinten behandelt
+ if(eCurLang != eLang) // the current language is treated later
{
SvxAutocorrWordList* pWordList = pAutoCorrect->LoadAutocorrWordList(eCurLang);
sal_uInt16 nWordListCount = pWordList->Count();
sal_uInt16 nDoubleStringArrayCount = rDoubleStringArray.size();
sal_uInt16 nPos = nDoubleStringArrayCount;
sal_uInt16 nLastPos = nPos;
- // 1. Durchlauf: Eintraege loeschen oder veraendern:
+ // 1st run: delete or change entries:
for( sal_uInt16 nWordListPos = nWordListCount; nWordListPos; nWordListPos-- )
{
SvxAutocorrWordPtr pWordPtr = pWordList->GetObject(nWordListPos - 1);
String sEntry(pWordPtr->GetShort());
- // formatierter Text steht nur im Writer
+ // formatted text is only in Writer
sal_Bool bFound = !bSWriter && !pWordPtr->IsTextOnly();
while(!bFound && nPos)
{
@@ -1052,7 +1052,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
nDoubleStringArrayCount = rDoubleStringArray.size();
for(sal_uInt16 nDoubleStringArrayPos = 0; nDoubleStringArrayPos <
nDoubleStringArrayCount; nDoubleStringArrayPos++ )
{
- //jetzt sollte es nur noch neue Eintraege geben
+ // now there should only be new entries left
DoubleString& rDouble = rDoubleStringArray[ nDoubleStringArrayPos ];
if(rDouble.pUserData == &bHasSelectionText)
pAutoCorrect->PutText( rDouble.sShort,
@@ -1066,7 +1066,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
}
}
aDoubleStringTable.clear();
- // jetzt noch die aktuelle Selektion
+ // and now the current selection
SvxAutocorrWordList* pWordList = pAutoCorrect->LoadAutocorrWordList(eLang);
sal_uInt16 nWordListCount = pWordList->Count();
sal_uInt16 nListBoxCount = (sal_uInt16)aReplaceTLB.GetEntryCount();
@@ -1074,14 +1074,14 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
aReplaceTLB.SetUpdateMode(sal_False);
sal_uInt16 nListBoxPos = nListBoxCount;
sal_uInt16 nLastListBoxPos = nListBoxPos;
- // 1. Durchlauf: Eintraege loeschen oder veraendern:
+ // 1st run: delete or change entries:
sal_uInt16 i;
for( i = nWordListCount; i; i-- )
{
SvxAutocorrWordPtr pWordPtr = pWordList->GetObject(i- 1);
String sEntry(pWordPtr->GetShort());
- // formatierter Text steht nur im Writer
+ // formatted text is only in Writer
sal_Bool bFound = !bSWriter && !pWordPtr->IsTextOnly();
while(!bFound && nListBoxPos)
{
@@ -1114,7 +1114,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
nListBoxCount = (sal_uInt16)aReplaceTLB.GetEntryCount();
for(i = 0; i < nListBoxCount; i++ )
{
- //jetzt sollte es nur noch neue Eintraege geben
+ // now there should only be new entries left
SvLBoxEntry* pEntry = aReplaceTLB.GetEntry( i );
String sShort = aReplaceTLB.GetEntryText(pEntry, 0);
if(pEntry->GetUserData() == &bHasSelectionText)
@@ -1173,7 +1173,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset,
{
DoubleString& rDouble = rArray[i];
sal_Bool bTextOnly = 0 == rDouble.pUserData;
- // formatierter Text wird nur im Writer angeboten
+ // formatted text is only in Writer
if(bSWriter || bTextOnly)
{
String sEntry(rDouble.sShort);
@@ -1182,7 +1182,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset,
SvLBoxEntry* pEntry = aReplaceTLB.InsertEntry(sEntry);
aTextOnlyCB.Check(bTextOnly);
if(!bTextOnly)
- pEntry->SetUserData(rDouble.pUserData); // Das heisst: mit Formatinfo oder
sogar mit Selektionstext
+ pEntry->SetUserData(rDouble.pUserData); // that means: with format info or
even with selection text
}
else
aFormatText.insert(rDouble.sShort);
@@ -1197,7 +1197,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset,
{
SvxAutocorrWordPtr pWordPtr = pWordList->GetObject(i);
sal_Bool bTextOnly = pWordPtr->IsTextOnly();
- // formatierter Text wird nur im Writer angeboten
+ // formatted text is only in Writer
if(bSWriter || bTextOnly)
{
String sEntry(pWordPtr->GetShort());
@@ -1206,7 +1206,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset,
SvLBoxEntry* pEntry = aReplaceTLB.InsertEntry(sEntry);
aTextOnlyCB.Check(pWordPtr->IsTextOnly());
if(!bTextOnly)
- pEntry->SetUserData(&aTextOnlyCB); // Das heisst: mit Formatinfo
+ pEntry->SetUserData(&aTextOnlyCB); // that means: with format info
}
else
aFormatText.insert(pWordPtr->GetShort());
@@ -1259,20 +1259,20 @@ IMPL_LINK(OfaAutocorrReplacePage, 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
+ // if the text is set via ModifyHdl, the cursor is always at the beginning
+ // of a word, although you're editing here
sal_Bool bSameContent = 0 == pCompareClass->compareString(
sTmpShort, aShortED.GetText() );
Selection aSel = aShortED.GetSelection();
if(aShortED.GetText() != sTmpShort)
{
aShortED.SetText(sTmpShort);
- //war es nur eine andere Schreibweise, dann muss die Selektion auch wieder gesetzt
werden
+ // if it was only a different notation, the selection has to be set again
if(bSameContent)
aShortED.SetSelection(aSel);
}
aReplaceED.SetText(pBox->GetEntryText(pEntry, 1));
- // mit UserData gibt es eine Formatinfo
+ // with UserData there is a Formatinfo
aTextOnlyCB.Check(0 == pEntry->GetUserData());
}
else
@@ -1329,11 +1329,11 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
sEntry, static_cast< SvLBoxEntry * >(NULL), false,
nPos == USHRT_MAX ? LIST_APPEND : nPos);
if( !bReplaceEditChanged && !aTextOnlyCB.IsChecked())
- pInsEntry->SetUserData(&bHasSelectionText); // neuer formatierter Text
+ pInsEntry->SetUserData(&bHasSelectionText); // new formatted text
aReplaceTLB.MakeVisible( pInsEntry );
aReplaceTLB.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())
aShortED.GrabFocus();
@@ -1341,8 +1341,8 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
}
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(&aShortED);
@@ -1528,7 +1528,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
{
LanguageType eCurLang = it1->first;
StringsArrays& rArrays = it1->second;
- if(eCurLang != eLang) // die aktuelle Sprache wird weiter hinten behandelt
+ if(eCurLang != eLang) // current language is treated later
{
SvStringsISortDtor* pWrdList = pAutoCorrect->LoadWrdSttExceptList(eCurLang);
@@ -1539,7 +1539,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& )
for( i = nCount; i; )
{
String* pString = pWrdList->GetObject( --i );
- //Eintrag finden u. gfs entfernen
+
if( !lcl_FindInArray(rArrays.aDoubleCapsStrings, *pString))
pWrdList->DeleteAndDestroy( i );
}
@@ -1633,7 +1633,7 @@ void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet)
{
if(eLang != eSet)
{
- //alte Einstellungen speichern und neu fuellen
+ // save old settings and fill anew
RefillReplaceBoxes(sal_False, eLang, eSet);
eLastDialogLanguage = eSet;
delete pCompareClass;
@@ -1790,8 +1790,8 @@ void AutoCorrEdit::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);
}
@@ -1815,16 +1815,16 @@ SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, sal_uInt16 nCol)
aSwCheckLB.SetCheckButtonData( pCheckButtonData );
}
- pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff!
+ pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
String sEmpty;
if (nCol == CBCOL_SECOND)
- pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte
+ pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );
else
pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0,
pCheckButtonData ) );
if (nCol == CBCOL_FIRST)
- pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte
+ pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) );
else
pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0,
pCheckButtonData ) );
@@ -2085,7 +2085,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
nMode = DBL_START;
else if(pBtn == &aEndQuotePB)
nMode = DBL_END;
- // Zeichenauswahl-Dialog starten
+ // start character selection dialog
SvxCharacterMap* pMap = new SvxCharacterMap( this, sal_True );
pMap->SetCharFont( OutputDevice::GetDefaultFont(DEFAULTFONT_LATIN_TEXT,
LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 ));
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8adf23a..526ae30 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -46,7 +46,7 @@
#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
-// Tabellenhintergrund
+// table background
#define TBL_DEST_CELL 0
#define TBL_DEST_ROW 1
#define TBL_DEST_TBL 2
@@ -149,9 +149,9 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
// class BackgroundPreview -----------------------------------------------
-/* [Beschreibung]
+/* [Description]
- Vorschaufenster f"ur Brush oder Bitmap
+ preview window for brush or bitmap
*/
class BackgroundPreviewImpl : public Window
@@ -359,7 +359,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
pParaBck_Impl ( NULL )
{
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
const SfxPoolItem* pItem;
@@ -413,9 +413,9 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
sal_uInt16* SvxBackgroundTabPage::GetRanges()
-/* [Beschreibung]
+/* [Description]
- gibt den Bereich der Which-Werte zur"uck
+ returns the area of the which-values
*/
{
@@ -427,9 +427,9 @@ sal_uInt16* SvxBackgroundTabPage::GetRanges()
SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
const SfxItemSet& rAttrSet )
-/* [Beschreibung]
+/* [Description]
- Create-Methode f"ur den TabDialog
+ create method for the TabDialog
*/
{
@@ -440,8 +440,8 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
{
-// os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden,
-// es muss aber im rSet vorhanden sein!
+// os: Such a nonsense! One will always find such an item somewhere,
+// but it must be existing in the rSet!
// const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), sal_False))
@@ -450,15 +450,15 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
return;
}
- // Zustand des Vorschau-Buttons durch UserData persistent
+ // condition of the preview button is persistent due to UserData
String aUserData = GetUserData();
aBtnPreview.Check( aUserData.Len() && sal_Unicode('1') == aUserData.GetChar( 0 ) );
- // nach Reset kein ShowSelector() mehr aufrufen d"urfen
+ // don't be allowed to call ShowSelector() after reset anymore
bAllowShowSelector = sal_False;
- // Input-BrushItem besorgen und auswerten
+ // get and evaluate Input-BrushItem
const SvxBrushItem* pBgdAttr = NULL;
sal_uInt16 nSlot = SID_ATTR_BRUSH;
const SfxPoolItem* pItem;
@@ -487,11 +487,11 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
SID_PARA_BACKGRND_DESTINATION, sal_False, &pItem ) )
{
nDestValue = ((const SfxUInt16Item*)pItem)->GetValue();
- // ist gerade Zeichen aktiviert?
+ // character activated?
sal_uInt16 nParaSel = aParaLBox.GetSelectEntryPos();
if(1 == nParaSel)
{
- // dann war das ein "Standard" - Aufruf
+ // then it was a "standard"-call
nDestValue = nParaSel;
}
aParaLBox.SelectEntryPos(nDestValue);
@@ -635,11 +635,11 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
{
ShowSelector();
- // Zustand des Vorschau-Buttons durch UserData persistent
+ // condition of the preview button is persistent due to UserData
String aUserData = GetUserData();
aBtnPreview.Check( aUserData.Len() && sal_Unicode('1') == aUserData.GetChar( 0 ) );
- // Input-BrushItem besorgen und auswerten
+ // get and evaluate Input-BrushItem
const SvxBrushItem* pBgdAttr = NULL;
sal_uInt16 nSlot = SID_VIEW_FLD_PIC;
sal_uInt16 nWhich = GetWhich( nSlot );
@@ -658,7 +658,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
if ( pBgdAttr )
{
FillControls_Impl(*pBgdAttr, aUserData);
- // Auch bei Anzeige der Grafik, soll die Brush erhalten bleiben
+ // brush shall be kept when showing the graphic, too
if( aBgdColor != pBgdAttr->GetColor() )
{
aBgdColor = pBgdAttr->GetColor();
@@ -693,12 +693,12 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
void SvxBackgroundTabPage::FillUserData()
-/* [Beschreibung]
+/* [Description]
- Beim Destruieren einer SfxTabPage wird diese virtuelle Methode gerufen,
- damit die TabPage interne Informationen sichern kann.
+ When destroying a SfxTabPage this virtual method is called,
+ so that the TabPage can save internal information.
- In diesem Fall wird der Zustand des Vorschau-Buttons gesichert.
+ In this case the condition of the preview button is saved.
*/
{
@@ -714,8 +714,8 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
pPageImpl->pLoadTimer->Stop();
LoadTimerHdl_Impl( pPageImpl->pLoadTimer );
}
-// os: So ein Unsinn! Irgendwo laesst sich so ein Item immer finden,
-// es muss aber im rSet vorhanden sein!
+// os: Such a nonsense! One will always find such an item somewhere,
+// but it must be existing in the rSet!
// const SfxPoolItem* pX = GetOldItem( rCoreSet, SID_VIEW_FLD_PIC );
// if( pX && pX->ISA(SfxWallpaperItem))
@@ -772,13 +772,13 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
aBgdColor.SetTransparency(lcl_PercentToTransparency(static_cast<long>(aColTransMF.GetValue())));
}
if ( ( (GPOS_NONE == eOldPos) && bIsBrush )
- || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap gewechselt?
+ || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap changed?
{
- // Hintergrund-Art wurde nicht gewechselt:
+ // background art hasn't been changed:
if ( (GPOS_NONE == eOldPos) || !aLbSelect.IsVisible() )
{
- // Brush-Behandlung:
+ // Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor ||
(SFX_ITEM_AVAILABLE >= eOldItemState &&
!aBackgroundColorSet.IsNoSelection()))
{
@@ -790,7 +790,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
}
else
{
- // Bitmap-Behandlung:
+ // Bitmap-treatment:
SvxGraphicPosition eNewPos = GetGraphicPosition_Impl();
const sal_Bool bIsLink = aBtnLink.IsChecked();
@@ -831,7 +831,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
rCoreSet.ClearItem( nWhich );
}
}
- else // Brush <-> Bitmap gewechselt!
+ else // Brush <-> Bitmap changed!
{
if ( bIsBrush )
rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) );
@@ -873,7 +873,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
if( aTblLBox.IsVisible() )
{
- // Der aktuelle Zustand wurde bereits geputtet
+ // the current condition has already been put
if( nSlot != SID_ATTR_BRUSH && pTableBck_Impl->pCellBrush)
{
const SfxPoolItem* pOldCell =
@@ -919,8 +919,8 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
}
else if(aParaLBox.GetData() == &aParaLBox)
{
- // Der aktuelle Zustand wurde bereits geputtet
- if( nSlot != SID_ATTR_BRUSH && aParaLBox.IsVisible()) // nicht im Suchen-Format-Dialog
+ // the current condition has already been put
+ if( nSlot != SID_ATTR_BRUSH && aParaLBox.IsVisible()) // not in search format dialog
{
const SfxPoolItem* pOldPara =
GetOldItem( rCoreSet, SID_ATTR_BRUSH );
@@ -971,13 +971,13 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet&
rCoreSe
sal_Bool bModified = sal_False;
if ( ( (GPOS_NONE == eOldPos) && bIsBrush )
- || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap gewechselt?
+ || ( (GPOS_NONE != eOldPos) && !bIsBrush ) ) // Brush <-> Bitmap changed?
{
- // Hintergrund-Art wurde nicht gewechselt:
+ // background art hasn't been changed
if ( (GPOS_NONE == eOldPos) || !aLbSelect.IsVisible() )
{
- // Brush-Behandlung:
+ // Brush-treatment:
if ( rOldItem.GetColor() != aBgdColor )
{
bModified = sal_True;
@@ -990,7 +990,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
}
else
{
- // Bitmap-Behandlung:
+ // Bitmap-treatment:
SvxGraphicPosition eNewPos = GetGraphicPosition_Impl();
int bBitmapChanged = ( ( eNewPos != eOldPos ) ||
@@ -1011,7 +1011,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet&
rCoreSe
rCoreSet.ClearItem( nWhich );
}
}
- else // Brush <-> Bitmap gewechselt!
+ else // Brush <-> Bitmap changed!
{
CntWallpaperItem aItem( nWhich );
if ( bIsBrush )
@@ -1038,9 +1038,9 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet&
rCoreSe
int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
-/* [Beschreibung]
+/* [Description]
- virtuelle Methode, wird beim Deaktivieren gerufen
+ virtual method; is called on deactivation
*/
{
@@ -1057,7 +1057,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT )
{
- // muss implementiert werden, damit Position-Control funktioniert
+ // has to be implemented so that position control can work
}
//-----------------------------------------------------------------------
@@ -1076,9 +1076,9 @@ void SvxBackgroundTabPage::ShowSelector()
aBtnTile.SetClickHdl( HDL(RadioClickHdl_Impl) );
aBtnPosition.SetClickHdl( HDL(RadioClickHdl_Impl) );
- // Verz"ogertes Laden "uber Timer (wg. UI-Update)
+ // delayed loading via timer (because of UI-Update)
pPageImpl->pLoadTimer = new Timer;
- pPageImpl->pLoadTimer->SetTimeout( 500 ); // 500ms verz"ogern
+ pPageImpl->pLoadTimer->SetTimeout( 500 );
pPageImpl->pLoadTimer->SetTimeoutHdl(
LINK( this, SvxBackgroundTabPage, LoadTimerHdl_Impl ) );
@@ -1122,12 +1122,6 @@ sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
void SvxBackgroundTabPage::FillColorValueSets_Impl()
-
-/* [Beschreibung]
-
- F"ullen des Farb-Sets
-*/
-
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
@@ -1183,10 +1177,10 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
void SvxBackgroundTabPage::ShowColorUI_Impl()
-/* [Beschreibung]
+/* [Description]
- Die Controls f"ur das Einstellen der Grafik ausblenden und die
- Controls f"ur die Farbeinstellung einblenden.
+ Hide the controls for editing the bitmap
+ and show the controls for color settings instead.
*/
{
@@ -1221,10 +1215,10 @@ void SvxBackgroundTabPage::ShowColorUI_Impl()
void SvxBackgroundTabPage::ShowBitmapUI_Impl()
-/* [Beschreibung]
+/* [Description]
- Die Controls f"ur die Farbeinstellung ausblenden und die
- Controls f"ur das Einstellen der Grafik einblenden.
+ Hide the the controls for color settings
+ and show controls for editing the bitmap instead.
*/
{
@@ -1263,12 +1257,6 @@ void SvxBackgroundTabPage::ShowBitmapUI_Impl()
//------------------------------------------------------------------------
void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
-
-/* [Beschreibung]
-
- Die Controls f"ur die Grafikposition einstellen.
-*/
-
{
switch ( ePos )
{
@@ -1315,12 +1303,6 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
//------------------------------------------------------------------------
SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
-
-/* [Beschreibung]
-
- Die Position der Grafik zur"uckgeben.
-*/
-
{
if ( aBtnTile.IsChecked() )
return GPOS_TILED;
@@ -1370,12 +1352,12 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
if ( 0 == aLbSelect.GetSelectEntryPos() )
{
ShowColorUI_Impl();
- aParaLBox.Enable(); // Zeichenhintergrund kann keine Bitmap sein
+ aParaLBox.Enable(); // drawing background can't be a bitmap
}
else
{
ShowBitmapUI_Impl();
- aParaLBox.Enable(sal_False);// Zeichenhintergrund kann keine Bitmap sein
+ aParaLBox.Enable(sal_False); // drawing background can't be a bitmap
}
return 0;
}
@@ -1413,8 +1395,8 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
}
else
{
- if ( aBgdGraphicPath.Len() > 0 ) // nur bei gelinkter Grafik
- RaiseLoadError_Impl(); // ein Fehler
+ if ( aBgdGraphicPath.Len() > 0 ) // only for linked bitmap
+ RaiseLoadError_Impl();
pPreviewWin2->NotifyChange( NULL );
}
}
@@ -1448,10 +1430,10 @@ IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
-/* [Beschreibung]
+/* [Description]
- Handler, gerufen durch das Dr"ucken des Durchsuchen-Buttons.
- Grafik/Einf"ugen-Dialog erzeugen, Pfad setzen und starten.
+ Handler, called by pressing the browse button.
+ Create graphic/insert dialog, set path and start.
*/
{
@@ -1472,12 +1454,12 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
{
if ( bHtml )
aBtnLink.Check();
- // wenn Verkn"upfen nicht gecheckt ist und die Vorschau auch nicht,
- // dann die Vorschau aktivieren, damit der Anwender sieht,
- // welche Grafik er ausgew"ahlt hat
+ // if link isn't checked and preview isn't, either,
+ // activate preview, so that the user sees which
+ // graphic he has chosen
if ( !aBtnLink.IsChecked() && !aBtnPreview.IsChecked() )
aBtnPreview.Check( sal_True );
- // timer-verz"ogertes Laden der Grafik
+ // timer-delayed loading of the graphic
pPageImpl->pLoadTimer->Start();
}
else
@@ -1489,11 +1471,11 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
-/* [Beschreibung]
+/* [Description]
- Verz"ogertes Laden der Grafik.
- Grafik wird nur dann geladen, wenn sie unterschiedlich zur
- aktuellen Grafik ist.
+ Delayed loading of the graphic.
+ Graphic is only loaded, if it's
+ different to the current graphic.
*/
{
@@ -1507,7 +1489,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
INetURLObject aNew( pImportDlg->GetPath() );
if ( !aBgdGraphicPath.Len() || aNew != aOld )
{
- // neue Datei gew"ahlt
+ // new file chosen
aBgdGraphicPath = pImportDlg->GetPath();
aBgdGraphicFilter = pImportDlg->GetCurrentFilter();
sal_Bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? sal_True :
pImportDlg->IsAsLink();
@@ -1528,7 +1510,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
}
}
else
- bIsGraphicValid = sal_False; // Grafik erst beim Preview-Click laden
+ bIsGraphicValid = sal_False; // load graphic not until preview click
if ( aBtnPreview.IsChecked() && bIsGraphicValid )
{
@@ -1567,7 +1549,7 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly)
aTblDesc.Show();
aParaLBox.Show();
}
- aParaLBox.SetData(&aParaLBox); // hier erkennt man, dass dieser Mode eingeschaltet ist
+ aParaLBox.SetData(&aParaLBox); // here it can be recognized that this mode is turned on
}
//-----------------------------------------------------------------------
@@ -1596,7 +1578,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
pTableBck_Impl->nActPos = nSelPos;
if(!*pActItem)
*pActItem = new SvxBrushItem(nWhich);
- if(0 == aLbSelect.GetSelectEntryPos()) // Brush ausgewaehlt
+ if(0 == aLbSelect.GetSelectEntryPos()) // brush selected
{
**pActItem = SvxBrushItem( aBgdColor, nWhich );
}
@@ -1666,7 +1648,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
break;
}
pParaBck_Impl->nActPos = nSelPos;
- if(0 == aLbSelect.GetSelectEntryPos()) // Brush ausgewaehlt
+ if(0 == aLbSelect.GetSelectEntryPos()) // brush selected
{
sal_uInt16 nWhich = (*pActItem)->Which();
**pActItem = SvxBrushItem( aBgdColor, nWhich );
@@ -1748,7 +1730,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
}
pPreviewWin1->NotifyChange( aBgdColor );
- if ( aLbSelect.IsVisible() ) // Grafikteil initialisieren
+ if ( aLbSelect.IsVisible() ) // initialize graphic part
{
aBgdGraphicFilter.Erase();
aBgdGraphicPath.Erase();
@@ -1758,7 +1740,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
aBtnLink.Check( sal_False );
aBtnLink.Disable();
pPreviewWin2->NotifyChange( NULL );
- SetGraphicPosition_Impl( GPOS_TILED ); // Kacheln als Default
+ SetGraphicPosition_Impl( GPOS_TILED ); // tiles as default
}
}
else
@@ -1805,8 +1787,8 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
if ( !pStrLink || aBtnPreview.IsChecked() )
{
- // Grafik ist im Item vorhanden und muss nicht
- // geladen werden:
+ // Graphic exists in the item and doesn't have
+ // to be loaded:
const Graphic* pGraphic = rBgdAttr.GetGraphic();
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index fd9c63c..0f1f82d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -61,17 +61,17 @@ using namespace ::editeng;
// -----------------------------------------------------------------------
/*
- * [Beschreibung:]
- * TabPage zum Einstellen der Rahmen-Attribute.
- * Benoetigt
- * ein SvxShadowItem: Schatten
- * ein SvxBoxItem: Linien links,rechts,oben,unten ),
- * ein SvxBoxInfo: Linien vertikal,horizontal, Abstaende, Flags )
+ * [Description:]
+ * TabPage for setting the border attributes.
+ * Needs
+ * a SvxShadowItem: shadow
+ * a SvxBoxItem: lines left, right, top, bottom,
+ * a SvxBoxInfo: lines vertical, horizontal, distance, flags
*
- * Linien koennen drei Zustaende haben.
- * 1. Show ( -> gueltige Werte )
+ * Lines can have three conditions:
+ * 1. Show ( -> valid values )
* 2. Hide ( -> NULL-Pointer )
- * 3. DontCare ( -> gesonderte Valid-Flags im InfoItem )
+ * 3. DontCare ( -> special Valid-Flags in the InfoItem )
*/
// static ----------------------------------------------------------------
@@ -149,7 +149,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
mbSync(true)
{
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
/* Use SvxMarginItem instead of margins from SvxBoxItem, if present.
@@ -157,7 +157,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
is needed across various functions... */
mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),sal_True) !=
SFX_ITEM_UNKNOWN;
- // Metrik einstellen
+ // set metric
FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs );
if( mbUseMarginItem )
@@ -201,7 +201,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
if ( rCoreAttrs.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
{
- // Absatz oder Tabelle
+ // paragraph or table
const SvxBoxInfoItem* pBoxInfo =
(const SvxBoxInfoItem*)&( rCoreAttrs.Get( nWhich ) );
@@ -272,7 +272,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
FillValueSets();
FillLineListBox_Impl();
- // ColorBox aus der XColorList fuellen.
+ // fill ColorBox out of the XColorList
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
XColorListRef pColorTable;
@@ -290,7 +290,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
if ( pColorTable.is() )
{
- // fuellen der Linienfarben-Box
+ // filling the line color box
aLbLineColor.SetUpdateMode( sal_False );
for ( long i = 0; i < pColorTable->Count(); ++i )
@@ -299,7 +299,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent,
aLbLineColor.InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
aLbLineColor.SetUpdateMode( sal_True );
- // dann nur noch in die Schattenfarben-Box kopieren
+
aLbShadowColor.CopyEntries( aLbLineColor );
}
FreeResource();
@@ -389,7 +389,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
ResetFrameLine_Impl( svx::FRAMEBORDER_HOR, pBoxInfoItem->GetHori(),
pBoxInfoItem->IsValid( VALID_HORI ) );
//-------------------
- // Abstand nach innen
+ // distance inside
//-------------------
if( !mbUseMarginItem )
{
@@ -435,10 +435,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
long nBottomDist = pBoxItem->GetDistance( BOX_LINE_BOTTOM);
SetMetricValue( aBottomMF, nBottomDist, eCoreUnit );
- // ist der Abstand auf nicht-default gesetzt,
- // dann soll der Wert auch nicht
- // mehr autom. veraendert werden
-
// if the distance is set with no active border line
// or it is null with an active border line
// no automatic changes should be made
@@ -474,12 +470,12 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
}
else
{
- // ResetFrameLine-Aufrufe einsparen:
+ // avoid ResetFrameLine-calls:
aFrameSel.HideAllBorders();
}
//-------------------------------------------------------------
- // Linie/Linienfarbe in Controllern darstellen, wenn eindeutig:
+ // depict line (color) in controllers if unambiguous:
//-------------------------------------------------------------
{
// Do all visible lines show the same line widths?
@@ -531,7 +527,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
aWndPresets.SetNoSelection();
- // - keine Line - sollte nicht selektiert sein
+ // - no line - should not be selected
if ( aLbLineStyle.GetSelectEntryPos() == 0 )
{
@@ -548,7 +544,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
sal_uInt16 nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
if(nHtmlMode & HTMLMODE_ON)
{
- //Im Html-Mode gibt es keinen Schatten und nur komplette Umrandungen
+ // there are no shadows in Html-mode and only complete borders
aFtShadowPos .Disable();
aWndShadows .Disable();
aFtShadowSize .Disable();
@@ -606,7 +602,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
const SfxPoolItem* pOld = 0;
//------------------
- // Umrandung aussen:
+ // outter border:
//------------------
typedef ::std::pair<svx::FrameBorderType,sal_uInt16> TBorderPair;
TBorderPair eTypes1[] = {
@@ -620,7 +616,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
aBoxItem.SetLine( aFrameSel.GetFrameBorderStyle( eTypes1[i].first ), eTypes1[i].second );
//--------------------------------
- // Umrandung hor/ver und TableFlag
+ // border hor/ver and TableFlag
//--------------------------------
TBorderPair eTypes2[] = {
TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI),
@@ -633,7 +629,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
aBoxInfoItem.EnableVer( mbVerEnabled );
//-------------------
- // Abstand nach Innen
+ // inner distance
//-------------------
if( aLeftMF.IsVisible() )
{
@@ -690,7 +686,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
}
//------------------------------------------
- // Don't Care Status im Info-Item vermerken:
+ // note Don't Care Status in the Info-Item:
//------------------------------------------
aBoxInfoItem.SetValid( VALID_TOP, aFrameSel.GetFrameBorderState( svx::FRAMEBORDER_TOP )
!= svx::FRAMESTATE_DONTCARE );
aBoxInfoItem.SetValid( VALID_BOTTOM, aFrameSel.GetFrameBorderState( svx::FRAMEBORDER_BOTTOM )
!= svx::FRAMESTATE_DONTCARE );
@@ -700,7 +696,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
aBoxInfoItem.SetValid( VALID_VERT, aFrameSel.GetFrameBorderState( svx::FRAMEBORDER_VER )
!= svx::FRAMESTATE_DONTCARE );
//
- // Put oder Clear der Umrandung?
+ // Put or Clear of the border?
//
bPut = sal_True;
@@ -1122,10 +1118,10 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
aBottomMF.SetValue(0);
}
}
- //fuer Tabellen ist alles erlaubt
+ // for tables everything is allowed
sal_uInt16 nValid = VALID_TOP|VALID_BOTTOM|VALID_LEFT|VALID_RIGHT;
- //fuer Rahmen und Absatz wird das Edit disabled, wenn keine Border gesetzt ist
+ // for border and paragraph the edit is disabled, if there's no border set
if(nSWMode & (SW_BORDER_MODE_FRAME|SW_BORDER_MODE_PARA))
{
if(bLineSet)
diff --git a/cui/source/tabpages/border.hrc b/cui/source/tabpages/border.hrc
index 9d5ce87..6ae3ef0 100644
--- a/cui/source/tabpages/border.hrc
+++ b/cui/source/tabpages/border.hrc
@@ -70,7 +70,7 @@
#define CB_MERGEADJACENTBORDERS 66
#define FT_WIDTH 67
-// ImageListe fuer ValueSets:
+// ImageList for ValueSets:
#define IL_PRE_BITMAPS 1400
#define IID_PRE_CELL_NONE 1
#define IID_PRE_CELL_ALL 2
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f6fb879..c127824 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -581,14 +581,14 @@ namespace
DBG_ASSERT( _pPage->GetItemSet().GetParent(), "No parent set" );
const SvxFontHeightItem& rOldItem =
(SvxFontHeightItem&)_pPage->GetItemSet().GetParent()->Get( _nFontHeightWhich );
- // alter Wert, skaliert
+ // old value, scaled
long nHeight;
if ( _pFontSizeLB->IsPtRelative() )
nHeight = rOldItem.GetHeight() + PointToTwips(
static_cast<long>(_pFontSizeLB->GetValue() / 10) );
else
nHeight = static_cast<long>(rOldItem.GetHeight() * _pFontSizeLB->GetValue() / 100);
- // Umrechnung in twips fuer das Beispiel-Window
+ // conversion twips for the example-window
aSize.Height() =
ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric(
_nFontHeightWhich ), SFX_FUNIT_TWIP );
}
@@ -665,8 +665,8 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
if ( m_pImpl->m_bInSearchMode )
{
- // Bei der Suche zus"atzliche Eintr"age:
- // "Nicht Fett" und "Nicht Kursiv"
+ // additional entries for the search:
+ // "not bold" and "not italic"
String aEntry = m_pImpl->m_aNoStyleText;
const sal_Char sS[] = "%1";
aEntry.SearchAndReplaceAscii( sS, pFontList->GetBoldStr() );
@@ -761,11 +761,9 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup
eLangGrp
break;
}
- // die FontListBox fuellen
const FontList* pFontList = GetFontList();
pNameBox->Fill( pFontList );
- // Font ermitteln
const SvxFontItem* pFontItem = NULL;
SfxItemState eState = rSet.GetItemState( nWhich );
@@ -818,7 +816,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
bStyle = false;
bStyleAvailable = bStyleAvailable && (eState >= SFX_ITEM_DONTCARE);
- // Aktuell eingestellter Font
+ // currently chosen font
if ( bStyle && pFontItem )
{
FontInfo aInfo = pFontList->Get( pFontItem->GetFamilyName(), eWeight, eItalic );
@@ -839,7 +837,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
pStyleLabel->Disable( );
}
- // SizeBox fuellen
FillSizeBox_Impl( pNameBox );
switch ( eLangGrp )
{
@@ -1050,7 +1047,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup
eLan
if ( nEntryPos >= m_pImpl->m_nExtraEntryPos )
bChanged = ( nEntryPos == m_pImpl->m_nExtraEntryPos );
- String aText( pStyleBox->GetText() ); // Tristate, dann Text leer
+ String aText( pStyleBox->GetText() ); // Tristate, then text empty
if ( bChanged && aText.Len() )
{
@@ -1110,7 +1107,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup
eLan
// FontSize
long nSize = static_cast<long>(pSizeBox->GetValue());
- if ( !pSizeBox->GetText().Len() ) // GetValue() gibt dann Min-Wert zurueck
+ if ( !pSizeBox->GetText().Len() ) // GetValue() returns the min-value
nSize = 0;
long nSavedSize = pSizeBox->GetSavedValue().ToInt32();
bool bRel = true;
@@ -1377,9 +1374,9 @@ namespace
short nCurHeight =
static_cast< short >( CalcToPoint( rHeightItem.GetHeight(), eUnit, 1 ) * 10 );
- // ausgehend von der akt. Hoehe:
- // - negativ bis minimal 2 pt
- // - positiv bis maximal 999 pt
+ // based on the current height:
+ // - negative until minimum of 2 pt
+ // - positive until maximum of 999 pt
_pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)),
(9999 - nCurHeight), 10 );
}
}
@@ -3156,7 +3153,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
m_aLowPosBtn.Check( sal_False );
}
- // BspFont setzen
+ // set BspFont
SetPrevFontEscapement( nProp, nEscProp, nEsc );
// Kerning
@@ -3171,7 +3168,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
long nBig = static_cast<long>(m_aKerningEdit.Normalize(
static_cast<long>(rItem.GetValue()) ));
long nKerning = LogicToLogic( nBig, eOrgUnit, ePntUnit );
- // Kerning am Font setzen, vorher in Twips umrechnen
+ // set Kerning at the Font, convert into Twips before
long nKern = LogicToLogic( rItem.GetValue(), (MapUnit)eUnit, MAP_TWIP );
rFont.SetFixKerning( (short)nKern );
rCJKFont.SetFixKerning( (short)nKern );
@@ -3318,7 +3315,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
{
- // Position (hoch, normal oder tief)
+ // Position (high, normal or low)
const SfxItemSet& rOldSet = GetItemSet();
sal_Bool bModified = sal_False, bChanged = sal_True;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_ESCAPEMENT );
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f20b636..2d47d7c 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -59,7 +59,7 @@ static sal_uInt16 pRanges[] =
/*************************************************************************
|*
-|* Dialog zum Aendern von Konnektoren (Connectors)
+|* dialog for changing connectors
|*
\************************************************************************/
@@ -88,7 +88,7 @@ SvxConnectionDialog::~SvxConnectionDialog()
/*************************************************************************
|*
-|* Seite zum Aendern von Konnektoren (Connectors)
+|* page for changing connectors
|*
\************************************************************************/
@@ -176,7 +176,7 @@ SvxConnectionPage::~SvxConnectionPage()
/*************************************************************************
|*
-|* Liest uebergebenen Item-Set
+|* reads passed Item-Set
|*
\************************************************************************/
@@ -325,7 +325,7 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs )
/*************************************************************************
|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
+|* fills the passed Item-Set width Dialogbox attributes
|*
\************************************************************************/
@@ -413,7 +413,7 @@ void SvxConnectionPage::Construct()
/*************************************************************************
|*
-|* Erzeugt die Seite
+|* creates the page
|*
\************************************************************************/
@@ -498,7 +498,7 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
if( p == &aLbType )
{
- // Anzahl der Linienversaetze ermitteln
+ // get the number of line displacements
sal_uInt16 nCount = aCtlPreview.GetLineDeltaAnz();
aFtLine3.Enable( nCount > 2 );
@@ -535,7 +535,7 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, p )
void SvxConnectionPage::FillTypeLB()
{
- // ListBox mit Verbindernamen fuellen
+ // fill ListBox with connector names
const SfxPoolItem* pItem = GetItem( rOutAttrs, SDRATTR_EDGEKIND );
const SfxItemPool* pPool = rOutAttrs.GetPool();
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index b2f5940..7793894 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -51,7 +51,7 @@ inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit )
}
/*--------------------------------------------------------------------
- Beschreibung: Grafik zuschneiden
+ description: crop graphic
--------------------------------------------------------------------*/
SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
@@ -190,7 +190,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet )
nW = rPool.GetWhich( SID_ATTR_PAGE_SIZE );
if ( SFX_ITEM_SET == rSet.GetItemState( nW, sal_False, &pItem ) )
{
- // Orientation und Size aus dem PageItem
+ // orientation and size from the PageItem
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
aPageSize = ((const SvxSizeItem*)pItem)->GetSize();
@@ -253,7 +253,7 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
SvxSizeItem aSz( nW );
- // die Groesse koennte schon von einer anderen Page gesetzt worden sein
+ // size could already have been set from another page
// #44204#
const SfxItemSet* pExSet = GetTabDialog() ? GetTabDialog()->GetExampleSet() : NULL;
const SfxPoolItem* pItem = 0;
@@ -331,8 +331,8 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
{
if(!bReset)
{
- // Wert wurde von Umlauf-Tabpage geaendert und muss
- // mit Modify-Flag gesetzt werden
+ // value was changed by wrap-tabpage and has to
+ // be set with modify-flag
aWidthMF.SetUserValue(nWidth, FUNIT_TWIP);
}
else
@@ -344,8 +344,8 @@ void SvxGrfCropPage::ActivatePage(const SfxItemSet& rSet)
{
if (!bReset)
{
- // Wert wurde von Umlauf-Tabpage geaendert und muss
- // mit Modify-Flag gesetzt werden
+ // value was changed by wrap-tabpage and has to
+ // be set with modify-flag
aHeightMF.SetUserValue(nHeight, FUNIT_TWIP);
}
else
@@ -389,7 +389,7 @@ int SvxGrfCropPage::DeactivatePage(SfxItemSet *_pSet)
}
/*--------------------------------------------------------------------
- Beschreibung: Massstab geaendert, Groesse anpassen
+ description: scale changed, adjust size
--------------------------------------------------------------------*/
IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField )
@@ -420,7 +420,7 @@ IMPL_LINK( SvxGrfCropPage, ZoomHdl, MetricField *, pField )
}
/*--------------------------------------------------------------------
- Beschreibung: Groesse aendern, Massstab anpassen
+ description: change size, adjust scale
--------------------------------------------------------------------*/
IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField )
@@ -458,7 +458,7 @@ IMPL_LINK( SvxGrfCropPage, SizeHdl, MetricField *, pField )
}
/*--------------------------------------------------------------------
- Beschreibung: Raender auswerten
+ description: evaluate border
--------------------------------------------------------------------*/
IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
@@ -494,7 +494,7 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
aExampleWN.SetRight(nRight);
if(bZoom)
{
- //Massstab bleibt -> Breite neu berechnen
+ // scale stays, recompute width
ZoomHdl(&aWidthZoomMF);
}
}
@@ -523,19 +523,19 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField )
aExampleWN.SetBottom( nBottom );
if(bZoom)
{
- //Massstab bleibt -> Hoehe neu berechnen
+ // scale stays, recompute height
ZoomHdl(&aHeightZoomMF);
}
}
aExampleWN.Invalidate();
- //Groesse und Raender veraendert -> Massstab neu berechnen
+ // size and border changed -> recompute scale
if(!bZoom)
CalcZoom();
CalcMinMaxBorder();
return 0;
}
/*--------------------------------------------------------------------
- Beschreibung: Originalgroesse einstellen
+ description: set original size
--------------------------------------------------------------------*/
IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl)
@@ -559,7 +559,7 @@ IMPL_LINK_NOARG(SvxGrfCropPage, OrigSizeHdl)
return 0;
}
/*--------------------------------------------------------------------
- Beschreibung: Massstab berechnen
+ description: compute scale
--------------------------------------------------------------------*/
void SvxGrfCropPage::CalcZoom()
@@ -588,7 +588,7 @@ void SvxGrfCropPage::CalcZoom()
}
/*--------------------------------------------------------------------
- Beschreibung: Minimal-/Maximalwerte fuer die Raender setzen
+ description: set minimum/maximum values for the margins
--------------------------------------------------------------------*/
void SvxGrfCropPage::CalcMinMaxBorder()
@@ -616,8 +616,8 @@ void SvxGrfCropPage::CalcMinMaxBorder()
aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit );
}
/*--------------------------------------------------------------------
- Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen,
- FixedText mit der Originalgroesse fuellen
+ description: set spinsize to 1/20 of the original size,
+ fill FixedText with the original size
--------------------------------------------------------------------*/
void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
@@ -633,7 +633,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
nSpin = MetricField::ConvertValue( nSpin, aOrigSize.Width(), 0,
eUnit, aLeftMF.GetUnit());
- // Ist der Rand zu gross, wird er auf beiden Seiten auf 1/3 eingestellt.
+ // if the margin is too big, it is set to 1/3 on both pages
long nR = lcl_GetValue( aRightMF, eUnit );
long nL = lcl_GetValue( aLeftMF, eUnit );
if((nL + nR) < - aOrigSize.Width())
@@ -663,7 +663,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
aTopMF.SetSpinSize(nSpin);
aBottomMF.SetSpinSize(nSpin);
- //Originalgroesse anzeigen
+ // display original size
const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() );
MetricField aFld(this, WB_HIDE);
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index fa7384a..21cdbf6 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -107,7 +107,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
aFT_WINKEL.Hide();
aLB_WINKEL.Hide();
- //------------Positionen korrigieren-------------------------
+ //------------correct positions-------------------------
aFT_ANSATZ_REL.SetPosPixel( aFT_UM.GetPosPixel() );
aLB_ANSATZ_REL.SetPosPixel(
Point(
@@ -125,7 +125,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
for( nBitmap = 0; nBitmap < CAPTYPE_BITMAPS_COUNT; nBitmap++ )
mpBmpCapTypes[nBitmap] = new Image(Bitmap(CUI_RES(BMP_CAPTTYPE_1 + nBitmap)),
COL_LIGHTMAGENTA );
- //------------ValueSet installieren--------------------------
+ //------------install ValueSet--------------------------
aCT_CAPTTYPE.SetStyle( aCT_CAPTTYPE.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER |
WB_NAMEFIELD );
aCT_CAPTTYPE.SetColCount(5);//XXX
aCT_CAPTTYPE.SetLineCount(1);
@@ -158,7 +158,7 @@ SvxCaptionTabPage::~SvxCaptionTabPage()
void SvxCaptionTabPage::Construct()
{
- // Setzen des Rechtecks und der Workingarea
+ // set rectangle and working area
DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" );
}
@@ -181,7 +181,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
_rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(aMF_ABSTAND, eUnit ) ) );
}
- // Sonderbehandlung!!! XXX
+ // special treatment!!! XXX
if( nCaptionType==SDRCAPT_TYPE1 )
{
switch( nEscDir )
@@ -229,7 +229,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
}
}
-//NYI-------------die Winkel muessen noch hier rein!!! XXX----------------------
+//NYI-------------the angles have to be added here!!! XXX----------------------
return( sal_True );
}
@@ -239,7 +239,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs)
void SvxCaptionTabPage::Reset( const SfxItemSet& )
{
- //------------Metrik einstellen-----------------------------
+ //------------set metric-----------------------------
FieldUnit eFUnit = GetModuleFieldUnit( rOutAttrs );
@@ -262,29 +262,27 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
sal_uInt16 nWhich;
SfxMapUnit eUnit;
- //------- Winkel ----------
+ //------- angle ----------
nWhich = GetWhich( SDRATTR_CAPTIONANGLE );
nFixedAngle = ( ( const SdrCaptionAngleItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
- //------- absolute Ansatzentfernung ----------
nWhich = GetWhich( SDRATTR_CAPTIONESCABS );
eUnit = pPool->GetMetric( nWhich );
nEscAbs = ( ( const SdrCaptionEscAbsItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
SetMetricValue( aMF_ANSATZ, nEscAbs, eUnit );
nEscAbs = static_cast<long>(aMF_ANSATZ.GetValue());
- //------- relative Ansatzentfernung ----------
nWhich = GetWhich( SDRATTR_CAPTIONESCREL );
nEscRel = (long)( ( const SdrCaptionEscRelItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
- //------- Linienlaenge ----------
+ //------- line length ----------
nWhich = GetWhich( SDRATTR_CAPTIONLINELEN );
eUnit = pPool->GetMetric( nWhich );
nLineLen = ( ( const SdrCaptionLineLenItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
SetMetricValue( aMF_LAENGE, nLineLen, eUnit );
nLineLen = static_cast<long>(aMF_LAENGE.GetValue());
- //------- Abstand zur Box ----------
+ //------- distance to box ----------
nWhich = GetWhich( SDRATTR_CAPTIONGAP );
eUnit = pPool->GetMetric( nWhich );
nGap = ( ( const SdrCaptionGapItem& ) rOutAttrs.Get( nWhich ) ).GetValue();
@@ -297,7 +295,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
nEscDir = (short)( ( const SdrCaptionEscDirItem& ) rOutAttrs.Get( GetWhich(
SDRATTR_CAPTIONESCDIR ) ) ).GetValue();
bEscRel = ( ( const SfxBoolItem& ) rOutAttrs.Get( GetWhich( SDRATTR_CAPTIONESCISREL ) )
).GetValue();
- // Sonderbehandlung!!! XXX
+ // special treatment!!! XXX
if( nCaptionType==SDRCAPT_TYPE1 )
{
switch( nEscDir )
@@ -369,7 +367,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& )
aLB_WINKEL.SelectEntryPos( nWinkelTypePos );
SetupAnsatz_Impl( nAnsatzTypePos );
- aCT_CAPTTYPE.SelectItem( nCaptionType+1 );// Enum beginnt bei 0!
+ aCT_CAPTTYPE.SelectItem( nCaptionType+1 ); // Enum starts at 0!
SetupType_Impl( nCaptionType+1 );
}
@@ -397,7 +395,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
switch( nType )
{
case AZ_OPTIMAL:
-// aMF_ANSATZ.Hide(); //XXX auch bei OPTIMAL werden Abswerte genommen
+// aMF_ANSATZ.Hide(); //XXX in case of OPTIMAL also absolute values are taken
// aFT_UM.Hide();
aMF_ANSATZ.Show();
aFT_UM.Show();
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index ef34486..6edbc68 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -110,7 +110,7 @@ static sal_uInt16 aPageRg[] = {
0
};
-// 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
@@ -151,11 +151,11 @@ String ConvertToUIName_Impl( SvxMacro *pMacro )
void _SfxMacroTabPage::EnableButtons()
{
- // Solange die Eventbox leer ist, nichts tun
+ // don't do anything as long as the eventbox is empty
const SvLBoxEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected();
if ( pE )
{
- // Gebundenes Macro holen
+ // get bound macro
const SvxMacro* pM = aTbl.Get( (sal_uInt16)(sal_uLong) pE->GetUserData() );
mpImpl->pDeletePB->Enable( 0 != pM && !mpImpl->bReadOnly );
@@ -186,7 +186,7 @@ void _SfxMacroTabPage::AddEvent( const String & rEventName, sal_uInt16 nEventId
String sTmp( rEventName );
sTmp += '\t';
- // falls die Tabelle schon gueltig ist
+ // if the table is valid already
SvxMacro* pM = aTbl.Get( nEventId );
if( pM )
{
@@ -200,7 +200,7 @@ void _SfxMacroTabPage::AddEvent( const String & rEventName, sal_uInt16 nEventId
void _SfxMacroTabPage::ScriptChanged()
{
- // neue Bereiche und deren Funktionen besorgen
+ // get new areas and their functions
{
mpImpl->pGroupLB->Show();
mpImpl->pMacroLB->Show();
@@ -327,7 +327,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
- // aus der Tabelle entfernen
+ // remove from the table
sal_uInt16 nEvent = (sal_uInt16)(sal_uLong)pE->GetUserData();
pThis->aTbl.Erase( nEvent );
@@ -380,7 +380,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG )
void _SfxMacroTabPage::InitAndSetHandler()
{
- // Handler installieren
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
Link aLnk(STATIC_LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
@@ -430,7 +429,7 @@ void _SfxMacroTabPage::FillEvents()
sal_uLong nEntryCnt = rListBox.GetEntryCount();
- // Events aus der Tabelle holen und die EventListBox entsprechen fuellen
+ // get events from the table and fill the EventListBox respectively
for( sal_uLong n = 0 ; n < nEntryCnt ; ++n )
{
SvLBoxEntry* pE = rListBox.GetEntry( n );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 8f07d64..717b23e 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -70,12 +70,12 @@ static sal_uInt16 pRanges[] =
};
/*************************************************************************
-#* Methode: SvxNumberPreviewImpl
+#* Method: SvxNumberPreviewImpl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberPreview
-#* Funktion: Konstruktor der Klasse SvxNumberPreviewImpl
-#* Input: Fenster, Resource-ID
+#* Class: SvxNumberPreview
+#* Function: Constructor of the class SvxNumberPreviewImpl
+#* Input: Window, Resource-ID
#* Output: ---
#*
#************************************************************************/
@@ -94,11 +94,11 @@ SvxNumberPreviewImpl::SvxNumberPreviewImpl( Window* pParent, const ResId& rResId
}
/*************************************************************************
-#* Methode: SvxNumberPreviewImpl
+#* Method: SvxNumberPreviewImpl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberPreview
-#* Funktion: Destruktor der Klasse SvxNumberPreviewImpl
+#* Class: SvxNumberPreview
+#* Function: Destructor of the class SvxNumberPreviewImpl
#* Input: ---
#* Output: ---
#*
@@ -109,12 +109,12 @@ SvxNumberPreviewImpl::~SvxNumberPreviewImpl()
}
/*************************************************************************
-#* Methode: NotifyChange
+#* Method: NotifyChange
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberPreviewImpl
-#* Funktion: Funktion fuer das Aendern des Preview- Strings
-#* Input: String, Farbe
+#* Class: SvxNumberPreviewImpl
+#* Function: Function for changing the preview string
+#* Input: String, color
#* Output: ---
#*
#************************************************************************/
@@ -131,11 +131,11 @@ void SvxNumberPreviewImpl::NotifyChange( const String& rPrevStr,
}
/*************************************************************************
-#* Methode: Paint
+#* Method: Paint
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberPreviewImpl
-#* Funktion: Funktion fuer das neu zeichnen des Fensters.
+#* Class: SvxNumberPreviewImpl
+#* Function: Function for repainting the window.
#* Input: ---
#* Output: ---
#*
@@ -251,7 +251,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window* pParent,
pLastActivWindow( NULL )
{
Init_Impl();
- SetExchangeSupport(); // diese Page braucht ExchangeSupport
+ SetExchangeSupport(); // this page needs ExchangeSupport
FreeResource();
nFixedCategory=-1;
}
@@ -284,15 +284,14 @@ void SvxNumberFormatTabPage::Init_Impl()
aIbRemove.Enable(sal_False );
aIbInfo.Enable(sal_False );
- aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert
- //holen
+ aEdComment.SetText(aLbCategory.GetEntry(1)); // string for user defined
+
aEdComment.Hide();
aCbSourceFormat.Check( sal_False );
aCbSourceFormat.Disable();
aCbSourceFormat.Hide();
-// Handler verbinden
Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
aLbCategory .SetSelectHdl( aLink );
@@ -319,7 +318,7 @@ void SvxNumberFormatTabPage::Init_Impl()
aResetWinTimer .SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl));
aResetWinTimer .SetTimeout( 10);
- // Sprachen-ListBox initialisieren
+ // initialize language ListBox
aLbLanguage.InsertLanguage( LANGUAGE_SYSTEM );
// Don't list ambiguous locales where we won't be able to convert the
@@ -342,13 +341,13 @@ void SvxNumberFormatTabPage::Init_Impl()
}
/*************************************************************************
-#* Methode: GetRanges
+#* Method: GetRanges
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Liefert Bereichsangaben zurueck.
+#* Class: SvxNumberFormatTabPage
+#* Function: Returns area information.
#* Input: ---
-#* Output: Bereich
+#* Output: area
#*
#************************************************************************/
@@ -359,13 +358,13 @@ sal_uInt16* SvxNumberFormatTabPage::GetRanges()
/*************************************************************************
-#* Methode: Create
+#* Method: Create
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Erzeugt eine neue Zahlenformat- Seite.
-#* Input: Fenster, SfxItemSet
-#* Output: neue TabPage
+#* Class: SvxNumberFormatTabPage
+#* Function: Creates a new number format page.
+#* Input: Window, SfxItemSet
+#* Output: new TabPage
#*
#************************************************************************/
@@ -377,12 +376,12 @@ SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent,
/*************************************************************************
-#* Methode: Reset
+#* Method: Reset
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Die Attribute des Dialogs werden mit Hilfe
-#* des Itemsets neu eingestellt.
+#* Class: SvxNumberFormatTabPage
+#* Function: The dialog's attributes are reset
+#* using the Itemset.
#* Input: SfxItemSet
#* Output: ---
#*
@@ -476,10 +475,9 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
aCbSourceFormat.Show( bInit );
}
- // pNumItem muss von aussen gesetzt worden sein!
+ // pNumItem must have been set from outside!
DBG_ASSERT( pNumItem, "No NumberInfo, no NumberFormatter, good bye.CRASH. :-(" );
- // aktuellen Zahlenformat-Tabellenindex holen
eState = rSet.GetItemState( GetWhich( SID_ATTR_NUMBERFORMAT_VALUE ) );
if ( SFX_ITEM_DONTCARE != eState )
@@ -503,13 +501,11 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
break;
}
- // nun sind alle Informationen fuer die Formatierer-Shell beisammen:
-
if ( pNumFmtShell )
- delete pNumFmtShell; // ggF. alte Shell loeschen (==Reset)
+ delete pNumFmtShell; // delete old shell if applicable (== reset)
- nInitFormat = ( pValFmtAttr ) // Init-Key merken
- ? pValFmtAttr->GetValue() // (fuer FillItemSet())
+ nInitFormat = ( pValFmtAttr ) // memorize init key
+ ? pValFmtAttr->GetValue() // (for FillItemSet())
: ULONG_MAX; // == DONT_KNOW
@@ -576,7 +572,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
}
else // DONT_KNOW
{
- // Kategoriewechsel und direkte Eingabe sind moeglich, sonst nix:
+ // everything disabled except direct input or changing the category
Obstructing();
}
@@ -590,12 +586,12 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet )
}
/*************************************************************************
-#* Methode: Obstructing
+#* Method: Obstructing
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Sperren der Controls mit Ausnahme von Kategoriewechsel
-#* und direkter Eingabe.
+#* Class: SvxNumberFormatTabPage
+#* Function: Disable the controls except from changing the category
+#* and direct input.
#* Input: ---
#* Output: ---
#*
@@ -627,8 +623,7 @@ void SvxNumberFormatTabPage::Obstructing()
aLbCategory .SelectEntryPos( 0 );
aEdFormat .SetText( String() );
aFtComment .SetText( String() );
- aEdComment .SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert
- //holen
+ aEdComment .SetText(aLbCategory.GetEntry(1)); // string for user defined
aEdFormat .GrabFocus();
}
@@ -669,11 +664,11 @@ void SvxNumberFormatTabPage::EnableBySourceFormat_Impl()
/*************************************************************************
-#* Methode: HideLanguage
+#* Method: HideLanguage
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Versteckt die Spracheinstellung:
+#* Class: SvxNumberFormatTabPage
+#* Function: Hides the language settings:
#* Input: sal_Bool nFlag
#* Output: ---
#*
@@ -699,13 +694,13 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag)
}
/*************************************************************************
-#* Methode: FillItemSet
+#* Method: FillItemSet
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Stellt die Attribute im ItemSet ein,
-#* sowie in der DocShell den numItem, wenn
-#* bNumItemFlag nicht gesetzt ist.
+#* Class: SvxNumberFormatTabPage
+#* Function: Adjusts the attributes in the ItemSet,
+#* and - if bNumItemFlag is not set - the
+#* numItem in the DocShell.
#* Input: SfxItemSet
#* Output: ---
#*
@@ -906,13 +901,13 @@ void SvxNumberFormatTabPage::DeleteEntryList_Impl( std::vector<String*>&
rEntrie
/*************************************************************************
-#* Methode: UpdateOptions_Impl
+#* Method: UpdateOptions_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Stellt je nach eingestelltem Format die Options-
-#* attribute neu ein.
-#* Input: Flag, ob sich die Kategorie geaendert hat.
+#* Class: SvxNumberFormatTabPage
+#* Function: Adjusts the options attributes
+#* depending on the selected format.
+#* Input: Flag, whether the category has changed.
#* Output: ---
#*
#************************************************************************/
@@ -1018,22 +1013,22 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange
/*= sa
/*************************************************************************
-#* Methode: UpdateFormatListBox_Impl
+#* Method: UpdateFormatListBox_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Aktualisiert die Format- Listbox und zusaetzlich
-#* wird abhaengig vom bUpdateEdit- Flag der String
-#* in der Editbox geaendert.
-#* Input: Flags fuer Kategorie und Editbox
+#* Class: SvxNumberFormatTabPage
+#* Function: Updates the format lisbox and additionally the
+#* string in the editbox is changed depending on
+#* the bUpdateEdit flag.
+#* Input: Flags for category and editbox.
#* Output: ---
#*
#************************************************************************/
void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
(
- sal_uInt16 bCat, // Category oder Land/Sprache ListBox?
- sal_Bool bUpdateEdit // Format-Edit aktualisieren?
+ sal_uInt16 bCat, // Category or country/language ListBox?
+ sal_Bool bUpdateEdit
)
{
std::vector<String*> aEntryList;
@@ -1076,7 +1071,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
pNumFmtShell->LanguageChanged( aLbLanguage.GetSelectLanguage(),
nFmtLbSelPos,aEntryList );
- REMOVE_DONTKNOW() // ggF. UI-Enable
+ REMOVE_DONTKNOW() // possibly UI-Enable
if ( (!aEntryList.empty()) && (nFmtLbSelPos != SELPOS_NONE) )
@@ -1141,11 +1136,10 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl
#* Handle: DoubleClickHdl_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Bei einem Doppelklick in die Format- Listbox
-#* wird der Wert uebernommen und der OK-Button
-#* ausgeloest
-#* Input: Pointer auf Listbox
+#* Class: SvxNumberFormatTabPage
+#* Function: On a double click in the format lisbox the
+#* value is adopted and the OK button pushed.
+#* Input: Pointer on the Listbox
#* Output: ---
#*
#************************************************************************/
@@ -1157,7 +1151,7 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*, pLb )
SelFormatHdl_Impl( pLb );
if ( fnOkHdl.IsSet() )
- { // Uebergangsloesung, sollte von SfxTabPage angeboten werden
+ { // temporary solution, should be offered by SfxTabPage
fnOkHdl.Call( NULL );
}
else
@@ -1173,14 +1167,13 @@ IMPL_LINK( SvxNumberFormatTabPage, DoubleClickHdl_Impl, SvxFontListBox*,
pLb )
/*************************************************************************
-#* Methode: SelFormatHdl_Impl
+#* Method: SelFormatHdl_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Wird aufgerufen, wenn sich die Sprache, die Kategorie
-#* oder das Format aendert. Dem entsprechend werden die
-#* Einstellungen geaendert.
-#* Input: Pointer auf Listbox
+#* Class: SvxNumberFormatTabPage
+#* Function: Is called when the language, the category or the format
+#* is changed. Accordingly the settings are adjusted.
+#* Input: Pointer on the Listbox
#* Output: ---
#*
#************************************************************************/
@@ -1251,7 +1244,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
ChangePreviewText( nSelPos );
}
- REMOVE_DONTKNOW() // ggF. UI-Enable
+ REMOVE_DONTKNOW() // possibly UI-Enable
if ( pNumFmtShell->FindEntry( aFormat) )
{
@@ -1275,7 +1268,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
}
//--------------------------------------------------------------------
- // Kategorie-ListBox -------------------------------------------------
+ // category-ListBox -------------------------------------------------
if ( pLb == &aLbCategory || pLb == &aLbCurrency)
{
UpdateFormatListBox_Impl( sal_True, sal_True );
@@ -1286,7 +1279,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
}
//--------------------------------------------------------------------
- // Sprache/Land-ListBox ----------------------------------------------
+ // language/country-ListBox ----------------------------------------------
if ( pLb == &aLbLanguage )
{
UpdateFormatListBox_Impl( sal_False, sal_True );
@@ -1299,13 +1292,12 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
/*************************************************************************
-#* Methode: ClickHdl_Impl, ImageButton* pIB
+#* Method: ClickHdl_Impl, ImageButton* pIB
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Wenn, der Hinzufuegen- oder Entfernen- Button
-#* wird diese Funktion aufgerufen und die Zahlenformat-
-#* Liste den entsprechend geaendert.
+#* Class: SvxNumberFormatTabPage
+#* Function: Called when the add or delete button is pushed,
+#* adjusts the number format list.
#* Input: Toolbox- Button
#* Output: ---
#*
@@ -1372,7 +1364,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
{
if ( bAdded && (nFmtLbSelPos != SELPOS_NONE) )
{
- // Alles klar
+ // everything alright
if(bOneAreaFlag) //@@ ???
SetCategory(0);
else
@@ -1392,13 +1384,13 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
aLbFormat.SelectEntryPos( (sal_uInt16)nFmtLbSelPos );
aEdFormat.SetText( aFormat );
- aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert
- //holen
+ aEdComment.SetText(aLbCategory.GetEntry(1)); // String for user defined
+
ChangePreviewText( (sal_uInt16)nFmtLbSelPos );
}
}
}
- else // Syntaxfehler
+ else // syntax error
{
aEdFormat.GrabFocus();
aEdFormat.SetSelection( Selection( (short)nErrPos, SELECTION_MAX ) );
@@ -1444,7 +1436,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
}
else
{
- // auf "Alle/Standard" setzen
+ // set to "all/standard"
SetCategory(0 );
SelFormatHdl_Impl( &aLbCategory );
}
@@ -1475,13 +1467,13 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
/*************************************************************************
-#* Methode: EditHdl_Impl
+#* Method: EditHdl_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Wenn der Eintrag im Eingabefeld geaendert wird,
-#* so wird die Vorschau aktualisiert und
-#* Input: Pointer auf Editbox
+#* Class: SvxNumberFormatTabPage
+#* Function: When the entry in the edit field is changed
+#* the preview is updated and
+#* Input: Pointer on Editbox
#* Output: ---
#*
#************************************************************************/
@@ -1545,11 +1537,11 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
/*************************************************************************
-#* Methode: NotifyChange
+#* Method: NotifyChange
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#* Class: SvxNumberFormatTabPage
+#* Function: Does changes in the number attributes.
#* Input: Options- Controls
#* Output: ---
#*
@@ -1608,11 +1600,11 @@ IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl)
/*************************************************************************
-#* Methode: LostFocusHdl_Impl
+#* Method: LostFocusHdl_Impl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#* Class: SvxNumberFormatTabPage
+#* Function: Does changes in the number attributes.
#* Input: Options- Controls
#* Output: ---
#*
@@ -1631,19 +1623,18 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd)
sal_uInt16 nSelPos = (sal_uInt16) aLbFormat.GetSelectEntryPos();
pNumFmtShell->SetComment4Entry(nSelPos,
aEdComment.GetText());
- aEdComment.SetText(aLbCategory.GetEntry(1)); //String fuer Benutzerdefiniert
- //holen
+ aEdComment.SetText(aLbCategory.GetEntry(1)); // String for user defined
}
}
return 0;
}
/*************************************************************************
-#* Methode: NotifyChange
+#* Method: NotifyChange
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Fuehrt Aenderungen in den Zahlen- Attributen durch.
+#* Class: SvxNumberFormatTabPage
+#* Function: Does changes in the number attributes.
#* Input: Options- Controls
#* Output: ---
#*
@@ -1713,12 +1704,12 @@ long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
return SfxTabPage::PreNotify( rNEvt );
}
/*************************************************************************
-#* Methode: SetOkHdl
+#* Method: SetOkHdl
#*------------------------------------------------------------------------
#*
-#* Klasse: SvxNumberFormatTabPage
-#* Funktion: Setzt den OkHandler neu.
-#* Input: Neuer OkHandler
+#* Class: SvxNumberFormatTabPage
+#* Function: Resets the OkHandler.
+#* Input: new OkHandler
#* Output: ---
#*
#************************************************************************/
diff --git a/cui/source/tabpages/numfmt.hrc b/cui/source/tabpages/numfmt.hrc
index 6b72d48..763dd59 100644
--- a/cui/source/tabpages/numfmt.hrc
+++ b/cui/source/tabpages/numfmt.hrc
@@ -30,7 +30,7 @@
// defines ------------------------------------------------------------------
//================================================
-// Zahlen-TabPage:
+// number TabPage:
#define WND_NUMBER_PREVIEW 2
#define FT_CATEGORY 3
#define FT_FORMAT 4
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index bf9b1f2..549f724 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -144,7 +144,7 @@ SvxNumSettings_ImplPtr lcl_CreateNumSettingsPtr(const Sequence<PropertyValue>& r
return pNew;
}
-// Die Auswahl an Bullets aus den StarSymbol
+// the selection of bullets from the StarSymbol
static const sal_Unicode aBulletTypes[] =
{
0x2022,
@@ -167,7 +167,7 @@ static sal_Char const aNumChar[] =
' '
};
-// Ist eins der maskierten Formate gesetzt?
+// Is one of the masked formats set?
sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
{
sal_Bool bRet = sal_False;
@@ -302,7 +302,7 @@ void SvxSingleNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
*pActNum = *pSaveNum;
pExamplesVS->SetNoSelection();
}
- // ersten Eintrag vorselektieren
+
if(pActNum && (!lcl_IsNumFmtSet(pActNum, nActNumLvl) || bIsPreset))
{
pExamplesVS->SelectItem(1);
@@ -325,7 +325,7 @@ void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -466,7 +466,7 @@ void SvxBulletPickTabPage::ActivatePage(const SfxItemSet& rSet)
*pActNum = *pSaveNum;
pExamplesVS->SetNoSelection();
}
- // ersten Eintrag vorselektieren
+
if(pActNum && (!lcl_IsNumFmtSet(pActNum, nActNumLvl) || bIsPreset))
{
pExamplesVS->SelectItem(1);
@@ -487,7 +487,7 @@ int SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -669,7 +669,7 @@ void SvxNumPickTabPage::ActivatePage(const SfxItemSet& rSet)
*pActNum = *pSaveNum;
pExamplesVS->SetNoSelection();
}
- // ersten Eintrag vorselektieren
+
if(pActNum && (!lcl_IsNumFmtSet(pActNum, nActNumLvl) || bIsPreset))
{
pExamplesVS->SelectItem(1);
@@ -690,7 +690,7 @@ int SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
void SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -715,7 +715,7 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
}
-// Hier werden alle Ebenen veraendert
+// all levels are changed here
IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
{
if(pActNum)
@@ -842,7 +842,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBitmapPickTabPage, DoubleClickHdl_Impl));
aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl));
- // Grafiknamen ermitteln
+ // determine graphic name
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP );
@@ -907,7 +907,7 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
*pActNum = *pSaveNum;
pExamplesVS->SetNoSelection();
}
- // ersten Eintrag vorselektieren
+
if(!aGrfNames.empty() &&
(pActNum && (!lcl_IsNumFmtSet(pActNum, nActNumLvl) || bIsPreset)))
{
@@ -945,7 +945,7 @@ sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
void SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -1039,7 +1039,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, LinkBmpHdl_Impl)
return 0;
}
-// Tabpage Numerierungsoptionen
+// tabpage numeration options
#define NUM_NO_GRAPHIC 1000
SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
const SfxItemSet& rSet) :
@@ -1277,7 +1277,7 @@ sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -1295,7 +1295,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
- // Ebenen einfuegen
+ // insert levels
if(!aLevelLB.GetEntryCount())
{
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
@@ -1336,7 +1336,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
pPreviewWIN->SetNumRule(pActNum);
aSameLevelCB.Check(pActNum->IsContinuousNumbering());
- //ColorListBox bei Bedarf fuellen
+ // fill ColorListBox as needed
if ( pActNum->IsFeatureSupported( NUM_BULLET_COLOR ) )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
@@ -1382,7 +1382,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
aSameLevelFL.Show(bContinuous);
aSameLevelCB.Show(bContinuous);
- //wieder Missbrauch: im Draw gibt es die Numerierung nur bis zum Bitmap
+ // again misusage: in Draw there is numeration only until the bitmap
// without SVX_NUM_NUMBER_NONE
//remove types that are unsupported by Draw/Impress
if(!bContinuous)
@@ -1421,8 +1421,8 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
aAlignLB.SetSelectHdl(LINK(this, SvxNumOptionsTabPage, EditModifyHdl_Impl));
}
- //MegaHack: Aufgrund eines nicht fixbaren 'designfehlers' im Impress
- //Alle arten der numerischen Aufzaehlungen loeschen
+ // MegaHack: because of a not-fixable 'design mistake/error' in Impress
+ // delete all kinds of numeric enumerations
if(pActNum->IsFeatureSupported(NUM_NO_NUMBERS))
{
sal_uInt16 nFmtCount = aFmtLB.GetEntryCount();
@@ -1514,7 +1514,7 @@ void SvxNumOptionsTabPage::InitControls()
else
aOrientLB.SelectEntryPos(
sal::static_int_cast< sal_uInt16 >(eFirstOrient - 1));
- // kein text::VertOrientation::NONE
+ // no text::VertOrientation::NONE
if(bSameSize)
{
@@ -1548,7 +1548,7 @@ void SvxNumOptionsTabPage::InitControls()
}
if(bSameAdjust)
{
- sal_uInt16 nPos = 1; // zentriert
+ sal_uInt16 nPos = 1; // centered
if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
@@ -1613,7 +1613,7 @@ void SvxNumOptionsTabPage::InitControls()
pPreviewWIN->Invalidate();
}
-// 0 - Nummer; 1 - Bullet; 2 - Bitmap
+// 0 - Number; 1 - Bullet; 2 - Bitmap
void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool )
{
if(nBullet == nType)
@@ -1624,13 +1624,13 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool )
sal_Bool bEnableBitmap = sal_False;
if(nType == SHOW_NUMBERING)
{
- // Label umschalten, alten Text merken
+ // switch label, memorize old text
aStartFT.SetText(sStartWith);
}
else if(nType == SHOW_BULLET)
{
- // Label umschalten, alten Text merken
+ // switch label, memorize old text
aStartFT.SetText(sBullet);
bBullet = sal_True;
}
@@ -1649,8 +1649,8 @@ void SvxNumOptionsTabPage::SwitchNumberType( sal_uInt8 nType, sal_Bool )
aCharFmtFT.Show(!bBitmap && bCharFmt);
aCharFmtLB.Show(!bBitmap && bCharFmt);
- // das ist eigentlich Missbrauch, da fuer die vollst. Numerierung kein
- // eigenes Flag existiert
+ // this is rather misusage, as there is no own flag
+ // for complete numeration
sal_Bool bAllLevelFeature = pActNum->IsFeatureSupported(NUM_CONTINUOUS);
sal_Bool bAllLevel = bNumeric && bAllLevelFeature && !bHTMLMode;
aAllLevelFT.Show(bAllLevel);
@@ -1769,7 +1769,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- // PAGEDESC gibt es nicht
+ // PAGEDESC does not exist
sal_uInt16 nNumType =
(sal_uInt16)(sal_uLong)pBox->GetEntryData(pBox->GetSelectEntryPos());
aNumFmt.SetNumberingType((sal_Int16)nNumType);
sal_uInt16 nNumberingType = aNumFmt.GetNumberingType();
@@ -1796,7 +1796,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
aNumFmt.SetBulletChar( SVX_DEF_BULLET );
pActNum->SetLevel(i, aNumFmt);
SwitchNumberType(SHOW_BULLET);
- // Zuweisung der Zeichenvorlage automatisch
+ // allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
sSelectStyle = sBulletCharFmtName;
@@ -1810,7 +1810,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
pActNum->SetLevel(i, aNumFmt);
CheckForStartValue_Impl(nNumberingType);
- // Zuweisung der Zeichenvorlage automatisch
+ // allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
sSelectStyle = sNumCharFmtName;
@@ -1854,7 +1854,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox *, pBox )
{
sal_uInt16 nPos = pBox->GetSelectEntryPos();
- nPos ++; // kein VERT_NONE
+ nPos ++; // no VERT_NONE
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
@@ -1963,7 +1963,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
aGrfDlg.AsLink( sal_False );
if ( !aGrfDlg.Execute() )
{
- // ausgewaehlten Filter merken
+ // memorize selected filter
aGrfName = aGrfDlg.GetPath();
Graphic aGraphic;
@@ -1987,7 +1987,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
aNumFmt.SetCharFmtName(sNumCharFmtName);
aNumFmt.SetGraphic(aGrfName);
- // Size schon mal fuer spaeteren Groessenabgleich setzen
+ // set size for a later comparison
const SvxBrushItem* pBrushItem = aNumFmt.GetBrush();
// initiate asynchronous loading
sal_Int16 eOrient = aNumFmt.GetVertOrient();
@@ -2107,7 +2107,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)
pMap->SetChar( cBullet );
if(pMap->Execute() == RET_OK)
{
- // Font Numrules umstellen
+ // change Font Numrules
aActBulletFont = pMap->GetCharFont();
sal_uInt16 _nMask = 1;
@@ -2301,14 +2301,14 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
{
Font aTmpFont(pVDev->GetFont());
- //per Uno kann es sein, dass kein Font gesetzt ist!
+ // via Uno it's possible that no font has been set!
Font aFont(rFmt.GetBulletFont() ? *rFmt.GetBulletFont() : aTmpFont);
Size aTmpSize(rSize);
aTmpSize.Width() *= rFmt.GetBulletRelSize();
aTmpSize.Width() /= 100 ;
aTmpSize.Height() *= rFmt.GetBulletRelSize();
aTmpSize.Height() /= 100 ;
- // bei einer Hoehe von Null wird in Ursprungshoehe gezeichnet
+ // in case of a height of zero it is drawed in original height
if(!aTmpSize.Height())
aTmpSize.Height() = 1;
aFont.SetSize(aTmpSize);
@@ -2330,7 +2330,7 @@ sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
return nRet;
}
-// Vorschau der Numerierung painten
+// paint preview of numeration
void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
{
Size aSize(PixelToLogic(GetOutputSizePixel()));
@@ -2364,14 +2364,14 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nWidthRelation = nWidthRelation / 4;
}
else
- nWidthRelation = 30; // Kapiteldialog
+ nWidthRelation = 30; // chapter dialog
- //Hoehe pro Ebene
+ // height per level
sal_uInt16 nXStep = sal::static_int_cast< sal_uInt16 >(aSize.Width() / (3 *
pActNum->GetLevelCount()));
if(pActNum->GetLevelCount() < 10)
nXStep /= 2;
sal_uInt16 nYStart = 4;
- // fuer ein einziges Level darf nicht die gesamte Hoehe benutzt werden
+ // the whole height mustn't be used for a single level
sal_uInt16 nYStep = sal::static_int_cast< sal_uInt16 >((aSize.Height() - 6)/
(pActNum->GetLevelCount() > 1 ? pActNum->GetLevelCount() : 5));
aStdFont = OutputDevice::GetDefaultFont(
DEFAULTFONT_UI_SANS, MsLangId::getSystemLanguage(), DEFAULTFONT_FLAGS_ONLYONE);
@@ -2416,7 +2416,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
nNumberXPos = nNumberXPos - nFirstLineOffset;
else
nNumberXPos = 0;
- //im draw ist das zulaeesig
+ // in draw this is valid
if(nTextOffset < 0)
nNumberXPos = nNumberXPos + nTextOffset;
}
@@ -2883,7 +2883,7 @@ void SvxNumPositionTabPage::InitControls()
if(bSameAdjust)
{
- sal_uInt16 nPos = 1; // zentriert
+ sal_uInt16 nPos = 1; // centered
if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
nPos = 0;
else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
@@ -3030,7 +3030,7 @@ sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pItem;
- //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+ // in Draw the item exists as WhichId, in Writer only as SlotId
SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, sal_False, &pItem);
if(eState != SFX_ITEM_SET)
{
@@ -3048,7 +3048,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
delete pSaveNum;
pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
- // Ebenen einfuegen
+ // insert levels
if(!aLevelLB.GetEntryCount())
{
for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
@@ -3291,7 +3291,7 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
}
else if(pFld == &aIndentMF)
{
- //jetzt muss mit dem FirstLineOffset auch der AbsLSpace veraendert werden
+ // together with the FirstLineOffset the AbsLSpace must be changed, too
long nDiff = nValue + aNumFmt.GetFirstLineOffset();
long nAbsLSpace = aNumFmt.GetAbsLSpace();
aNumFmt.SetAbsLSpace(sal_uInt16(nAbsLSpace + nDiff));
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index a0b5cc8..333973c 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -72,8 +72,8 @@
// static ----------------------------------------------------------------
-static const long MINBODY = 284; // 0,5cm in twips aufgerundet
-//static const long PRINT_OFFSET = 17; // 0,03cm in twips abgerundet
+static const long MINBODY = 284; // 0,5 cm rounded up in twips
+//static const long PRINT_OFFSET = 17; // 0,03 cm rounded down in twips
static const long PRINT_OFFSET = 0; // why was this ever set to 17 ? it led to wrong right and
bottom margins.
static sal_uInt16 pRanges[] =
@@ -87,7 +87,7 @@ static sal_uInt16 pRanges[] =
0
};
-// ------- Mapping Seitenlayout ------------------------------------------
+// ------- Mapping page layout ------------------------------------------
sal_uInt16 aArr[] =
{
@@ -244,7 +244,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
FreeResource();
aBspWin.EnableRTL( sal_False );
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
SvtLanguageOptions aLangOptions;
@@ -304,13 +304,13 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
MapMode aOldMode = pImpl->mpDefPrinter->GetMapMode();
pImpl->mpDefPrinter->SetMapMode( MAP_TWIP );
- // First- und Last-Werte f"ur die R"ander setzen
+ // set first- and last-values for the margins
Size aPaperSize = pImpl->mpDefPrinter->GetPaperSize();
Size aPrintSize = pImpl->mpDefPrinter->GetOutputSize();
/*
- * einen Punkt ( 0,0 ) in logische Koordinaten zu konvertieren,
- * sieht aus wie Unsinn; ist aber sinnvoll, wenn der Ursprung des
- * Koordinatensystems verschoben ist.
+ * To convert a point ( 0,0 ) into logic coordinates
+ * looks like nonsense; but it makes sense when the
+ * coordinate system's origin has been moved.
*/
Point aPrintOffset = pImpl->mpDefPrinter->GetPageOffset() -
pImpl->mpDefPrinter->PixelToLogic( Point() );
@@ -378,7 +378,7 @@ void SvxPageDescPage::Init_Impl()
aLeftText = aLeftMarginLbl.GetText();
aRightText = aRightMarginLbl.GetText();
- // Handler einstellen
+ // adjust the handler
aLayoutBox.SetSelectHdl( LINK( this, SvxPageDescPage, LayoutHdl_Impl ) );
aPaperSizeBox.SetDropDownLineCount(10);
@@ -422,7 +422,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
DBG_ASSERT( pPool, "Wo ist der Pool" );
SfxMapUnit eUnit = pPool->GetMetric( GetWhich( SID_ATTR_LRSPACE ) );
- // R"ander (Links/Rechts) einstellen
+ // adjust margins (right/left)
const SfxPoolItem* pItem = GetItem( rSet, SID_ATTR_LRSPACE );
if ( pItem )
@@ -436,7 +436,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
(sal_uInt16)ConvertLong_Impl( (long)rLRSpace.GetRight(), eUnit ) );
}
- // R"ander (Oben/Unten) einstellen
+ // adjust margins (top/bottom)
pItem = GetItem( rSet, SID_ATTR_ULSPACE );
if ( pItem )
@@ -450,7 +450,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
(sal_uInt16)ConvertLong_Impl( (long)rULSpace.GetLower(), eUnit ) );
}
- // allgemeine Seitendaten
+ // general page data
SvxNumType eNumType = SVX_ARABIC;
bLandscape = ( pImpl->mpDefPrinter->GetOrientation() == ORIENTATION_LANDSCAPE );
sal_uInt16 nUse = (sal_uInt16)SVX_PAGE_ALL;
@@ -464,15 +464,14 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
bLandscape = rItem.IsLandscape();
}
- // Ausrichtung
+ // alignment
aLayoutBox.SelectEntryPos( ::PageUsageToPos_Impl( nUse ) );
aBspWin.SetUsage( nUse );
LayoutHdl_Impl( 0 );
- // Numerierungsart der Seitenvorlage einstellen
+ // adjust numeration type of the page style
aNumberFormatBox.SelectEntryPos( sal::static_int_cast< sal_uInt16 >(eNumType) );
- // Aktueller Papierschacht
aPaperTrayBox.Clear();
sal_uInt8 nPaperBin = PAPERBIN_PRINTER_SETTINGS;
pItem = GetItem( rSet, SID_ATTR_PAGE_PAPERBIN );
@@ -496,7 +495,6 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
aPaperTrayBox.SetEntryData( nEntryPos, (void*)(sal_uLong)nPaperBin );
aPaperTrayBox.SelectEntry( aBinName );
- // Size rausholen
Size aPaperSize = SvxPaperInfo::GetPaperSize( pImpl->mpDefPrinter );
pItem = GetItem( rSet, SID_ATTR_PAGE_SIZE );
@@ -529,7 +527,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
if ( bLandscape )
Swap( aPaperSize );
- // Werte in die Edits eintragen
+ // write values into the edits
SetMetricValue( aPaperHeightEdit, aPaperSize.Height(), SFX_MAPUNIT_100TH_MM );
SetMetricValue( aPaperWidthEdit, aPaperSize.Width(), SFX_MAPUNIT_100TH_MM );
aPaperSizeBox.Clear();
@@ -558,7 +556,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
// preselect current paper format - #115915#: ePaper might not be in aPaperSizeBox so use
PAPER_USER instead
aPaperSizeBox.SelectEntryPos( nActPos != LISTBOX_ENTRY_NOTFOUND ? nActPos : nUserPos );
- // Applikationsspezifisch
+ // application specific
switch ( eMode )
{
@@ -569,17 +567,17 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
aVertBox.Show();
DisableVerticalPageDir();
- // Horizontale Ausrichtung
+ // horizontal alignment
pItem = GetItem( rSet, SID_ATTR_PAGE_EXT1 );
aHorzBox.Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue()
: sal_False );
- // Vertikale Ausrichtung
+ // vertical alignment
pItem = GetItem( rSet, SID_ATTR_PAGE_EXT2 );
aVertBox.Check( pItem ? ( (const SfxBoolItem*)pItem )->GetValue()
: sal_False );
- // Beispiel-Fenster auf Tabelle setzen
+ // set example window on the table
aBspWin.SetTable( sal_True );
aBspWin.SetHorz( aHorzBox.IsChecked() );
aBspWin.SetVert( aVertBox.IsChecked() );
@@ -595,7 +593,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
aAdaptBox.Check( pItem ?
( (const SfxBoolItem*)pItem )->GetValue() : sal_False );
- //!!! hidden, weil von StarDraw nicht implementiert
+ //!!! hidden, because not implemented by StarDraw
aLayoutBox.Hide();
aPageText.Hide();
@@ -605,20 +603,17 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
}
- // im Beispiel Hintergrund und Umrandung anzeigen
+ // display background and border in the example
ResetBackground_Impl( rSet );
//! UpdateExample_Impl();
RangeHdl_Impl( 0 );
- // Header Footer anzeigen
InitHeadFoot_Impl( rSet );
- // R"ander auf Hoch/Quer updaten, dann Beispiel updaten
bBorderModified = sal_False;
SwapFirstValues_Impl( sal_False );
UpdateExample_Impl();
- // Alte Werte sichern
aLeftMarginEdit.SaveValue();
aRightMarginEdit.SaveValue();
aTopMarginEdit.SaveValue();
@@ -637,7 +632,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
CheckMarginEdits( true );
- // Registerhaltigkeit
+
if(SFX_ITEM_SET == rSet.GetItemState(SID_SWREGISTER_MODE))
{
aRegisterCB.Check(((const SfxBoolItem&)rSet.Get(
@@ -685,10 +680,10 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
SfxMapUnit eUnit = pPool->GetMetric( nWhich );
const SfxPoolItem* pOld = 0;
- // alten linken und rechten Rand kopieren
+ // copy old left and right margins
SvxLRSpaceItem aMargin( (const SvxLRSpaceItem&)rOldSet.Get( nWhich ) );
- // alten oberen und unteren Rand kopieren
+ // copy old top and bottom margins
nWhich = GetWhich( SID_ATTR_ULSPACE );
SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
@@ -704,7 +699,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
bModified |= sal_True;
}
- // Linken und rechten Rand setzen
+ // set left and right margins
if ( bModified )
{
pOld = GetOldItem( rSet, SID_ATTR_LRSPACE );
@@ -729,7 +724,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
bMod |= sal_True;
}
- // unteren oberen Rand setzen
+ // set top and bottom margins
//
if ( bMod )
{
@@ -742,7 +737,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
}
}
- // Druckerschacht
+ // paper tray
nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN );
sal_uInt16 nPos = aPaperTrayBox.GetSelectEntryPos();
sal_uInt16 nBin = (sal_uInt16)(sal_uLong)aPaperTrayBox.GetEntryData( nPos );
@@ -796,7 +791,6 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
}
}
- // sonstiges Zeug der Page
nWhich = GetWhich( SID_ATTR_PAGE );
SvxPageItem aPage( (const SvxPageItem&)rOldSet.Get( nWhich ) );
bMod = aLayoutBox.GetSelectEntryPos() != aLayoutBox.GetSavedValue();
@@ -811,7 +805,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
bMod |= sal_True;
}
- // Einstellen der Numerierungsart der Seite
+
nPos = aNumberFormatBox.GetSelectEntryPos();
if ( nPos != aNumberFormatBox.GetSavedValue() )
@@ -835,7 +829,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
else
rSet.Put( rOldSet.Get( nWhich ) );
- // Modispezifische Controls auswerten
+ // evaluate mode specific controls
switch ( eMode )
{
@@ -861,7 +855,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
case SVX_PAGE_MODE_PRESENTATION:
{
- // immer putten, damit Draw das auswerten kann
+ // always put so that draw can evaluate this
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PAGE_EXT1 ),
aAdaptBox.IsChecked() ) );
bModified |= sal_True;
@@ -903,7 +897,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
{
- // innen au\sen umschalten
+ // switch inside outside
const sal_uInt16 nPos = PosToPageUsage_Impl( aLayoutBox.GetSelectEntryPos() );
if ( nPos == SVX_PAGE_MIRROR )
@@ -931,10 +925,9 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
{
if ( aPaperTrayBox.GetEntryCount() > 1 )
- // schon gef"ullt
+ // already filled
return 0;
- // Schacht-Box initialisieren
String aOldName = aPaperTrayBox.GetSelectEntry();
aPaperTrayBox.SetUpdateMode( sal_False );
aPaperTrayBox.Clear();
@@ -987,7 +980,6 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
SetMetricValue( aPaperHeightEdit, aSize.Height(), SFX_MAPUNIT_100TH_MM );
SetMetricValue( aPaperWidthEdit, aSize.Width(), SFX_MAPUNIT_100TH_MM );
- // R"ander ggf. neu berechnen
CalcMargin_Impl();
RangeHdl_Impl( 0 );
@@ -995,15 +987,14 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
if ( eMode == SVX_PAGE_MODE_PRESENTATION )
{
- // Draw: bei Papierformat soll der Rand 1cm betragen
+ // Draw: if paper format the margin shall be 1 cm
long nTmp = 0;
sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
if ( !bScreen )
- // bei Bildschirm keinen Rand
- nTmp = 1; // entspr. 1cm
+ // no margin if screen
+ nTmp = 1; // accordingly 1 cm
- // Abfragen, ob fuer Raender 0 gesetzt ist:
if ( bScreen || aRightMarginEdit.GetValue() == 0 )
{
SetMetricValue( aRightMarginEdit, nTmp, SFX_MAPUNIT_CM );
@@ -1105,13 +1096,13 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
pImpl->mpDefPrinter->SetOrientation( eOri );
pImpl->mpDefPrinter->SetMapMode( MAP_TWIP );
- // First- und Last-Werte f"ur die R"ander setzen
+ // set first- and last-values for margins
Size aPaperSize = pImpl->mpDefPrinter->GetPaperSize();
Size aPrintSize = pImpl->mpDefPrinter->GetOutputSize();
/*
- * einen Punkt ( 0,0 ) in logische Koordinaten zu konvertieren,
- * sieht aus wie Unsinn; ist aber sinnvoll, wenn der Ursprung des
- * Koordinatensystems verschoben ist.
+ * To convert a point ( 0,0 ) into logic coordinates
+ * looks like nonsense; but it makes sense if the
+ * coordinate system's origin has been moved.
*/
Point aPrintOffset = pImpl->mpDefPrinter->GetPageOffset() -
pImpl->mpDefPrinter->PixelToLogic( Point() );
@@ -1146,7 +1137,6 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
if ( bSet )
{
- // ggf. auch die Werte umsetzen,
if ( nSetL < nNewL )
aLeftMarginEdit.SetValue( aLeftMarginEdit.Normalize( nNewL ),
FUNIT_TWIP );
@@ -1183,7 +1173,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
aBspWin.SetSize( aSize );
- // R"ander
+ // Margins
aBspWin.SetTop( GetCoreValue( aTopMarginEdit, SFX_MAPUNIT_TWIP ) );
aBspWin.SetBottom( GetCoreValue( aBottomMarginEdit, SFX_MAPUNIT_TWIP ) );
aBspWin.SetLeft( GetCoreValue( aLeftMarginEdit, SFX_MAPUNIT_TWIP ) );
@@ -1296,7 +1286,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
const SvxSetItem* pSetItem = 0;
- // Kopfzeilen-Attribute auswerten
+ // evaluate header attributes
if ( SFX_ITEM_SET ==
rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
@@ -1324,7 +1314,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
else
aBspWin.SetHeader( sal_False );
- // im Beispiel Hintergrund und Umrandung anzeigen
+ // show background and border in the example
sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
if ( rHeaderSet.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
@@ -1343,7 +1333,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
}
}
- // Fusszeilen-Attribute auswerten
+ // evaluate footer attributes
if ( SFX_ITEM_SET ==
rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
@@ -1371,7 +1361,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
else
aBspWin.SetFooter( sal_False );
- // im Beispiel Hintergrund und Umrandung anzeigen
+ // show background and border in the example
sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
if ( rFooterSet.GetItemState( nWhich ) >= SFX_ITEM_AVAILABLE )
@@ -1404,9 +1394,9 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
{
- // Abfrage, ob die Seitenr"ander ausserhalb des Druckbereichs liegen
- // Wenn nicht, dann den Anwender fragen, ob sie "ubernommen werden sollen.
- // Wenn nicht, dann auf der TabPage bleiben.
+ // Inquiry whether the page margins are beyond the printing area.
+ // If not, ask user whether they shall be taken.
+ // If not, stay on the TabPage.
sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
@@ -1439,13 +1429,13 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
{
FillItemSet( *_pSet );
- // ggf. hoch/quer putten
+ // put portray/landscape if applicable
sal_uInt16 nWh = GetWhich( SID_ATTR_PAGE_SIZE );
SfxMapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWh );
Size aSize( GetCoreValue( aPaperWidthEdit, eUnit ),
GetCoreValue( aPaperHeightEdit, eUnit ) );
- // putten, wenn aktuelle Gr"o/se unterschiedlich zum Wert in _pSet
+ // put, if current size is different to the value in _pSet
const SvxSizeItem* pSize = (const SvxSizeItem*)GetItem( *_pSet, SID_ATTR_PAGE_SIZE );
if ( aSize.Width() && ( !pSize || !IsEqualSize_Impl( pSize, aSize ) ) )
_pSet->Put( SvxSizeItem( nWh, aSize ) );
@@ -1458,25 +1448,23 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
{
- // Aktuelle Header-Breite/H"ohe aus dem Bsp
+ // example window
long nHHeight = aBspWin.GetHdHeight();
long nHDist = aBspWin.GetHdDist();
- // Aktuelle Footer-Breite/H"ohe aus dem Bsp
long nFHeight = aBspWin.GetFtHeight();
long nFDist = aBspWin.GetFtDist();
- // Aktuelle Header/Footer-R"ander aus dem Bsp
long nHFLeft = Max( aBspWin.GetHdLeft(), aBspWin.GetFtLeft() );
long nHFRight = Max( aBspWin.GetHdRight(), aBspWin.GetFtRight() );
- // Aktuelle Werte der Seitenr"ander
+ // current values for page margins
long nBT = static_cast<long>(aTopMarginEdit.Denormalize(aTopMarginEdit.GetValue(FUNIT_TWIP)));
long nBB =
static_cast<long>(aBottomMarginEdit.Denormalize(aBottomMarginEdit.GetValue(FUNIT_TWIP)));
long nBL =
static_cast<long>(aLeftMarginEdit.Denormalize(aLeftMarginEdit.GetValue(FUNIT_TWIP)));
long nBR =
static_cast<long>(aRightMarginEdit.Denormalize(aRightMarginEdit.GetValue(FUNIT_TWIP)));
- // Breite Umrandung der Seite berechnen
+ // calculate width of page border
const SfxItemSet* _pSet = &GetItemSet();
Size aBorder;
@@ -1493,8 +1481,8 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
long nH =
static_cast<long>(aPaperHeightEdit.Denormalize(aPaperHeightEdit.GetValue(FUNIT_TWIP)));
long nW =
static_cast<long>(aPaperWidthEdit.Denormalize(aPaperWidthEdit.GetValue(FUNIT_TWIP)));
- // Grenzen Papier
- // Maximum liegt bei 54cm
+ // limits paper
+ // maximum is 54 cm
//
long nMin = nHHeight + nHDist + nFDist + nFHeight + nBT + nBB +
MINBODY + aBorder.Height();
@@ -1503,7 +1491,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
nMin = MINBODY + nBL + nBR + aBorder.Width();
aPaperWidthEdit.SetMin(aPaperWidthEdit.Normalize(nMin), FUNIT_TWIP);
- // Falls sich die Papiergr"o\se ge"adert hat
+ // if the paper size has been changed
nH = static_cast<long>(aPaperHeightEdit.Denormalize(aPaperHeightEdit.GetValue(FUNIT_TWIP)));
nW = static_cast<long>(aPaperWidthEdit.Denormalize(aPaperWidthEdit.GetValue(FUNIT_TWIP)));
@@ -1533,7 +1521,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
void SvxPageDescPage::CalcMargin_Impl()
{
- // Aktuelle Werte der Seitenr"ander
+ // current values for page margins
long nBT = GetCoreValue( aTopMarginEdit, SFX_MAPUNIT_TWIP );
long nBB = GetCoreValue( aBottomMarginEdit, SFX_MAPUNIT_TWIP );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 24ebdeb..27483b9 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -93,9 +93,9 @@ static sal_uInt16 pExtRanges[] =
// define ----------------------------------------------------------------
-#define MAX_DURCH 5670 // 10 cm ist sinnvoll als maximaler Durchschuss
- // laut BP
-#define FIX_DIST_DEF 283 // Standard-Fix-Abstand 0,5cm
+#define MAX_DURCH 5670 // 10 cm makes sense as maximum interline lead
+ // according to BP
+#define FIX_DIST_DEF 283 // standard fix distance 0,5 cm
// enum ------------------------------------------------------------------
@@ -111,7 +111,7 @@ enum LineSpaceList
LLINESPACE_END
};
-// C-Funktion ------------------------------------------------------------
+// C-Function ------------------------------------------------------------
void SetLineSpace_Impl( SvxLineSpacingItem&, int, long lValue = 0 );
@@ -187,19 +187,18 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl)
sal_Int64 nR = aRightIndent.Denormalize( aRightIndent.GetValue( eUnit ) );
String aTmp = aFLineIndent.GetText();
- // Erstzeilen Einzug
if( aLeftIndent.GetMin() < 0 )
aFLineIndent.SetMin( -99999, FUNIT_MM );
else
aFLineIndent.SetMin( aFLineIndent.Normalize( -nL ), eUnit );
- // Check nur fuer konkrete Breite (Shell)
+ // Check only for concrete width (Shell)
sal_Int64 nTmp = nWidth - nL - nR - MM50;
aFLineIndent.SetMax( aFLineIndent.Normalize( nTmp ), eUnit );
if ( !aTmp.Len() )
aFLineIndent.SetEmptyFieldValue();
- // Maximum Links Rechts
+ // maximum left right
aTmp = aLeftIndent.GetText();
nTmp = nWidth - nR - MM50;
aLeftIndent.SetMax( aLeftIndent.Normalize( nTmp ), eUnit );
@@ -389,7 +388,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
if ( MAP_100TH_MM != eUnit )
{
- // negativer Erstzeileneinzug -> ggf. Null Default-Tabstop setzen
+ // negative first line indent -> set null default tabstob if applicable
sal_uInt16 _nWhich = GetWhich( SID_ATTR_TABSTOP );
const SfxItemSet& rInSet = GetItemSet();
@@ -434,7 +433,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
DBG_ASSERT( pPool, "Wo ist der Pool?" );
String aEmpty;
- // Metrik einstellen
+ // adjust metric
FieldUnit eFUnit = GetModuleFieldUnit( rSet );
bool bApplyCharUnit = GetApplyCharUnit( rSet );
@@ -605,11 +604,11 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
aRegisterCB.Hide();
aRegisterFL.Hide();
aAutoCB.Hide();
- if(!(nHtmlMode & HTMLMODE_SOME_STYLES)) // IE oder SW
+ if(!(nHtmlMode & HTMLMODE_SOME_STYLES)) // IE or SW
{
aRightLabel.Disable();
aRightIndent.Disable();
- aTopDist.Disable(); //HTML3.2 und NS 3.0
+ aTopDist.Disable(); //HTML3.2 and NS 3.0
aBottomDist.Disable();
aFLineIndent.Disable();
aFLineLabel.Disable();
@@ -688,13 +687,13 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
bNegativeIndents(sal_False)
{
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
aLineDistAtMetricBox.Hide();
FreeResource();
Init_Impl();
- aFLineIndent.SetMin(-9999); // wird default auf 0 gesetzt
+ aFLineIndent.SetMin(-9999); // is set to 0 on default
aExampleWin.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
@@ -736,31 +735,31 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl
switch( eInter )
{
- // Default einzeilig
+ // Default single line spacing
case SVX_INTER_LINE_SPACE_OFF:
aLineDist.SelectEntryPos( LLINESPACE_1 );
break;
- // Default einzeilig
+ // Default single line spacing
case SVX_INTER_LINE_SPACE_PROP:
if ( 100 == rAttr.GetPropLineSpace() )
{
aLineDist.SelectEntryPos( LLINESPACE_1 );
break;
}
- // 1.5zeilig
+ // 1.5 line spacing
if ( 150 == rAttr.GetPropLineSpace() )
{
aLineDist.SelectEntryPos( LLINESPACE_15 );
break;
}
- // 2zeilig
+ // double line spacing
if ( 200 == rAttr.GetPropLineSpace() )
{
aLineDist.SelectEntryPos( LLINESPACE_2 );
break;
}
- // eingestellter Prozentwert
+ // the set per cent value
aLineDistAtPercentBox.
SetValue( aLineDistAtPercentBox.Normalize(
rAttr.GetPropLineSpace() ) );
@@ -805,8 +804,8 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
break;
case LLINESPACE_DURCH:
- // Setzen eines sinnvollen Defaults?
- // MS Begrenzen min(10, aPageSize)
+ // setting a sensible default?
+ // limit MS min(10, aPageSize)
aLineDistAtPercentBox.Hide();
pActLineDistFld = &aLineDistAtMetricBox;
aLineDistAtMetricBox.SetMin(0);
@@ -854,11 +853,11 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
sal_Int64 nTemp = aLineDistAtMetricBox.GetValue();
aLineDistAtMetricBox.SetMin(aLineDistAtMetricBox.Normalize(nMinFixDist), FUNIT_TWIP);
- // wurde der Wert beim SetMin veraendert, dann ist es Zeit
- // fuer den default
+ // if the value has been changed at SetMin,
+ // it is time for the default
if ( aLineDistAtMetricBox.GetValue() != nTemp )
SetMetricValue( aLineDistAtMetricBox,
- FIX_DIST_DEF, SFX_MAPUNIT_TWIP ); // fix gibt's nur im Writer
+ FIX_DIST_DEF, SFX_MAPUNIT_TWIP ); // fix is only in Writer
aLineDistAtPercentBox.Hide();
pActLineDistFld->Show();
pActLineDistFld->Enable();
@@ -1237,7 +1236,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet& rSet )
{
const SvxAdjustItem& rAdj = (const SvxAdjustItem&)rSet.Get( _nWhich );
- switch ( rAdj.GetAdjust() /*!!! VB fragen rAdj.GetLastBlock()*/ )
+ switch ( rAdj.GetAdjust() /*!!! ask VB rAdj.GetLastBlock()*/ )
{
case SVX_ADJUST_LEFT: aLeft.Check(); break;
@@ -1382,7 +1381,6 @@ void SvxParaAlignTabPage::UpdateExample_Impl( sal_Bool bAll )
aExampleWin.Draw( bAll );
}
-// Erweiterungen fuer den Blocksatz einschalten
void SvxParaAlignTabPage::EnableJustifyExt()
{
aLastLineFT.Show();
@@ -1456,7 +1454,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
}
}
- // Seitenumbruch
+ // pagebreak
TriState eState = aApplyCollBtn.GetState();
bool bIsPageModel = false;
@@ -1490,7 +1488,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
_nWhich = GetWhich( SID_ATTR_PARA_PAGEBREAK );
if ( bIsPageModel )
- // wird PageModel eingeschaltet, dann immer PageBreak ausschalten
+ // if PageModel is turned on, always turn off PageBreak
rOutSet.Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
else
{
@@ -1546,7 +1544,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
}
- // Absatztrennung
+ // paragraph split
_nWhich = GetWhich( SID_ATTR_PARA_SPLIT );
eState = aKeepTogetherBox.GetState();
@@ -1562,7 +1560,7 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
}
}
- // Absaetze zusammenhalten
+ // keep paragraphs
_nWhich = GetWhich( SID_ATTR_PARA_KEEP );
eState = aKeepParaBox.GetState();
@@ -1570,12 +1568,12 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
{
pOld = GetOldItem( rOutSet, SID_ATTR_PARA_KEEP );
- // hat sich der Status geaendert, muss immer geputtet werden
+ // if the status has changed, putting is necessary
rOutSet.Put( SvxFmtKeepItem( eState == STATE_CHECK, _nWhich ) );
bModified = sal_True;
}
- // Witwen und Waisen
+ // widows and orphans
_nWhich = GetWhich( SID_ATTR_PARA_WIDOWS );
eState = aWidowBox.GetState();
@@ -1660,7 +1658,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
if ( bPageBreak )
{
- // zuerst PageModel behandeln
+ // first handle PageModel
_nWhich = GetWhich( SID_ATTR_PARA_MODEL );
sal_Bool bIsPageModel = sal_False;
eItemState = rSet.GetItemState( _nWhich );
@@ -1726,8 +1724,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
- // PageBreak nicht ueber CTRL-RETURN,
- // dann kann CheckBox frei gegeben werden
+ // PageBreak not via CTRL-RETURN,
+ // then CheckBox can be freed
aPageBreakBox.Enable();
aPageBreakBox.EnableTriState( sal_False );
aBreakTypeFT.Enable();
@@ -1821,7 +1819,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
{
aKeepTogetherBox.SetState( STATE_NOCHECK );
- // Witwen und Waisen
+ // widows and orphans
aWidowBox.Enable();
_nWhich = GetWhich( SID_ATTR_PARA_WIDOWS );
SfxItemState eTmpState = rSet.GetItemState( _nWhich );
@@ -1874,7 +1872,7 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet )
else
aKeepTogetherBox.Enable(sal_False);
- // damit alles richt enabled wird
+ // so that everything is enabled correctly
KeepTogetherHdl_Impl( 0 );
WidowHdl_Impl( 0 );
OrphanHdl_Impl( 0 );
@@ -1962,7 +1960,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const
SfxItemSe
aOrphanRowNo.SetAccessibleRelationLabeledBy(&aOrphanBox);
aWidowRowNo.SetAccessibleRelationLabeledBy(&aWidowBox);
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
aHyphenBox.SetClickHdl( LINK( this, SvxExtParagraphTabPage, HyphenClickHdl_Impl ) );
@@ -2096,7 +2094,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl)
if ( aOrphanBox.GetState() == STATE_NOCHECK )
aKeepTogetherBox.Enable();
- // kein break
+ // no break
case STATE_DONTKNOW:
aWidowRowNo.Enable(sal_False);
aWidowRowLabel.Enable(sal_False);
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b15a294..2eb6f25 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -697,7 +697,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
long nVertByPos =
static_cast<long>(m_aVertByMF.Denormalize(m_aVertByMF.GetValue(FUNIT_TWIP)));
- // Altes Rechteck mit CoreUnit
+ // old rectangle with CoreUnit
m_aRect = m_pSdrView->GetAllMarkedRect();
m_pSdrView->GetSdrPageView()->LogicToPagePos( m_aRect );
@@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl)
if ( m_pHMap )
{
- // Ausrichtung Horizontal
+ // horizontal alignment
sal_uInt16 nMapPos = GetMapPos(m_pHMap, m_aHoriToLB);
sal_uInt16 nAlign = GetAlignment(m_pHMap, nMapPos, m_aHoriLB, m_aHoriToLB);
sal_uInt16 nRel = GetRelation(m_pHMap, m_aHoriToLB);
@@ -1062,7 +1062,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl)
if ( m_pVMap )
{
- // Ausrichtung Vertikal
+ // vertical alignment
sal_uInt16 nMapPos = GetMapPos(m_pVMap, m_aVertLB);
sal_uInt16 nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB);
sal_uInt16 nRel = GetRelation(m_pVMap, m_aVertToLB);
@@ -1092,7 +1092,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl)
nWidth = aVal.nWidth;
nHeight = aVal.nHeight;
- // Mindestbreite auch fuer Vorlage
+ // minimum width also for style
m_aHeightMF.SetMin(m_aHeightMF.Normalize(aVal.nMinHeight), FUNIT_TWIP);
m_aWidthMF. SetMin(m_aWidthMF.Normalize(aVal.nMinWidth), FUNIT_TWIP);
@@ -1158,7 +1158,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
else
m_bAtVertPosModified = sal_True;
- if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder
Sonderbehandlung
+ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // again special
treatment
{
if(bHori)
{
@@ -1173,7 +1173,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB )
}
}
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // only if the hanlder has been called by a change of the controller
RangeModifyHdl(0);
return 0;
@@ -1204,7 +1204,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
m_aVertByFT.Enable( bEnable );
}
- if (pLB) // Nur wenn Handler durch Aenderung des Controllers gerufen wurde
+ if (pLB) // only if the hanlder has been called by a change of the controller
RangeModifyHdl( 0 );
short nRel = 0;
@@ -1226,15 +1226,15 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
else
m_bAtVertPosModified = sal_True;
- // Sonderbehandlung fuer HTML-Mode mit horz-vert-Abhaengigkeiten
+ // special treatment for HTML-Mode with horz-vert-dependencies
if(m_bHtmlMode && m_nHtmlMode & HTMLMODE_SOME_ABS_POS &&
TextContentAnchorType_AT_CHARACTER == GetAnchorType())
{
sal_Bool bSet = sal_False;
if(bHori)
{
- // rechts ist nur unterhalb erlaubt - von links nur oben
- // von links am Zeichen -> unterhalb
+ // on the right only below is allowed - from the left only at the top
+ // from the left at the character -> below
if((HoriOrientation::LEFT == nAlign || HoriOrientation::RIGHT == nAlign) &&
0 == m_aVertLB.GetSelectEntryPos())
{
@@ -1474,8 +1474,8 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
m_aHoriLB.Enable( bEnable );
m_aHoriFT.Enable( bEnable );
- // aktuelle Pos selektieren
- // Horizontal
+ // select current Pos
+ // horizontal
if ( nH == USHRT_MAX )
{
nH = m_nOldH;
@@ -1485,7 +1485,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
sal_uInt16 nMapPos = FillPosLB(m_pHMap, nH, nHRel, m_aHoriLB);
FillRelLB(m_pHMap, nMapPos, nH, nHRel, m_aHoriToLB, m_aHoriToFT);
- // Vertikal
+ // vertical
if ( nV == USHRT_MAX )
{
nV = m_nOldV;
@@ -1497,7 +1497,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
// Edits init
bEnable = nH == HoriOrientation::NONE &&
- nAnchor != TextContentAnchorType_AS_CHARACTER;//#61359# warum nicht in Formaten&&
!bFormat;
+ nAnchor != TextContentAnchorType_AS_CHARACTER;//#61359# why not in formats&& !bFormat;
if (!bEnable)
{
m_aHoriByMF.SetValue( 0, FUNIT_TWIP );
@@ -1678,7 +1678,7 @@ sal_uLong SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos,
sal_u
rLB.SelectEntry(sSelEntry);
else
{
- // Warscheinlich Ankerwechsel. Daher aehnliche Relation suchen
+ // Probably anchor change. So look for a similar relation.
switch (nRel)
{
case RelOrientation::FRAME: nRel = RelOrientation::PAGE_FRAME;
break;
@@ -1739,11 +1739,11 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
? 0L
: ::lcl_GetLBRelationsForRelations( _nRel );
- // Listbox fuellen
+ // fill listbox
std::size_t nCount = ::lcl_GetFrmMapCount(_pMap);
for (std::size_t i = 0; _pMap && i < nCount; ++i)
{
-// #61359# Warum nicht von links/von innen bzw. von oben?
+// #61359# why not from the left/from inside or from the top?
// if (!bFormat || (pMap[i].eStrId != SwFPos::FROMLEFT && pMap[i].eStrId != SwFPos::FROMTOP))
{
SvxSwFramePosString::StringId eStrId = m_aHoriMirrorCB.IsChecked() ?
_pMap[i].eMirrorStrId : _pMap[i].eStrId;
@@ -1751,7 +1751,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
String sEntry(m_aFramePosString.GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
- // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen
+ // don't insert duplicate entries at character wrapped borders
_rLB.InsertEntry(sEntry);
}
// #i22341# - add condition to handle map <aVCharMap>
@@ -1785,14 +1785,14 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
return;
}
- // Setzen des Rechtecks und der Workingarea
+ // setting of the rectangle and the working area
m_aRect = m_pSdrView->GetAllMarkedRect();
m_pSdrView->GetSdrPageView()->LogicToPagePos( m_aRect );
// get WorkArea
m_aWorkArea = m_pSdrView->GetWorkArea();
- // Beruecksichtigung Ankerposition (bei Writer)
+ // consider anchor position (for Writer)
const SdrMarkList& rMarkList = m_pSdrView->GetMarkedObjectList();
if( rMarkList.GetMarkCount() >= 1 )
{
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 1d270e5..7865b5b 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -145,7 +145,7 @@ void SvxAreaTabDialog::SavePalettes()
mpBitmapList = mpDrawModel->GetBitmapList();
}
- // Speichern der Tabellen, wenn sie geaendert wurden.
+ // save the tables when they have been changed
const String aPath( SvtPathOptions().GetPalettePath() );
@@ -155,7 +155,7 @@ void SvxAreaTabDialog::SavePalettes()
mpHatchingList->Save();
SvxHatchListItem aItem( mpHatchingList, SID_HATCH_LIST );
- // ToolBoxControls werden benachrichtigt:
+ // ToolBoxControls are informed:
if ( pShell )
pShell->PutItem( aItem );
else
@@ -168,7 +168,7 @@ void SvxAreaTabDialog::SavePalettes()
mpBitmapList->Save();
SvxBitmapListItem aItem( mpBitmapList, SID_BITMAP_LIST );
- // ToolBoxControls werden benachrichtigt:
+ // ToolBoxControls are informed:
if ( pShell )
pShell->PutItem( aItem );
else
@@ -183,7 +183,7 @@ void SvxAreaTabDialog::SavePalettes()
mpGradientList->Save();
SvxGradientListItem aItem( mpGradientList, SID_GRADIENT_LIST );
- // ToolBoxControls werden benachrichtigt:
+ // ToolBoxControls are informed:
if ( pShell )
pShell->PutItem( aItem );
else
@@ -198,7 +198,7 @@ void SvxAreaTabDialog::SavePalettes()
mpColorList->Save();
SvxColorListItem aItem( mpColorList, SID_COLOR_TABLE );
- // ToolBoxControls werden benachrichtigt:
+ // ToolBoxControls are informed:
if ( pShell )
pShell->PutItem( aItem );
else
@@ -213,9 +213,9 @@ short SvxAreaTabDialog::Ok()
{
SavePalettes();
- // Es wird RET_OK zurueckgeliefert, wenn wenigstens eine
- // TabPage in FillItemSet() sal_True zurueckliefert. Dieses
- // geschieht z.Z. standardmaessig.
+ // RET_OK is returned, if at least one
+ // TabPage returns sal_True in FillItemSet().
+ // This happens by default at the moment.
return( SfxTabDialog::Ok() );
}
@@ -250,7 +250,7 @@ void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
( (SvxAreaTabPage&) rPage ).SetBmpChgd( &mnBitmapListState );
( (SvxAreaTabPage&) rPage ).SetColorChgd( &mnColorListState );
( (SvxAreaTabPage&) rPage ).Construct();
- // ActivatePage() wird das erste mal nicht gerufen
+ // ActivatePage() is not called the first time
( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs );
break;
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 01eb111..18f4c56 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -109,8 +109,8 @@
#define FL_OFFSET 5
#define FL_STEPCOUNT 7
-// Farben definieren TabPage
-// nur temporaer !!!
+// Colors define TabPage
+// only temporarily!!!
// #define RID_SVXPAGE_COLOR 999
//#define GRP_COLORTABLE 1
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index c4f5ca7..fda275e 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -52,7 +52,7 @@ static sal_uInt16 pRanges[] =
/*************************************************************************
|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
+|* constructor of the tab dialog: adds pages to the dialog
|*
\************************************************************************/
@@ -188,7 +188,7 @@ SvxTextAnimationPage::~SvxTextAnimationPage()
/*************************************************************************
|*
-|* Liest uebergebenen Item-Set
+|* reads the passed item set
|*
\************************************************************************/
@@ -196,7 +196,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
{
const SfxItemPool* pPool = rAttrs.GetPool();
- // Animationstyp
+ // animation type
const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIKIND );
if( !pItem )
@@ -210,7 +210,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
aLbEffect.SetNoSelection();
aLbEffect.SaveValue();
- // Animationsrichtung
+ // animation direction
pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDIRECTION );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDIRECTION );
@@ -265,7 +265,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
aTsbStopInside.SetState( STATE_DONTKNOW );
aTsbStopInside.SaveValue();
- // Anzahl
+ // quantity
pItem = GetItem( rAttrs, SDRATTR_TEXT_ANICOUNT );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANICOUNT );
@@ -298,7 +298,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
aTsbEndless.SaveValue();
aNumFldCount.SaveValue();
- // Verzoegerung
+ // delay
pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIDELAY );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIDELAY );
@@ -323,7 +323,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
aTsbAuto.SaveValue();
aMtrFldDelay.SaveValue();
- // Schrittweite
+ // step size
pItem = GetItem( rAttrs, SDRATTR_TEXT_ANIAMOUNT );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_ANIAMOUNT );
@@ -381,7 +381,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs )
/*************************************************************************
|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
+|* fills the passed item set with dialog box attributes
|*
\************************************************************************/
@@ -391,7 +391,7 @@ sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
sal_uInt16 nPos;
TriState eState;
- // Animationstyp
+ // animation type
nPos = aLbEffect.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND &&
nPos != aLbEffect.GetSavedValue() )
@@ -400,7 +400,7 @@ sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
bModified = sal_True;
}
- // Animationsrichtung
+ // animation direction
if( aBtnUp.GetSavedValue() != aBtnUp.IsChecked() ||
aBtnLeft.GetSavedValue() != aBtnLeft.IsChecked() ||
aBtnRight.GetSavedValue() != aBtnRight.IsChecked() ||
@@ -427,7 +427,7 @@ sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
bModified = sal_True;
}
- // Anzahl
+ // quantity
eState = aTsbEndless.GetState();
String aStr = aNumFldCount.GetText();
if( eState != aTsbEndless.GetSavedValue() ||
@@ -448,7 +448,7 @@ sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
rAttrs.Put( SdrTextAniCountItem( (sal_uInt16) nValue ) );
}
- // Verzoegerung
+ // delay
eState = aTsbAuto.GetState();
aStr = aMtrFldDelay.GetText();
if( eState != aTsbAuto.GetSavedValue() ||
@@ -469,7 +469,7 @@ sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs)
rAttrs.Put( SdrTextAniDelayItem( (sal_uInt16) nValue ) );
}
- // Schrittweite
+ // step size
eState = aTsbPixel.GetState();
aStr = aMtrFldAmount.GetText();
if( eState != aTsbPixel.GetSavedValue() ||
@@ -516,7 +516,7 @@ sal_uInt16* SvxTextAnimationPage::GetRanges()
/*************************************************************************
|*
-|* Erzeugt die Seite
+|* creates the page
|*
\************************************************************************/
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 75cc28c..d62d775 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -63,7 +63,7 @@ static sal_uInt16 pRanges[] =
/*************************************************************************
|*
-|* Dialog (Seite) zum Kopieren von Objekten
+|* dialog (page) for copying objects
|*
\************************************************************************/
@@ -129,7 +129,7 @@ SvxTextAttrPage::~SvxTextAttrPage()
/*************************************************************************
|*
-|* Liest uebergebenen Item-Set
+|* reads the passed item set
|*
\************************************************************************/
@@ -139,7 +139,6 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
DBG_ASSERT( pPool, "Wo ist der Pool" );
SfxMapUnit eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST );
- // Linker Abstand vom Rahmen
const SfxPoolItem* pItem = GetItem( rAttrs, SDRATTR_TEXT_LEFTDIST );
if( !pItem )
@@ -153,7 +152,6 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aMtrFldLeft.SetText( String() );
aMtrFldLeft.SaveValue();
- // Rechter Abstand vom Rahmen
pItem = GetItem( rAttrs, SDRATTR_TEXT_RIGHTDIST );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST );
@@ -166,7 +164,6 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aMtrFldRight.SetText( String() );
aMtrFldRight.SaveValue();
- // Oberer Abstand vom Rahmen
pItem = GetItem( rAttrs, SDRATTR_TEXT_UPPERDIST );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST );
@@ -179,7 +176,6 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aMtrFldTop.SetText( String() );
aMtrFldTop.SaveValue();
- // Unterer Abstand vom Rahmen
pItem = GetItem( rAttrs, SDRATTR_TEXT_LOWERDIST );
if( !pItem )
pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST );
@@ -192,7 +188,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aMtrFldBottom.SetText( String() );
aMtrFldBottom.SaveValue();
- // An Hoehe anpassen
+ // adjust to height
if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != SFX_ITEM_DONTCARE )
{
aTsbAutoGrowHeight.SetState( ( ( const SdrTextAutoGrowHeightItem& )rAttrs.Get(
SDRATTR_TEXT_AUTOGROWHEIGHT ) ).
@@ -203,7 +199,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aTsbAutoGrowHeight.SetState( STATE_DONTKNOW );
aTsbAutoGrowHeight.SaveValue();
- // An Breite anpassen
+ // adjust to width
if ( rAttrs.GetItemState( SDRATTR_TEXT_AUTOGROWWIDTH ) != SFX_ITEM_DONTCARE )
{
aTsbAutoGrowWidth.SetState( ( ( const SdrTextAutoGrowWidthItem& )rAttrs.Get(
SDRATTR_TEXT_AUTOGROWWIDTH ) ).
@@ -317,7 +313,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aFlPosition.Enable( sal_False );
}
- // Am Rahmen anpassen
+ // adjust to border
if ( rAttrs.GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE )
{
SdrFitToSizeType eFTS = (SdrFitToSizeType)
@@ -329,7 +325,6 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
aTsbFitToSize.SetState( STATE_DONTKNOW );
aTsbFitToSize.SaveValue();
- // Konturfluss
if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE )
{
sal_Bool bContour = ( ( const SdrTextContourFrameItem& )rAttrs.Get(
SDRATTR_TEXT_CONTOURFRAME ) ).GetValue();
@@ -345,7 +340,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs )
/*************************************************************************
|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
+|* fills the passed item set with dialog box attributes
|*
\************************************************************************/
@@ -406,7 +401,6 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
rAttrs.Put( SdrTextWordWrapItem( (sal_Bool) STATE_CHECK == eState ) );
}
- // Konturfluss
eState = aTsbContour.GetState();
if( eState != aTsbContour.GetSavedValue() )
{
@@ -427,7 +421,7 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) );
}
- // zentriert
+ // centered
RECT_POINT eRP = aCtlPosition.GetActualRP();
SdrTextVertAdjust eTVA, eOldTVA;
SdrTextHorzAdjust eTHA, eOldTHA;
@@ -521,10 +515,10 @@ void SvxTextAttrPage::Construct()
{
if ( ((SdrTextObj*)pObj)->HasText() )
{
- // Konturfluss ist NICHT bei reinen Textobjekten m�glich
+ // contour NOT possible for pure text objects
bContourEnabled = sal_False;
- // Breite und Hoehe anpassen ist NUR bei reinen Textobjekten m�glich
+ // adjusting width and height is ONLY possible for pure text objects
bAutoGrowWidthEnabled = bAutoGrowHeightEnabled = sal_True;
}
}
@@ -550,7 +544,7 @@ void SvxTextAttrPage::Construct()
/*************************************************************************
|*
-|* Erzeugt die Seite
+|* creates the page
|*
\************************************************************************/
@@ -616,7 +610,7 @@ void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP )
/*************************************************************************
|*
-|* Aendert evtl. die Position des Positions-Controls
+|* possibly changes the position of the position-control
|*
\************************************************************************/
@@ -678,7 +672,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl)
/*************************************************************************
|*
-|* Enabled/Disabled "Groesse an Text" oder "Am Rahmen Anpassen"
+|* enables/disables "size at text" or "adjust to frame"
|*
\************************************************************************/
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 214496a..97182c7 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -504,7 +504,7 @@ void SvxTransparenceTabPage::ActivatePage(const SfxItemSet& rSet)
if (pPageTypeItem)
SetPageType(pPageTypeItem->GetValue());
- if(nDlgType == 0) // Flaechen-Dialog
+ if(nDlgType == 0) // area dialog
nPageType = PT_TRANSPARENCE;
InitPreview ( rSet );
@@ -669,7 +669,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
aCtlXRectPreview.SetAccessibleName(accName);
aCtlBitmapPreview.SetAccessibleName(accName);
- // Gruppen, die sich ueberlagern
+ // groups that overlay each other
aLbBitmap.Hide();
aCtlBitmapPreview.Hide();
@@ -726,7 +726,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
DBG_ASSERT( pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( XATTR_FILLBMP_SIZEX );
- // Setzen Output-Devices
+ // setting the output device
rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
rXFSet.Put( XFillColorItem( String(), COL_BLACK ) );
aCtlXRectPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -800,14 +800,14 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
SetPageType(pPageTypeItem->GetValue());
if (pPosItem)
SetPos(pPosItem->GetValue());
- if( nDlgType == 0 ) // Flaechen-Dialog
+ if( nDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_True;
if( pColorList.is() )
{
sal_uInt16 _nPos = 0;
- // Bitmapliste
+
if( *pnBitmapListState )
{
if( *pnBitmapListState & CT_CHANGED )
@@ -827,7 +827,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
aLbBitmap.SelectEntryPos( _nPos );
ModifyBitmapHdl_Impl( this );
}
- // hatch-liste
+
if( *pnHatchingListState )
{
if( *pnHatchingListState & CT_CHANGED )
@@ -849,7 +849,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
ModifyHatchBckgrdColorHdl_Impl( this );
}
- // gradient-liste
+
if( *pnGradientListState )
{
if( *pnGradientListState & CT_CHANGED )
@@ -869,7 +869,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
aLbGradient.SelectEntryPos( _nPos );
ModifyGradientHdl_Impl( this );
}
- // ColorList
+
if( *pnColorListState )
{
if( *pnColorListState & CT_CHANGED )
@@ -944,7 +944,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
{
- if( nDlgType == 0 ) // Flaechen-Dialog
+ if( nDlgType == 0 ) // area dialog
{
sal_uInt16 nPosOrig = nPos;
XFillStyle eStyle = (XFillStyle) aTypeLB.GetSelectEntryPos();
@@ -1035,7 +1035,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True;
}
}
- // NEU
+ // NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ),
sal_True ) ) )
@@ -1066,7 +1066,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True;
}
}
- // NEU
+ // NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLGRADIENT ),
sal_True ) ) )
@@ -1112,7 +1112,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True;
}
}
- // NEU
+ // NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLHATCH ),
sal_True ) ) )
@@ -1143,7 +1143,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
bModified = sal_True;
}
}
- // NEU
+ // NEW
if( (eSavedStyle != eStyle) &&
( bModified ||
SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBITMAP ),
sal_True ) ) )
@@ -1160,7 +1160,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
break;
}
- // Schrittweite
+ // step size
if( aTsbStepCount.IsEnabled() )
{
sal_uInt16 nValue = 0;
@@ -1173,7 +1173,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
}
else
{
- // Zustand != Disabled ?
+ // condition != Disabled ?
if( aNumFldStepCount.GetText().Len() > 0 )
{
nValue = (sal_uInt16) aNumFldStepCount.GetValue();
@@ -1193,7 +1193,6 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
- // Kacheln
if( aTsbTile.IsEnabled() )
{
TriState eState = aTsbTile.GetState();
@@ -1209,7 +1208,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
}
- // Stretchen
+
if( aTsbStretch.IsEnabled() )
{
TriState eState = aTsbStretch.GetState();
@@ -1226,8 +1225,8 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
- // Originalgroesse (im UI) wird wie folgt benutzt:
- // Controls sind disabled, muessen aber gesetzt werden.
+ // Original size (in the UI) is used as follows:
+ // Controls are disabled, but have to be set.
// SizeX = 0; SizeY = 0; Log = sal_True
//aTsbScale
@@ -1269,9 +1268,8 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
pItem = new XFillBmpSizeXItem( GetCoreValue( aMtrFldXSize, ePoolUnit ) );
else
{
- // Prozentwerte werden negativ gesetzt, damit
- // diese nicht skaliert werden; dieses wird
- // im Item beruecksichtigt
+ // Percentage values are set negatively, so that
+ // they aren't scaled; this is considered in the item.
pItem = new XFillBmpSizeXItem( -labs(
static_cast<long>(aMtrFldXSize.GetValue()) ) );
}
}
@@ -1306,9 +1304,9 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
pItem = new XFillBmpSizeYItem( GetCoreValue( aMtrFldYSize, ePoolUnit ) );
else
{
- // Prozentwerte werden negativ gesetzt, damit
- // diese vom MetricItem nicht skaliert werden;
- // dieses wird im Item beruecksichtigt
+ // Percentage values are set negatively, so that
+ // they aren't scaled by the MetricItem;
+ // this is considered in the item.
pItem = new XFillBmpSizeYItem( -labs(
static_cast<long>(aMtrFldYSize.GetValue()) ) );
}
}
@@ -1516,7 +1514,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
}
else
{
- // Alle LBs nicht zug"anglich machen
+ // make all LBs not accessible
aLbColor.Hide();
aLbGradient.Hide();
aLbHatching.Hide();
@@ -1525,11 +1523,11 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aLbColor.Disable();
aLbColor.Show();
- // Damit Reset() auch mit Zurueck richtig funktioniert
+ // so that Reset() also works correctly with Back
aTypeLB.SetNoSelection();
}
- // Schrittweite
+ // step size
if( ( rAttrs.GetItemState( XATTR_GRADIENTSTEPCOUNT ) != SFX_ITEM_DONTCARE ) ||
( rAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE ) )
{
@@ -1553,9 +1551,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aNumFldStepCount.SetText( String() );
}
- // Attribute fuer die Bitmap-Fuellung
+ // attributes for the bitmap filling
- // Ist Kacheln gesetzt?
if( rAttrs.GetItemState( XATTR_FILLBMP_TILE ) != SFX_ITEM_DONTCARE )
{
aTsbTile.EnableTriState( sal_False );
@@ -1568,7 +1565,6 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
else
aTsbTile.SetState( STATE_DONTKNOW );
- // Ist Stretchen gesetzt?
if( rAttrs.GetItemState( XATTR_FILLBMP_STRETCH ) != SFX_ITEM_DONTCARE )
{
aTsbStretch.EnableTriState( sal_False );
@@ -1598,7 +1594,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
aTsbScale.SetState( STATE_DONTKNOW );
- // Status fuer Originalgroesse ermitteln
+ // determine status for the original size
TriState eOriginal = STATE_NOCHECK;
//aMtrFldXSize
@@ -1607,8 +1603,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
sal_Int32 nValue = ( ( const XFillBmpSizeXItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEX )
).GetValue();
if( aTsbScale.GetState() == STATE_CHECK )
{
- // Wenn im Item eine Prozentangabe steckt,
- // so ist diese wegen des MetricItems negativ
+ // If there's a percentage value in the item,
+ // it is negative because of the MetricItems.
aMtrFldXSize.SetValue( labs( nValue ) );
}
else
@@ -1618,8 +1614,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
if( nValue == 0 )
{
eOriginal = STATE_CHECK;
- // Wert ist beim Ausschalten von Originalgroesse sonst zu klein
- // (Performance-Problem)
+ // value would be too small otherwise when turning off the original size
+ // (performance problem)
aMtrFldXSize.SetValue( 100 );
}
}
@@ -1635,8 +1631,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
sal_Int32 nValue = ( ( const XFillBmpSizeYItem& ) rAttrs.Get( XATTR_FILLBMP_SIZEY )
).GetValue();
if( aTsbScale.GetState() == STATE_CHECK )
{
- // Wenn im Item eine Prozentangabe steckt,
- // so ist diese wegen des MetricItems negativ
+ // If there's a percentage value in the item,
+ // it is negative because of the MetricItems.
aMtrFldYSize.SetValue( labs( nValue ) );
}
else
@@ -1715,11 +1711,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
else
aMtrFldYOffset.SetText( String() );
- // Erst hier, damit Tile und Stretch mit beruecksichtigt wird
+ // not earlier so that tile and stretch are considered
if( aTypeLB.GetSelectEntryPos() == XFILL_BITMAP )
ClickBitmapHdl_Impl();
- // Werte sichern
aTypeLB.SaveValue();
aLbColor.SaveValue();
aLbGradient.SaveValue();
@@ -1854,7 +1849,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl()
aCbxHatchBckgrd.Hide();
aLbHatchBckgrdColor.Hide();
- // Text der Tabelle setzen
+ // set table text
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pColorList->GetPath() );
@@ -1885,7 +1880,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
rXFSet.Put( XFillColorItem( String(),
aLbColor.GetSelectEntryColor() ) );
}
- // NEU
+ // NEW
else if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True,
&pPoolItem ) )
{
rXFSet.Put( XFillStyleItem( XFILL_SOLID ) );
@@ -1943,7 +1938,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl()
aCbxHatchBckgrd.Hide();
aLbHatchBckgrdColor.Hide();
- // Text der Tabelle setzen
+ // set table text
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pGradientList->GetPath() );
@@ -1970,7 +1965,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
sal_uInt16 _nPos = aLbGradient.GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
- // ItemSet fuellen und an aCtlXRectPreview weiterleiten
+ // fill ItemSet and pass it on to aCtlXRectPreview
XGradientEntry* pEntry = pGradientList->GetGradient( _nPos );
rXFSet.Put( XFillStyleItem( XFILL_GRADIENT ) );
@@ -2034,7 +2029,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl()
aCbxHatchBckgrd.Enable();
aLbHatchBckgrdColor.Enable();
- // Text der Tabelle setzen
+ // set table text
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pHatchingList->GetPath() );
@@ -2062,7 +2057,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
sal_uInt16 _nPos = aLbHatching.GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
- // ItemSet fuellen und an aCtlXRectPreview weiterleiten
+ // fill ItemSet and pass it on to aCtlXRectPreview
XHatchEntry* pEntry = pHatchingList->GetHatch( _nPos );
rXFSet.Put( XFillStyleItem( XFILL_HATCH ) );
@@ -2193,7 +2188,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
aMtrFldOffset.Show();
aFlOffset.Show();
- // Text der Tabelle setzen
+ // set table text
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
@@ -2220,7 +2215,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
sal_uInt16 _nPos = aLbBitmap.GetSelectEntryPos();
if( _nPos != LISTBOX_ENTRY_NOTFOUND )
{
- // ItemSet fuellen und an aCtlXRectPreview weiterleiten
+ // fill ItemSet and pass it on to aCtlXRectPreview
XBitmapEntry* pEntry = pBitmapList->GetBitmap( _nPos );
rXFSet.Put( XFillStyleItem( XFILL_BITMAP ) );
@@ -2260,7 +2255,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
sal_uInt16 nValue = 0;
if( aTsbStepCount.GetState() != STATE_CHECK )
{
- // Zustand != Disabled ?
+ // condition != Disabled ?
if( aNumFldStepCount.GetText().Len() > 0 )
nValue = (sal_uInt16) aNumFldStepCount.GetValue();
}
@@ -2404,7 +2399,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
}
else if( aTsbOriginal.IsEnabled() && aTsbOriginal.GetState() == STATE_CHECK )
{
- // Originalgroesse -> Size == 0
+ // original size -> size == 0
rXFSet.Put( XFillBmpSizeXItem( 0 ) );
rXFSet.Put( XFillBmpSizeLogItem( sal_True ) );
}
@@ -2425,7 +2420,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
}
else if( aTsbOriginal.IsEnabled() && aTsbOriginal.GetState() == STATE_CHECK )
{
- // Originalgroesse -> Size == 0
+ // original size -> size == 0
rXFSet.Put( XFillBmpSizeYItem( 0 ) );
rXFSet.Put( XFillBmpSizeLogItem( sal_True ) );
}
@@ -2504,7 +2499,7 @@ void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
{
eRP = eRcPt;
- // Ausrichtung der Bitmapfuellung
+ // alignment of the bitmap fill
ModifyTileHdl_Impl( pWindow );
}
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 0786df4..01adb76 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -106,10 +106,10 @@ SvxBitmapTabPage::SvxBitmapTabPage
{
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Setzen des Output-Devices
+ // setting the output device
rXFSet.Put( aXFStyleItem );
rXFSet.Put( aXBitmapItem );
@@ -146,11 +146,9 @@ SvxBitmapTabPage::SvxBitmapTabPage
void SvxBitmapTabPage::Construct()
{
- // Farbtabellen
aLbColor.Fill( pColorList );
aLbBackgroundColor.CopyEntries( aLbColor );
- // Bitmaptabelle
aLbBitmaps.Fill( pBitmapList );
}
@@ -161,7 +159,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -180,7 +178,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
aLbColor.Fill( pColorList );
nCount = aLbColor.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbColor.SelectEntryPos( 0 );
else
@@ -192,7 +190,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
aLbBackgroundColor.CopyEntries( aLbColor );
nCount = aLbBackgroundColor.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbBackgroundColor.SelectEntryPos( 0 );
else
@@ -202,8 +200,8 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
ChangeBackgrndColorHdl_Impl( this );
}
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name and
+ // displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pBitmapList->GetPath() );
@@ -222,7 +220,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet& )
{
aLbBitmaps.SelectEntryPos( *pPos );
}
- // Farben koennten geloescht worden sein
+ // colors could have been deleted
ChangeBitmapHdl_Impl( this );
*pPageType = PT_BITMAP;
@@ -248,11 +246,11 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
{
- if( *pDlgType == 0 && *pbAreaTP == sal_False ) // Flaechen-Dialog
+ if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
{
if( *pPageType == PT_BITMAP )
{
- // CheckChanges_Impl(); <-- doppelte Abfrage ?
+ // CheckChanges_Impl(); <-- duplicate inquiry?
XOBitmap aXOBitmap;
String aString;
@@ -290,7 +288,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet& )
aBitmapCtl.SetBackgroundColor( aLbBackgroundColor.GetSelectEntryColor() );
aBitmapCtl.SetBmpArray( aCtlPixel.GetBitmapPixelPtr() );
- // Bitmap holen und darstellen
+ // get bitmap and display it
XFillBitmapItem aBmpItem( (const String &) String(), aBitmapCtl.GetXBitmap() );
rXFSet.Put( aBmpItem );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -298,7 +296,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet& )
ChangeBitmapHdl_Impl( this );
- // Status der Buttons ermitteln
+ // determine button state
if( pBitmapList->Count() )
{
aBtnAdd.Enable();
@@ -476,7 +474,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
aBtnModify.Enable();
aBtnAdd.Enable();
- // Setzen des PixelControls
+ // setting the pixel control
aCtlPixel.SetXBitmap( *pXOBitmap );
Color aPixelColor = pXOBitmap->GetPixelColor();
@@ -485,8 +483,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
aBitmapCtl.SetPixelColor( aPixelColor );
aBitmapCtl.SetBackgroundColor( aBackColor );
- // Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
- // temporaer hinzugenommen
+ // if the entry is not in the listbox,
+ // the color is added temporarily
if( 0 == aLbBitmaps.GetSelectEntryPos() )
{
aLbColor.SelectEntry( Color( COL_BLACK ) );
@@ -508,7 +506,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
}
aCtlPixel.Invalidate();
- // Bitmap darstellen
+ // display bitmap
XFillBitmapItem aXBmpItem( (const String &) String(), *pXOBitmap );
rXFSet.Put( aXBmpItem );
@@ -550,13 +548,13 @@ long SvxBitmapTabPage::CheckChanges_Impl()
switch( nRet )
{
- case RET_BTN_1: // Aendern
+ case RET_BTN_1:
{
ClickModifyHdl_Impl( this );
}
break;
- case RET_BTN_2: // Hinzufuegen
+ case RET_BTN_2:
{
ClickAddHdl_Impl( this );
nPos = aLbBitmaps.GetSelectEntryPos();
@@ -649,7 +647,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
pEntry = new XBitmapEntry( aXOBitmap, aName );
}
- else // Es muss sich um eine nicht vorhandene importierte Bitmap handeln
+ else // it must be a not existing imported bitmap
{
const SfxPoolItem* pPoolItem = NULL;
if( SFX_ITEM_SET == rOutAttrs.GetItemState( XATTR_FILLBITMAP, sal_True, &pPoolItem ) )
@@ -678,14 +676,13 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
}
#endif
- // Flag fuer modifiziert setzen
*pnBitmapListState |= CT_MODIFIED;
ChangeBitmapHdl_Impl( this );
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( pBitmapList->Count() )
{
aBtnModify.Enable();
@@ -785,14 +782,13 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
}
#endif
- // Flag fuer modifiziert setzen
*pnBitmapListState |= CT_MODIFIED;
ChangeBitmapHdl_Impl( this );
}
}
else
- // Graphik konnte nicht geladen werden
+ // graphic couldn't be loaded
ErrorBox( GetParentDialog(),
WinBits( WB_OK ),
String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute();
@@ -858,7 +854,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
aLbBitmaps.Modify( pEntry, nPos );
aLbBitmaps.SelectEntryPos( nPos );
- // Flag fuer modifiziert setzen
*pnBitmapListState |= CT_MODIFIED;
bBmpChanged = sal_False;
@@ -897,11 +892,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
ChangeBitmapHdl_Impl( this );
- // Flag fuer modifiziert setzen
*pnBitmapListState |= CT_MODIFIED;
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( !pBitmapList->Count() )
{
aBtnModify.Disable();
@@ -946,7 +940,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
- // Tabelle speichern
+ // save table
XBitmapListRef pBmpList = XPropertyList::CreatePropertyList(
XBITMAP_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool
)->AsBitmapList();
pBmpList->SetName( aURL.getName() );
@@ -961,8 +955,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
pBitmapList->SetName( aURL.getName() );
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name
+ // displaying it in the GroupBox
String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -974,9 +968,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gewechselt setzen
*pnBitmapListState |= CT_CHANGED;
- // Flag fuer modifiziert entfernen
*pnBitmapListState &= ~CT_MODIFIED;
LeaveWait();
}
@@ -989,7 +981,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( pBitmapList->Count() )
{
aBtnModify.Enable();
@@ -1039,8 +1031,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
if( pBitmapList->Save() )
{
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name
+ // displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -1052,9 +1044,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gespeichert setzen
*pnBitmapListState |= CT_SAVED;
- // Flag fuer modifiziert entfernen
*pnBitmapListState &= ~CT_MODIFIED;
}
else
@@ -1076,7 +1066,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl)
aBitmapCtl.SetPixelColor( aLbColor.GetSelectEntryColor() );
- // Bitmap holen und darstellen
+ // get bitmap and display it
rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
@@ -1095,7 +1085,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl)
aBitmapCtl.SetBackgroundColor( aLbBackgroundColor.GetSelectEntryColor() );
- // Bitmap holen und darstellen
+ // get bitmap and display it
rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
@@ -1113,7 +1103,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
{
aBitmapCtl.SetBmpArray( aCtlPixel.GetBitmapPixelPtr() );
- // Bitmap holen und darstellen
+ // get bitmap and display it
rXFSet.Put( XFillBitmapItem( String(), aBitmapCtl.GetXBitmap() ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreview.Invalidate();
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 7c45d04..bf027bc 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -196,7 +196,7 @@ IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickLoadHdl_Impl)
meType, aDlg.GetPath(), mpXPool )->AsColorList();
if( pList->Load() )
{
- // Pruefen, ob Tabelle geloescht werden darf:
+ // check whether the table may be deleted:
SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg );
SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg );
@@ -384,16 +384,16 @@ SvxColorTabPage::SvxColorTabPage
{
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Setzen des Output-Devices
+ // setting the output device
rXFSet.Put( aXFStyleItem );
rXFSet.Put( aXFillColorItem );
aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
- // Handler ueberladen
+ // overload handler
aLbColor.SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorLBHdl_Impl ) );
aValSetColorList.SetSelectHdl(
@@ -447,7 +447,7 @@ void SvxColorTabPage::Construct()
void SvxColorTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -476,7 +476,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
aMtrFldColorModel2.SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
- // ItemSet fuellen und an XOut weiterleiten
+ // fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), aAktuellColor ) );
aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
@@ -486,7 +486,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
}
}
- // Damit evtl. geaenderte Farbe verworfen wird
+ // so that the possibly changed color is discarded
SelectColorLBHdl_Impl( this );
*pPageType = PT_COLOR;
@@ -514,7 +514,7 @@ int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
long SvxColorTabPage::CheckChanges_Impl()
{
- // wird hier benutzt, um Aenderungen NICHT zu verlieren
+ // used to NOT lose changes
Color aTmpColor (aAktuellColor);
if (eCM != CM_RGB)
@@ -526,7 +526,7 @@ long SvxColorTabPage::CheckChanges_Impl()
Color aColor = pColorList->GetColor( nPos )->GetColor();
String aString = aLbColor.GetSelectEntry();
- // aNewColor, da COL_USER != COL_irgendwas, auch wenn RGB-Werte gleich
+ // aNewColor, because COL_USER != COL_something, even if RGB values are the same
// Color aNewColor( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
if( ColorToPercent_Impl( aTmpColor.GetRed() ) != ColorToPercent_Impl( aColor.GetRed() ) ||
@@ -550,14 +550,14 @@ long SvxColorTabPage::CheckChanges_Impl()
switch( nRet )
{
- case RET_BTN_1: // Aendern
+ case RET_BTN_1:
{
ClickModifyHdl_Impl( this );
aColor = pColorList->GetColor( nPos )->GetColor();
}
break;
- case RET_BTN_2: // Hinzufuegen
+ case RET_BTN_2:
{
ClickAddHdl_Impl( this );
nPos = aLbColor.GetSelectEntryPos();
@@ -571,7 +571,7 @@ long SvxColorTabPage::CheckChanges_Impl()
delete aMessDlg;
}
}
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
nPos = aLbColor.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -634,7 +634,7 @@ void SvxColorTabPage::Reset( const SfxItemSet& rSet )
aEdtName.SetText( aLbColor.GetSelectEntry() );
}
- // Farbmodell setzen
+ // set color model
String aStr = GetUserData();
aLbColorModel.SelectEntryPos( (sal_uInt16) aStr.ToInt32() );
@@ -656,11 +656,11 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow,
//------------------------------------------------------------------------
//
-// Wird aufgerufen, wenn Inhalt der MtrFileds f�r Farbwerte ver�ndert wird
+// is called when the content of the MtrFields is changed for color values
//
IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
{
- // lese aktuelle MtrFields aus, wenn cmyk, dann k-Wert als Trans.-Farbe
+ // read current MtrFields, if cmyk, then k-value as transparency
aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16)
aMtrFldColorModel4.GetValue() ),
(sal_uInt8)PercentToColor_Impl( (sal_uInt16)
aMtrFldColorModel1.GetValue() ),
(sal_uInt8)PercentToColor_Impl( (sal_uInt16)
aMtrFldColorModel2.GetValue() ),
@@ -695,12 +695,12 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
long nCount = pColorList->Count();
sal_Bool bDifferent = sal_True;
- // Pruefen, ob Name schon vorhanden ist
+ // check if name is already existing
for ( long i = 0; i < nCount && bDifferent; i++ )
if ( aName == pColorList->GetColor( i )->GetName() )
bDifferent = sal_False;
- // Wenn ja, wird wiederholt ein neuer Name angefordert
+ // if yes, it is repeated and a new name is demanded
if ( !bDifferent )
{
WarningBox aWarningBox( GetParentDialog(), WinBits( WB_OK ),
@@ -731,7 +731,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
delete( pDlg );
}
- // Wenn nicht vorhanden, wird Eintrag aufgenommen
+ // if not existing the entry is entered
if( bDifferent )
{
if (eCM != CM_RGB)
@@ -746,7 +746,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
aLbColor.SelectEntryPos( aLbColor.GetEntryCount() - 1 );
- // Flag fuer modifiziert setzen
*pnColorListState |= CT_MODIFIED;
SelectColorLBHdl_Impl( this );
@@ -770,12 +769,12 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
long nCount = pColorList->Count();
sal_Bool bDifferent = sal_True;
- // Pruefen, ob Name schon vorhanden ist
+ // check if name is already existing
for ( long i = 0; i < nCount && bDifferent; i++ )
if ( aName == pColorList->GetColor( i )->GetName() && nPos != i )
bDifferent = sal_False;
- // Wenn ja, wird wiederholt ein neuer Name angefordert
+ // if yes, it is repeated and a new name is demanded
if ( !bDifferent )
{
WarningBox aWarningBox( GetParentDialog(), WinBits( WB_OK ),
@@ -804,7 +803,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
delete( pDlg );
}
- // Wenn nicht vorhanden, wird Eintrag aufgenommen
+ // if not existing the entry is entered
if( bDifferent )
{
XColorEntry* pEntry = pColorList->GetColor( nPos );
@@ -825,7 +824,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
aCtlPreviewOld.Invalidate();
- // Flag fuer modifiziert setzen
*pnColorListState |= CT_MODIFIED;
}
}
@@ -858,7 +856,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
aMtrFldColorModel4.SetValue( ColorToPercent_Impl( nK ) );
- // ItemSet fuellen und an XOut weiterleiten
+ // fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), aPreviewColor ) );
//aCtlPreviewOld.SetAttributes( aXFillAttr );
aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
@@ -887,18 +885,17 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
DBG_ASSERT( pEntry, "ColorEntry not found !" );
delete pEntry;
- // Listbox und ValueSet aktualisieren
+ // update Listbox and ValueSet
aLbColor.RemoveEntry( nPos );
aValSetColorList.Clear();
FillValueSet_Impl( aValSetColorList );
- // Positionieren
+ // positioning
aLbColor.SelectEntryPos( nPos );
SelectColorLBHdl_Impl( this );
aCtlPreviewOld.Invalidate();
- // Flag fuer modifiziert setzen
*pnColorListState |= CT_MODIFIED;
}
}
@@ -955,9 +952,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl)
//------------------------------------------------------------------------
-//
-// Farbwerte je nach �bergebenes Farbmodell umrechnen
-//
void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell)
{
switch (eModell)
@@ -979,9 +973,6 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell)
}
}
-//
-// Auswahl Listbox 'Farbmodell' (RGB/CMY)
-//
IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
{
int nPos = aLbColorModel.GetSelectEntryPos();
@@ -989,7 +980,6 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
{
if (eCM != (ColorModel) nPos)
{
- // wenn Farbmodell geaendert wurde, dann Werte umrechnen
ConvertColorValues (aAktuellColor, (ColorModel) nPos);
}
@@ -1017,14 +1007,14 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 );
aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 );
- // Da der alte HelpText noch am Control steht wuerde
- // ein Umsetzen der HelpID alleine nichts bewirken
+ // Because the old HelpText is still at the Control
+ // a change of the HelpID alone would not work
aMtrFldColorModel1.SetHelpText( String() );
aMtrFldColorModel2.SetHelpText( String() );
aMtrFldColorModel3.SetHelpText( String() );
- // RGB-Werte im Bereich 0..255 verarbeiten (nicht in %),
- // dazu MetricField's entsprechend einstellen
+ // handle RGB-values (0..255, not in %),
+ // and adjust MetricFields respectively
aMtrFldColorModel1.SetUnit(FUNIT_NONE);
aMtrFldColorModel1.SetMin(0);
aMtrFldColorModel1.SetMax(255);
@@ -1068,8 +1058,8 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
aMtrFldColorModel2.SetHelpText( String() );
aMtrFldColorModel3.SetHelpText( String() );
- // CMYK-Werte im Bereich 0..100% verarbeiten,
- // dazu MetricField's entsprechend einstellen
+ // handle CMYK-values (0..100%)
+ // and adjust MetricFields respectively
String aStrUnit( RTL_CONSTASCII_USTRINGPARAM( " %" ) );
aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
@@ -1125,7 +1115,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* )
aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
aMtrFldColorModel4.SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
- // ItemSet fuellen und an XOut weiterleiten
+ // fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), pEntry->GetColor() ) );
aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
@@ -1154,11 +1144,10 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs )
//------------------------------------------------------------------------
-// Ein RGB-Wert wird in einen CMYK-Wert konvertiert, wobei die Color-
-// Klasse vergewaltigt wird, da R in C, G in M und B in Y umgewandelt
-// wird. Der Wert K wird in einer Extra-Variablen gehalten.
-// Bei weiteren Farbmodellen sollte man hierfuer eigene Klassen entwickeln,
-// die dann auch entsprechende Casts enthalten.
+// A RGB value is converted to a CMYK value - not in an ideal way as
+// R is converted into C, G into M and B into Y. The K value is held in an
+// extra variable. For further color models one should develop own
+// classes which should contain the respective casts.
void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK )
{
@@ -1175,7 +1164,7 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK )
//------------------------------------------------------------------------
-// Umgekehrter Fall zu RgbToCmyk_Impl (s.o.)
+// reverse case to RgbToCmyk_Impl (see above)
void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK )
{
@@ -1244,7 +1233,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
void SvxColorTabPage::FillUserData()
{
- // Das Farbmodell wird in der Ini-Datei festgehalten
+ // the color model is saved in the Ini-file
SetUserData( UniString::CreateFromInt32( eCM ) );
}
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a974b11..39802fc 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -98,20 +98,20 @@ SvxGradientTabPage::SvxGradientTabPage
aLbGradients.SetAccessibleName( GetText());
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Solange NICHT vom Item unterstuetzt
+ // as long as NOT supported by the item
aMtrColorTo.SetValue( 100 );
aMtrColorFrom.SetValue( 100 );
- // Setzen des Output-Devices
+ // setting the output device
rXFSet.Put( aXFStyleItem );
rXFSet.Put( aXGradientItem );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
- // Handler ueberladen
+ // overload the handler
aLbGradients.SetSelectHdl(
LINK( this, SvxGradientTabPage, ChangeGradientHdl_Impl ) );
aBtnAdd.SetClickHdl( LINK( this, SvxGradientTabPage, ClickAddHdl_Impl ) );
@@ -149,11 +149,9 @@ SvxGradientTabPage::SvxGradientTabPage
void SvxGradientTabPage::Construct()
{
- // Farbtabelle
aLbColorFrom.Fill( pColorList );
aLbColorTo.CopyEntries( aLbColorFrom );
- // Farbverlauftabelle
aLbGradients.Fill( pGradientList );
}
@@ -164,7 +162,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -183,7 +181,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
aLbColorFrom.Fill( pColorList );
nCount = aLbColorFrom.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbColorFrom.SelectEntryPos( 0 );
else
@@ -195,7 +193,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
aLbColorTo.CopyEntries( aLbColorFrom );
nCount = aLbColorTo.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbColorTo.SelectEntryPos( 0 );
else
@@ -204,8 +202,8 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
ModifiedHdl_Impl( this );
}
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (and possibly cutting) the name and
+ // displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pGradientList->GetPath() );
@@ -224,7 +222,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& )
{
aLbGradients.SelectEntryPos( *pPos );
}
- // Farben koennten geloescht worden sein
+ // colors could have been deleted
ChangeGradientHdl_Impl( this );
*pPageType = PT_GRADIENT;
@@ -250,11 +248,11 @@ int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
long SvxGradientTabPage::CheckChanges_Impl()
{
- // wird hier benutzt, um Aenderungen NICHT zu verlieren
+ // is used here in order to NOT lose changes
XGradient aTmpGradient( aLbColorFrom.GetSelectEntryColor(),
aLbColorTo.GetSelectEntryColor(),
(XGradientStyle) aLbGradientType.GetSelectEntryPos(),
- static_cast<long>(aMtrAngle.GetValue() * 10), // sollte in Resource
geaendert werden
+ static_cast<long>(aMtrAngle.GetValue() * 10), // should be changed in
resource
(sal_uInt16) aMtrCenterX.GetValue(),
(sal_uInt16) aMtrCenterY.GetValue(),
(sal_uInt16) aMtrBorder.GetValue(),
@@ -287,14 +285,14 @@ long SvxGradientTabPage::CheckChanges_Impl()
switch( nRet )
{
- case RET_BTN_1: // Aendern
+ case RET_BTN_1:
{
ClickModifyHdl_Impl( this );
aGradient = pGradientList->GetGradient( nPos )->GetGradient();
}
break;
- case RET_BTN_2: // Hinzufuegen
+ case RET_BTN_2:
{
ClickAddHdl_Impl( this );
nPos = aLbGradients.GetSelectEntryPos();
@@ -322,7 +320,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
{
if( *pDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False )
{
- // CheckChanges(); <-- doppelte Abfrage ?
+ // CheckChanges(); <-- duplicate inquiry ?
XGradient* pXGradient = NULL;
String aString;
@@ -334,12 +332,12 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
}
else
- // Farbverlauf wurde (unbekannt) uebergeben
+ // gradient was passed (unidentified)
{
pXGradient = new XGradient( aLbColorFrom.GetSelectEntryColor(),
aLbColorTo.GetSelectEntryColor(),
(XGradientStyle) aLbGradientType.GetSelectEntryPos(),
- static_cast<long>(aMtrAngle.GetValue() * 10), // sollte in Resource
geaendert werden
+ static_cast<long>(aMtrAngle.GetValue() * 10), // should be changed in
resource
(sal_uInt16) aMtrCenterX.GetValue(),
(sal_uInt16) aMtrCenterY.GetValue(),
(sal_uInt16) aMtrBorder.GetValue(),
@@ -362,7 +360,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet& )
// aLbGradients.SelectEntryPos( 0 );
ChangeGradientHdl_Impl( this );
- // Status der Buttons ermitteln
+ // determine state of the buttons
if( pGradientList->Count() )
{
aBtnModify.Enable();
@@ -394,18 +392,18 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
XGradient aXGradient( aLbColorFrom.GetSelectEntryColor(),
aLbColorTo.GetSelectEntryColor(),
eXGS,
- static_cast<long>(aMtrAngle.GetValue() * 10), // sollte in Resource
geaendert werden
+ static_cast<long>(aMtrAngle.GetValue() * 10), // should be changed in
resource
(sal_uInt16) aMtrCenterX.GetValue(),
(sal_uInt16) aMtrCenterY.GetValue(),
(sal_uInt16) aMtrBorder.GetValue(),
(sal_uInt16) aMtrColorFrom.GetValue(),
(sal_uInt16) aMtrColorTo.GetValue() );
- // Enablen/Disablen von Controls
+ // enable/disable controls
if( pControl == &aLbGradientType || pControl == this )
SetControlState_Impl( eXGS );
- // Anzeigen im XOutDev
+ // displaying in XOutDev
rXFSet.Put( XFillGradientItem( String(), aXGradient ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -481,7 +479,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
XGradient aXGradient( aLbColorFrom.GetSelectEntryColor(),
aLbColorTo.GetSelectEntryColor(),
(XGradientStyle) aLbGradientType.GetSelectEntryPos(),
- static_cast<long>(aMtrAngle.GetValue() * 10), // sollte in Resource
geaendert werden
+ static_cast<long>(aMtrAngle.GetValue() * 10), // should be changed
in resource
(sal_uInt16) aMtrCenterX.GetValue(),
(sal_uInt16) aMtrCenterY.GetValue(),
(sal_uInt16) aMtrBorder.GetValue(),
@@ -504,13 +502,12 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
}
#endif
- // Flag fuer modifiziert setzen
*pnGradientListState |= CT_MODIFIED;
ChangeGradientHdl_Impl( this );
}
- // Status der Buttons ermitteln
+ // determine button state
if( pGradientList->Count() )
{
aBtnModify.Enable();
@@ -561,7 +558,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
XGradient aXGradient( aLbColorFrom.GetSelectEntryColor(),
aLbColorTo.GetSelectEntryColor(),
(XGradientStyle) aLbGradientType.GetSelectEntryPos(),
- static_cast<long>(aMtrAngle.GetValue() * 10), // sollte in
Resource geaendert werden
+ static_cast<long>(aMtrAngle.GetValue() * 10), // should be
changed in resource
(sal_uInt16) aMtrCenterX.GetValue(),
(sal_uInt16) aMtrCenterY.GetValue(),
(sal_uInt16) aMtrBorder.GetValue(),
@@ -576,7 +573,6 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
aLbGradients.SelectEntryPos( nPos );
- // Flag fuer modifiziert setzen
*pnGradientListState |= CT_MODIFIED;
}
else
@@ -613,11 +609,10 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
ChangeGradientHdl_Impl( this );
- // Flag fuer modifiziert setzen
*pnGradientListState |= CT_MODIFIED;
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( !pGradientList->Count() )
{
aBtnModify.Disable();
@@ -663,7 +658,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
aPathURL.removeSegment();
aPathURL.removeFinalSlash();
- // Liste speichern
+ // save list
XGradientListRef pGrdList = XPropertyList::CreatePropertyList(
XGRADIENT_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), pXPool
)->AsGradientList();
pGrdList->SetName( aURL.getName() );
@@ -680,8 +675,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
pGradientList->SetName( aURL.getName() );
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -693,9 +688,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gewechselt setzen
*pnGradientListState |= CT_CHANGED;
- // Flag fuer modifiziert entfernen
*pnGradientListState &= ~CT_MODIFIED;
LeaveWait();
}
@@ -708,7 +701,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( pGradientList->Count() )
{
aBtnModify.Enable();
@@ -758,8 +751,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
if( pGradientList->Save() )
{
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -771,9 +764,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gespeichert setzen
*pnGradientListState |= CT_SAVED;
- // Flag fuer modifiziert entfernen
*pnGradientListState &= ~CT_MODIFIED;
}
else
@@ -821,8 +812,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
aLbGradientType.SelectEntryPos(
sal::static_int_cast< sal_uInt16 >( eXGS ) );
- // Wenn der EIntrag nicht in der Listbox ist, werden die Farben
- // temporaer hinzugenommen
+ // if the entry is not in the listbox ist,
+ // colors are added temporarily
aLbColorFrom.SetNoSelection();
aLbColorFrom.SelectEntry( pGradient->GetStartColor() );
@@ -841,17 +832,17 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
aLbColorTo.SelectEntry( pGradient->GetEndColor() );
}
- aMtrAngle.SetValue( pGradient->GetAngle() / 10 ); // sollte in Resource geaendert werden
+ aMtrAngle.SetValue( pGradient->GetAngle() / 10 ); // should be changed in resource
aMtrBorder.SetValue( pGradient->GetBorder() );
aMtrCenterX.SetValue( pGradient->GetXOffset() );
aMtrCenterY.SetValue( pGradient->GetYOffset() );
aMtrColorFrom.SetValue( pGradient->GetStartIntens() );
aMtrColorTo.SetValue( pGradient->GetEndIntens() );
- // Controls Disablen/Enablen
+ // disable/enable controls
SetControlState_Impl( eXGS );
- // ItemSet fuellen und an aCtlPreview weiterleiten
+ // fill ItemSet and pass it on to aCtlPreview
rXFSet.Put( XFillGradientItem( String(), *pGradient ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index b08c156..678763e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -91,10 +91,10 @@ SvxHatchTabPage::SvxHatchTabPage
{
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Metrik einstellen
+ // adjust metric
FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
switch ( eFUnit )
@@ -107,12 +107,12 @@ SvxHatchTabPage::SvxHatchTabPage
}
SetFieldUnit( aMtrDistance, eFUnit );
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
- // Setzen des Output-Devices
+ // setting the output device
rXFSet.Put( aXFStyleItem );
rXFSet.Put( aXHatchItem );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -149,10 +149,7 @@ SvxHatchTabPage::SvxHatchTabPage
void SvxHatchTabPage::Construct()
{
- // Farbtabelle
aLbLineColor.Fill( pColorList );
-
- // Schraffurentabelle
aLbHatchings.Fill( pHatchingList );
}
@@ -163,7 +160,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
sal_uInt16 nPos;
sal_uInt16 nCount;
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
*pbAreaTP = sal_False;
@@ -182,7 +179,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
aLbLineColor.Fill( pColorList );
nCount = aLbLineColor.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbLineColor.SelectEntryPos( 0 );
else
@@ -191,8 +188,8 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
ModifiedHdl_Impl( this );
}
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pHatchingList->GetPath() );
@@ -211,7 +208,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
{
aLbHatchings.SelectEntryPos( *pPos );
}
- // Farben koennten geloescht worden sein
+ // colors could have been deleted
ChangeHatchHdl_Impl( this );
*pPageType = PT_HATCH;
@@ -266,13 +263,13 @@ long SvxHatchTabPage::CheckChanges_Impl()
switch( nRet )
{
- case RET_BTN_1: // Aendern
+ case RET_BTN_1:
{
ClickModifyHdl_Impl( this );
}
break;
- case RET_BTN_2: // Hinzufuegen
+ case RET_BTN_2:
{
ClickAddHdl_Impl( this );
}
@@ -294,11 +291,11 @@ long SvxHatchTabPage::CheckChanges_Impl()
sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 && *pbAreaTP == sal_False ) // Flaechen-Dialog
+ if( *pDlgType == 0 && *pbAreaTP == sal_False ) // area dialog
{
if( *pPageType == PT_HATCH )
{
- // CheckChanges(); <-- doppelte Abfrage ?
+ // CheckChanges(); <-- duplicate inquiry ?
XHatch* pXHatch = NULL;
String aString;
@@ -308,7 +305,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
pXHatch = new XHatch( pHatchingList->GetHatch( nPos )->GetHatch() );
aString = aLbHatchings.GetSelectEntry();
}
- // Farbverlauf wurde (unbekannt) uebergeben
+ // gradient has been (unidentifiedly) passed
else
{
pXHatch = new XHatch( aLbLineColor.GetSelectEntryColor(),
@@ -332,7 +329,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet& rSet )
{
ChangeHatchHdl_Impl( this );
- // Status der Buttons ermitteln
+ // determine button state
if( pHatchingList->Count() )
{
aBtnModify.Enable();
@@ -366,7 +363,6 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
{
if( p == &aMtrAngle )
{
- // Setzen des Winkels im AngleControl
switch( aMtrAngle.GetValue() )
{
case 135: aCtlAngle.SetActualRP( RP_LT ); break;
@@ -426,8 +422,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
{
aLbLineType.SelectEntryPos(
sal::static_int_cast< sal_uInt16 >( pHatch->GetHatchStyle() ) );
- // Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
- // temporaer hinzugenommen
+ // if the entry is not in the listbox
+ // the color is added temporarily
aLbLineColor.SetNoSelection();
aLbLineColor.SelectEntry( pHatch->GetColor() );
if( aLbLineColor.GetSelectEntryCount() == 0 )
@@ -438,7 +434,6 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
SetMetricValue( aMtrDistance, pHatch->GetDistance(), ePoolUnit );
aMtrAngle.SetValue( pHatch->GetAngle() / 10 );
- // Setzen des Winkels im AngleControl
switch( aMtrAngle.GetValue() )
{
case 135: aCtlAngle.SetActualRP( RP_LT ); break;
@@ -452,7 +447,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
default: aCtlAngle.SetActualRP( RP_MM ); break;
}
- // ItemSet fuellen und an aCtlPreview weiterleiten
+ // fill ItemSet and pass it on to aCtlPreview
rXFSet.Put( XFillHatchItem( String(), *pHatch ) );
aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
@@ -552,13 +547,12 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
}
#endif
- // Flag fuer modifiziert setzen
*pnHatchingListState |= CT_MODIFIED;
ChangeHatchHdl_Impl( this );
}
- // Status der Buttons ermitteln
+ // determine button state
if( pHatchingList->Count() )
{
aBtnModify.Enable();
@@ -618,14 +612,13 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
aLbHatchings.SelectEntryPos( nPos );
- // Werte sichern fuer Changes-Erkennung ( -> Methode )
+ // save values for changes recognition (-> method)
aMtrDistance.SaveValue();
aMtrAngle.SaveValue();
aLbLineType.SaveValue();
aLbLineColor.SaveValue();
aLbHatchings.SaveValue();
- // Flag fuer modifiziert setzen
*pnHatchingListState |= CT_MODIFIED;
}
else
@@ -661,11 +654,10 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
ChangeHatchHdl_Impl( this );
- // Flag fuer modifiziert setzen
*pnHatchingListState |= CT_MODIFIED;
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( !pHatchingList->Count() )
{
aBtnModify.Disable();
@@ -723,8 +715,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
pHatchingList->SetName( aURL.getName() );
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (and possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( ResId( RID_SVXSTR_TABLE, rMgr ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -736,9 +728,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gewechselt setzen
*pnHatchingListState |= CT_CHANGED;
- // Flag fuer modifiziert entfernen
*pnHatchingListState &= ~CT_MODIFIED;
}
else
@@ -747,7 +737,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
}
}
- // Status der Buttons ermitteln
+ // determine button state
if ( pHatchingList->Count() )
{
aBtnModify.Enable();
@@ -797,8 +787,8 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
if( pHatchingList->Save() )
{
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (and possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) );
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ": " ) );
@@ -810,9 +800,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
else
aString += String(aURL.getBase());
- // Flag fuer gespeichert setzen
*pnHatchingListState |= CT_SAVED;
- // Flag fuer modifiziert entfernen
*pnHatchingListState &= ~CT_MODIFIED;
}
else
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 2fb8f89..05e9133 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -187,7 +187,7 @@ SvxLineTabPage::SvxLineTabPage
SetFieldUnit( aMtrStartWidth, eFUnit );
SetFieldUnit( aMtrEndWidth, eFUnit );
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Where is the pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH );
@@ -1592,7 +1592,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl)
IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
{
- if( aLbLineStyle.GetSelectEntryPos() == 0 ) // unsichtbar
+ if( aLbLineStyle.GetSelectEntryPos() == 0 ) // invisible
{
aFtColor.Disable();
if(!bSymbols)
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 962caeb..72563d2 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -105,10 +105,10 @@ SvxLineDefTabPage::SvxLineDefTabPage
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Metrik einstellen
+ // adjust metric
eFUnit = GetModuleFieldUnit( rInAttrs );
switch ( eFUnit )
@@ -123,7 +123,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
SetFieldUnit( aMtrLength1, eFUnit );
SetFieldUnit( aMtrLength2, eFUnit );
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH );
@@ -151,11 +151,11 @@ SvxLineDefTabPage::SvxLineDefTabPage
aLbLineStyles.SetSelectHdl(
LINK( this, SvxLineDefTabPage, SelectLinestyleHdl_Impl ) );
- // Absolut (in mm) oder Relativ (in %)
+ // absolute (in mm) or relative (in %)
aCbxSynchronize.SetClickHdl(
LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
- // Wenn sich etwas aendert, muss Preview upgedatet werden werden
+ // preview must be updated when there's something changed
Link aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
aLbType1.SetSelectHdl( aLink );
aLbType2.SetSelectHdl( aLink );
@@ -178,7 +178,6 @@ SvxLineDefTabPage::SvxLineDefTabPage
void SvxLineDefTabPage::Construct()
{
- // Linienstile
aLbLineStyles.Fill( pDashList );
}
@@ -186,9 +185,9 @@ void SvxLineDefTabPage::Construct()
void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
- // ActivatePage() wird aufgerufen bevor der Dialog PageCreated() erhaelt !!!
+ // ActivatePage() is called before the dialog receives PageCreated() !!!
if( pDashList.is() )
{
if( *pPageType == 1 &&
@@ -196,11 +195,11 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
{
aLbLineStyles.SelectEntryPos( *pPosDashLb );
}
- // Damit evtl. vorhandener Linestyle verworfen wird
+ // so that a possibly existing line style is discarded
SelectLinestyleHdl_Impl( this );
- // Ermitteln (evtl. abschneiden) des Namens und in
- // der GroupBox darstellen
+ // determining (and possibly cutting) the name
+ // and displaying it in the GroupBox
String aString( CUI_RES( RID_SVXSTR_TABLE ) ); aString.AppendAscii(
RTL_CONSTASCII_STRINGPARAM( ": " ) );
INetURLObject aURL( pDashList->GetPath() );
@@ -229,7 +228,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
void SvxLineDefTabPage::CheckChanges_Impl()
{
- // wird hier benutzt, um Aenderungen NICHT zu verlieren
+ // is here used to NOT lose changes
//XDashStyle eXDS;
if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() ||
@@ -258,13 +257,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
switch( nRet )
{
- case RET_BTN_1: // Aendern
+ case RET_BTN_1:
{
ClickModifyHdl_Impl( this );
}
break;
- case RET_BTN_2: // Hinzufuegen
+ case RET_BTN_2:
{
ClickAddHdl_Impl( this );
}
@@ -289,7 +288,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
{
- if( *pDlgType == 0 ) // Linien-Dialog
+ if( *pDlgType == 0 ) // line dialog
{
if( *pPageType == 2 )
{
@@ -334,7 +333,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
}
SelectLinestyleHdl_Impl( NULL );
- // Status der Buttons ermitteln
+ // determine button state
if( pDashList->Count() )
{
aBtnModify.Enable();
@@ -379,9 +378,9 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
aCtlPreview.Invalidate();
- // Wird erst hier gesetzt, um den Style nur dann zu uebernehmen,
- // wenn in der ListBox ein Eintrag ausgewaehlt wurde
- // Wenn ueber Reset() gerufen wurde ist p == NULL
+ // Is not set before, in order to take the new style
+ // only if there was an entry selected in the ListBox.
+ // If it was called via Reset(), then p is == NULL
if( p )
*pPageType = 2;
}
@@ -448,7 +447,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
{
long nTmp1, nTmp2, nTmp3;
- // Wurde ueber Control geaendert
+ // was changed with Control
if( p )
{
nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit ) * XOUT_WIDTH / 100;
@@ -465,7 +464,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
aMtrLength2.SetDecimalDigits( 2 );
aMtrDistance.SetDecimalDigits( 2 );
- // Metrik einstellen
+ // adjust metric
aMtrLength1.SetUnit( eFUnit );
aMtrLength2.SetUnit( eFUnit );
aMtrDistance.SetUnit( eFUnit );
@@ -478,7 +477,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
{
long nTmp1, nTmp2, nTmp3;
- // Wurde ueber Control geaendert
+ // was changed with Control
if( p )
{
nTmp1 = GetCoreValue( aMtrLength1, ePoolUnit ) * 100 / XOUT_WIDTH;
@@ -602,12 +601,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
aLbLineStyles.SelectEntryPos( aLbLineStyles.GetEntryCount() - 1 );
- // Flag fuer modifiziert setzen
*pnDashListState |= CT_MODIFIED;
*pPageType = 2;
- // Werte sichern fuer Changes-Erkennung ( -> Methode )
+ // save values for changes recognition (-> method)
aNumFldNumber1.SaveValue();
aMtrLength1.SaveValue();
aLbType1.SaveValue();
@@ -625,7 +623,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
}
delete( pDlg );
- // Status der Buttons ermitteln
+ // determine button state
if ( pDashList->Count() )
{
aBtnModify.Enable();
@@ -683,12 +681,11 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
aLbLineStyles.SelectEntryPos( nPos );
- // Flag fuer modifiziert setzen
*pnDashListState |= CT_MODIFIED;
*pPageType = 2;
- // Werte sichern fuer Changes-Erkennung ( -> Methode )
+ // save values for changes recognition (-> method)
aNumFldNumber1.SaveValue();
aMtrLength1.SaveValue();
aLbType1.SaveValue();
@@ -727,16 +724,15 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
aLbLineStyles.SelectEntryPos( 0 );
SelectLinestyleHdl_Impl( this );
- *pPageType = 0; // Style soll nicht uebernommen werden
+ *pPageType = 0; // style should not be taken
- // Flag fuer modifiziert setzen
*pnDashListState |= CT_MODIFIED;
ChangePreviewHdl_Impl( this );
}
}
- // Status der Buttons ermitteln
+ // determine button state
if ( !pDashList->Count() )
{
aBtnModify.Disable();
@@ -795,9 +791,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
pDashList->SetName( aURL.getName() );
- // Flag fuer gewechselt setzen
*pnDashListState |= CT_CHANGED;
- // Flag fuer modifiziert entfernen
*pnDashListState &= ~CT_MODIFIED;
}
else
@@ -807,7 +801,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
}
}
- // Status der Buttons ermitteln
+ // determine button state
if ( pDashList->Count() )
{
aBtnModify.Enable();
@@ -857,9 +851,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
if( pDashList->Save() )
{
- // Flag fuer gespeichert setzen
*pnDashListState |= CT_SAVED;
- // Flag fuer modifiziert entfernen
*pnDashListState &= ~CT_MODIFIED;
}
else
@@ -918,7 +910,7 @@ void SvxLineDefTabPage::FillDialog_Impl()
ChangeMetricHdl_Impl( NULL );
- // Werte sichern fuer Changes-Erkennung ( -> Methode )
+ // save values for changes recognition (-> method)
aNumFldNumber1.SaveValue();
aMtrLength1.SaveValue();
aLbType1.SaveValue();
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 16f7f3b..ef445d8 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -94,7 +94,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
{
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
rXLSet.Put( aXLStyle );
@@ -163,9 +163,9 @@ void SvxLineEndDefTabPage::Construct()
void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
{
- if( *pDlgType == 0 ) // Flaechen-Dialog
+ if( *pDlgType == 0 ) // area dialog
{
- // ActivatePage() wird aufgerufen bevor der Dialog PageCreated() erhaelt !!!
+ // ActivatePage() is called before the dialog receives PageCreated() !!!
if( pLineEndList.is() )
{
if( *pPosLineEndLb != LISTBOX_ENTRY_NOTFOUND )
@@ -224,7 +224,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
{
- if( *pDlgType == 0 ) // Linien-Dialog
+ if( *pDlgType == 0 ) // line dialog
{
if( *pPageType == 3 )
{
@@ -264,7 +264,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet& )
aCtlPreview.Invalidate();
}
- // Status der Buttons ermitteln
+ // determine button state
if( pLineEndList->Count() )
{
aBtnModify.Enable();
@@ -307,8 +307,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl)
aCtlPreview.Invalidate();
- // Wird erst hier gesetzt, um den Style nur dann zu uebernehmen,
- // wenn in der ListBox ein Eintrag ausgewaehlt wurde
+ // Is not set before, in order to only take the new style,
+ // if there is an entry selected in the ListBox
*pPageType = 3;
}
return( 0L );
@@ -336,12 +336,12 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
long nCount = pLineEndList->Count();
sal_Bool bDifferent = sal_True;
- // Pruefen, ob Name schon vorhanden ist
+ // check whether the name is existing already
for ( long i = 0; i < nCount && bDifferent; i++ )
if ( aName == pLineEndList->GetLineEnd( i )->GetName() )
bDifferent = sal_False;
- // Wenn ja, wird wiederholt ein neuer Name angefordert
+ // if yes, repeat and demand a new name
if ( !bDifferent )
{
WarningBox aWarningBox( GetParentDialog(), WinBits( WB_OK ),
@@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
delete( pDlg );
}
- // Wenn nicht vorhanden, wird Eintrag aufgenommen
+ // if not existing, enter the entry
if( bDifferent )
{
XLineEndEntry* pEntry = pLineEndList->GetLineEnd( nPos );
@@ -385,7 +385,6 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
aLbLineEnds.Modify( pEntry, nPos, pLineEndList->GetBitmap( nPos ) );
aLbLineEnds.SelectEntryPos( nPos );
- // Flag fuer modifiziert setzen
*pnLineEndListState |= CT_MODIFIED;
*pPageType = 3;
@@ -417,20 +416,19 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
pNewObj = pConvPolyObj = pPolyObj->ConvertToPolyObj( sal_True, sal_False );
if( !pNewObj || !pNewObj->ISA( SdrPathObj ) )
- return( 0L ); // Abbruch, zusaetzliche Sicherheit, die bei
- // Gruppenobjekten aber nichts bringt.
+ return( 0L ); // cancel, additional safety, which
+ // has no use for group objects though.
}
- else return( 0L ); // Abbruch
+ else return( 0L ); // cancel
}
basegfx::B2DPolyPolygon aNewPolyPolygon(((SdrPathObj*)pNewObj)->GetPathPoly());
basegfx::B2DRange aNewRange(basegfx::tools::getRange(aNewPolyPolygon));
- // Normalisieren
+ // normalize
aNewPolyPolygon.transform(basegfx::tools::createTranslateB2DHomMatrix(
-aNewRange.getMinX(), -aNewRange.getMinY()));
- // Loeschen des angelegten PolyObjektes
SdrObject::Free( pConvPolyObj );
XLineEndEntry* pEntry;
@@ -482,11 +480,10 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
pLineEndList->Insert( pEntry, nLineEndCount );
Bitmap* pBitmap = pLineEndList->GetBitmap( nLineEndCount );
- // Zur ListBox hinzufuegen
+ // add to the ListBox
aLbLineEnds.Append( pEntry, pBitmap );
aLbLineEnds.SelectEntryPos( aLbLineEnds.GetEntryCount() - 1 );
- // Flag fuer modifiziert setzen
*pnLineEndListState |= CT_MODIFIED;
SelectLineEndHdl_Impl( this );
@@ -503,7 +500,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
else
aBtnAdd.Disable();
- // Status der Buttons ermitteln
+ // determine button state
if ( pLineEndList->Count() )
{
aBtnModify.Enable();
@@ -531,15 +528,14 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
aLbLineEnds.SelectEntryPos( 0 );
SelectLineEndHdl_Impl( this );
- *pPageType = 0; // LineEnd soll nicht uebernommen werden
+ *pPageType = 0; // LineEnd shall not be taken over
- // Flag fuer modifiziert setzen
*pnLineEndListState |= CT_MODIFIED;
ChangePreviewHdl_Impl( this );
}
}
- // Status der Buttons ermitteln
+ // determine button state
if( !pLineEndList->Count() )
{
aBtnModify.Disable();
@@ -596,9 +592,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
pLineEndList->SetName( aURL.getName() );
- // Flag fuer gewechselt setzen
*pnLineEndListState |= CT_CHANGED;
- // Flag fuer modifiziert entfernen
*pnLineEndListState &= ~CT_MODIFIED;
}
else
@@ -607,7 +601,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
}
}
- // Status der Buttons ermitteln
+ // determine button state
if ( pLineEndList->Count() )
{
aBtnModify.Enable();
@@ -657,9 +651,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
if( pLineEndList->Save() )
{
- // Flag fuer gespeichert setzen
*pnLineEndListState |= CT_SAVED;
- // Flag fuer modifiziert entfernen
*pnLineEndListState &= ~CT_MODIFIED;
}
else
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 1197309..1105bae 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -80,10 +80,10 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
{
FreeResource();
- // diese Page braucht ExchangeSupport
+ // this page needs ExchangeSupport
SetExchangeSupport();
- // Metrik einstellen
+ // adjust metric
FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
switch ( eFUnit )
@@ -96,12 +96,12 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
}
SetFieldUnit( aMtrDistance, eFUnit );
- // PoolUnit ermitteln
+ // determine PoolUnit
SfxItemPool* pPool = rOutAttrs.GetPool();
DBG_ASSERT( pPool, "Wo ist der Pool?" );
ePoolUnit = pPool->GetMetric( SDRATTR_SHADOWXDIST );
- // Setzen des Output-Devices
+ // setting the output device
XFillStyle eXFS = XFILL_SOLID;
if( rOutAttrs.GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DONTCARE )
{
@@ -109,7 +109,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
Get( GetWhich( XATTR_FILLSTYLE ) ) ).GetValue() );
switch( eXFS )
{
- //case XFILL_NONE: --> NICHTS
+ //case XFILL_NONE: --> NOTHING
case XFILL_SOLID:
if( SFX_ITEM_DONTCARE != rOutAttrs.GetItemState( XATTR_FILLCOLOR ) )
@@ -183,7 +183,6 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
void SvxShadowTabPage::Construct()
{
- // Farbtabelle fuellen
aLbShadowColor.Fill( pColorList );
if( bDisable )
@@ -241,7 +240,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
aLbShadowColor.Fill( pColorList );
nCount = aLbShadowColor.GetEntryCount();
if( nCount == 0 )
- ; // Dieser Fall sollte nicht auftreten
+ ; // this case should not occur
else if( nCount <= nPos )
aLbShadowColor.SelectEntryPos( 0 );
else
@@ -273,7 +272,6 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
if( !bDisable )
{
- // Schatten
TriState eState = aTsbShowShadow.GetState();
if( eState != aTsbShowShadow.GetSavedValue() )
{
@@ -286,9 +284,9 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
- // Schatten-Entfernung
- // Etwas umstaendliche Abfrage, ob etwas geaendert wurde,
- // da Items nicht direkt auf Controls abbildbar sind
+ // shadow removal
+ // a bit intricate inquiry whether there was something changed,
+ // as the items can't be displayed directly on controls
sal_Int32 nX = 0L, nY = 0L;
sal_Int32 nXY = GetCoreValue( aMtrDistance, ePoolUnit );
@@ -305,15 +303,15 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
case RP_MM: break;
}
- // Wenn die Werte des Schattenabstanden==SFX_ITEM_DONTCARE und der angezeigte
- // String im entspr. MetricField=="", dann w�rde der Vergleich zw. alten und
- // neuen Distance-Werte ein falsches Ergebnis liefern, da in so einem Fall die
- // neuen Distance-Werte den Default-Werten des MetricField entspr�chen !!!!
+ // If the values of the shadow distances==SFX_ITEM_DONTCARE and the displayed
+ // string in the respective MetricField=="", then the comparison of the old
+ // and the new distance values would return a wrong result because in such a
+ // case the new distance values would matche the default values of the MetricField !!!!
if ( !aMtrDistance.IsEmptyFieldValue() ||
rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE ||
rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE )
{
- sal_Int32 nOldX = 9876543; // Unmoeglicher Wert, entspr. DontCare
+ sal_Int32 nOldX = 9876543; // impossible value, so DontCare
sal_Int32 nOldY = 9876543;
if( rOutAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE &&
rOutAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE )
@@ -356,7 +354,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
- // Transparenz
+ // transparency
sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() )
{
@@ -381,10 +379,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
{
if( !bDisable )
{
- // Alle Objekte koennen einen Schatten besitzen
- // z.Z. gibt es nur 8 m�gliche Positionen den Schatten zu setzen
+ // all objects can have a shadow
+ // at the moment there are only 8 possible positions where a shadow can be set
- // Ist Schatten gesetzt?
+ // has a shadow been set?
if( rAttrs.GetItemState( SDRATTR_SHADOW ) != SFX_ITEM_DONTCARE )
{
aTsbShowShadow.EnableTriState( sal_False );
@@ -399,8 +397,8 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
else
aTsbShowShadow.SetState( STATE_DONTKNOW );
- // Entfernung (nur 8 moegliche Positionen), deshalb
- // wird nur ein Item ausgewertet
+ // distance (only 8 possible positions),
+ // so there is only one item evaluated
if( rAttrs.GetItemState( SDRATTR_SHADOWXDIST ) != SFX_ITEM_DONTCARE &&
rAttrs.GetItemState( SDRATTR_SHADOWYDIST ) != SFX_ITEM_DONTCARE )
@@ -413,12 +411,12 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
else
SetMetricValue( aMtrDistance, nY < 0L ? -nY : nY, ePoolUnit );
- // Setzen des Schatten-Controls
+ // setting the shadow control
if ( nX < 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_LT );
else if( nX == 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_MT );
else if( nX > 0L && nY < 0L ) aCtlPosition.SetActualRP( RP_RT );
else if( nX < 0L && nY == 0L ) aCtlPosition.SetActualRP( RP_LM );
- // Mittelpunkt gibt es nicht mehr
+ // there's no center point anymore
else if( nX == 0L && nY == 0L ) aCtlPosition.SetActualRP( RP_RB );
else if( nX > 0L && nY == 0L ) aCtlPosition.SetActualRP( RP_RM );
else if( nX < 0L && nY > 0L ) aCtlPosition.SetActualRP( RP_LB );
@@ -441,14 +439,13 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
SetMetricValue( aMtrDistance, nY < 0L ? -nY : nY, ePoolUnit );
}
- // Tristate, z.B. mehrer Objekte wurden markiert, wovon einige einen Schatten
besitzen, einige nicht.
- // Der anzuzeigende Text des MetricFields wird auf "" gesetzt und dient in der Methode
FillItemSet
- // als Erkennungszeichen daf�r, das der Distance-Wert NICHT ver�ndert wurde !!!!
+ // Tristate, e. g. multiple objects have been marked of which some have a shadow and
some don't.
+ // The text (which shall be displayed) of the MetricFields is set to "" and serves as
an
+ // identification in the method FillItemSet for the fact that the distance value was
NOT changed !!!!
aMtrDistance.SetText( String() );
aCtlPosition.SetActualRP( RP_MM );
}
- // SchattenFarbe:
if( rAttrs.GetItemState( SDRATTR_SHADOWCOLOR ) != SFX_ITEM_DONTCARE )
{
aLbShadowColor.SelectEntry( ( ( const SdrShadowColorItem& ) rAttrs.Get(
SDRATTR_SHADOWCOLOR ) ).GetColorValue() );
@@ -456,7 +453,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
else
aLbShadowColor.SetNoSelection();
- // Transparenz
if( rAttrs.GetItemState( SDRATTR_SHADOWTRANSPARENCE ) != SFX_ITEM_DONTCARE )
{
sal_uInt16 nTransp = ( ( const SdrShadowTransparenceItem& ) rAttrs.Get(
SDRATTR_SHADOWTRANSPARENCE ) ).GetValue();
@@ -465,7 +461,6 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
else
aMtrTransparent.SetText( String() );
- // Werte sichern
//aCtlPosition
aMtrDistance.SaveValue();
aLbShadowColor.SaveValue();
@@ -548,7 +543,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
XFillTransparenceItem aItem( nVal );
rXFSet.Put( XFillTransparenceItem( aItem ) );
- // Schatten-Entfernung
+ // shadow removal
sal_Int32 nX = 0L, nY = 0L;
sal_Int32 nXY = GetCoreValue( aMtrDistance, ePoolUnit );
switch( aCtlPosition.GetActualRP() )
@@ -579,7 +574,7 @@ void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
{
eRP = eRcPt;
- // Schatten neu zeichnen
+ // repaint shadow
ModifyShadowHdl_Impl( pWindow );
}
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 03b5e34..46fe07e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -50,7 +50,7 @@
#include <svl/aeitem.hxx>
#include <swpossizetabpage.hxx>
-// Toleranz fuer WorkingArea
+// tolerance for WorkingArea
#define DIFF 1000
// static ----------------------------------------------------------------
@@ -114,7 +114,7 @@ void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale)
/*************************************************************************
|*
-|* Konstruktor des Tab-Dialogs: Fuegt die Seiten zum Dialog hinzu
+|* constructor of the tab dialog: adds the pages to the dialog
|*
\************************************************************************/
@@ -216,8 +216,8 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
/*************************************************************************
|*
-|* Dialog zum Aendern der Position des Drehwinkels und des Drehwinkels
-|* der Grafikobjekte
+|* dialog for changing the positions of the rotation
+|* angle and the rotation angle of the graphic objects
|*
\************************************************************************/
@@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxAngleTabPage, ModifiedHdl)
/*************************************************************************
|*
-|* Dialog zum Aendern des Eckenradius und zum Schraegstellen
+|* dialog for changing slant and corner radius
|*
\************************************************************************/
@@ -583,7 +583,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
if( bModified )
{
- // Referenzpunkt setzen
+ // set reference points
// #75897#
Rectangle aObjectRect(pView->GetAllMarkedRect());
pView->GetSdrPageView()->LogicToPagePos(aObjectRect);
@@ -604,7 +604,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs)
// if the view has selected objects, items with SFX_ITEM_DEFAULT need to be disabled
const SfxPoolItem* pItem;
- // Eckenradius
+ // corner radius
if(!pView->IsEdgeRadiusAllowed())
{
aFlRadius.Disable();
@@ -630,7 +630,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs)
aMtrRadius.SaveValue();
- // Schraegstellen: Winkel
+ // slant: angle
if( !pView->IsShearAllowed() )
{
aFlAngle.Disable();
@@ -753,7 +753,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
DBG_ASSERT( pPool, "no pool (!)" );
mePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X );
- meRP = RP_LT; // s.o.
+ meRP = RP_LT; // see above
maMtrWidth.SetModifyHdl( LINK( this, SvxPositionSizeTabPage, ChangeWidthHdl ) );
maMtrHeight.SetModifyHdl( LINK( this, SvxPositionSizeTabPage, ChangeHeightHdl ) );
@@ -1089,7 +1089,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet& )
else
maTsbAutoGrowHeight.SetState( STATE_DONTKNOW );
- // Ist Abgleich gesetzt?
+ // Is matching set?
String aStr = GetUserData();
maCbxScale.Check( (sal_Bool)aStr.ToInt32() );
@@ -1679,7 +1679,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl)
void SvxPositionSizeTabPage::FillUserData()
{
- // Abgleich wird in der Ini-Datei festgehalten
+ // matching is saved in the Ini-file
UniString aStr = UniString::CreateFromInt32( (sal_Int32) maCbxScale.IsChecked() );
SetUserData( aStr );
}
--
1.7.9.5
Context
- [PATCH] translated German comments and removed redundant ones · Florian Allmann-Rahn
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.