[Libreoffice-commits] core.git: 5 commits - include/svtools include/svx sc/source svx/source
Sven Wehner
mail at svenwehner.de
Wed Jan 15 02:25:14 PST 2014
include/svtools/imapobj.hxx | 4 +--
include/svtools/prnsetup.hxx | 6 ++---
include/svx/svdocapt.hxx | 8 +++----
sc/source/ui/unoobj/nameuno.cxx | 44 +++++++++++++++++++--------------------
svx/source/tbxctrls/tbcontrl.cxx | 4 +--
5 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 4ce40e26509ed6ad444fd41bef4f200982b0a650
Author: Sven Wehner <mail at svenwehner.de>
Date: Tue Jan 14 22:59:30 2014 +0100
Translate German comments to English
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index bda2c8f..0bc0b8d 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -81,7 +81,7 @@ SC_SIMPLE_SERVICE_INFO( ScNamedRangesObj, "ScNamedRangesObj", "com.sun.star.shee
static bool lcl_UserVisibleName(const ScRangeData& rData)
{
- //! als Methode an ScRangeData
+ //! as method to ScRangeData
return !rData.HasType(RT_DATABASE);
}
@@ -103,13 +103,13 @@ ScNamedRangeObj::~ScNamedRangeObj()
void ScNamedRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Ref-Update interessiert nicht
+ // reference update is of no interest
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // became invalid
}
-// Hilfsfuntionen
+// Helper functions
ScRangeData* ScNamedRangeObj::GetRangeData_Impl()
{
@@ -207,7 +207,7 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray*
}
else
{
- pNew = NULL; //! uno::Exception/Fehler oder so
+ pNew = NULL; //! uno::Exception/Error or something
delete pNewRanges;
}
}
@@ -223,7 +223,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName )
throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- //! Formeln anpassen ?????
+ //! adapt formulas ?????
OUString aNewStr(aNewName);
// GRAM_PODF_A1 for API compatibility.
@@ -358,7 +358,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells()
ScRangeData* pData = GetRangeData_Impl();
if ( pData && pData->IsValidReference( aRange ) )
{
- //! static Funktion um ScCellObj/ScCellRangeObj zu erzeugen am ScCellRangeObj ???
+ //! static function to create ScCellObj/ScCellRangeObj at ScCellRangeObj ???
if ( aRange.aStart == aRange.aEnd )
return new ScCellObj( pDocShell, aRange.aStart );
@@ -485,12 +485,12 @@ ScNamedRangesObj::~ScNamedRangesObj()
void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update is of no interest
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // became invalid
}
}
@@ -546,7 +546,7 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress&
sheet::Border aBorder ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- //! das darf kein enum sein, weil mehrere Bits gesetzt sein koennen !!!
+ //! this cannot be an enum, because multiple bits can be set !!!
sal_Bool bTop = ( aBorder == sheet::Border_TOP );
sal_Bool bLeft = ( aBorder == sheet::Border_LEFT );
@@ -644,7 +644,7 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< sheet::XNamedRange >*)0); // must be suitable for getByIndex
}
sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException)
@@ -709,7 +709,7 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames()
ScRangeName* pNames = GetRangeName_Impl();
if (pNames)
{
- long nVisCount = getCount(); // Namen mit lcl_UserVisibleName
+ long nVisCount = getCount(); // names with lcl_UserVisibleName
uno::Sequence<OUString> aSeq(nVisCount);
OUString* pAry = aSeq.getArray();
sal_uInt16 nVisPos = 0;
@@ -960,10 +960,10 @@ void ScLabelRangeObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
//! Ref-Update !!!
if ( rHint.ISA( SfxSimpleHint ) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // became invalid
}
-// Hilfsfuntionen
+// Helper functions
ScRangePair* ScLabelRangeObj::GetData_Impl()
{
@@ -990,7 +990,7 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData )
ScRangePair* pEntry = xNewList->Find( aRange );
if (pEntry)
{
- xNewList->Remove( pEntry ); // nur aus der Liste entfernt, nicht geloescht
+ xNewList->Remove( pEntry ); // only removed from list, not deleted
if ( pLabel )
pEntry->GetRange(0) = *pLabel;
@@ -1009,10 +1009,10 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData )
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
pDocShell->SetDocumentModified();
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (here and from dialog)
if ( pLabel )
- aRange = *pLabel; // Objekt anpassen, um Range wiederzufinden
+ aRange = *pLabel; // adapt object to find range again
}
}
}
@@ -1077,12 +1077,12 @@ ScLabelRangesObj::~ScLabelRangesObj()
void ScLabelRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
- // Referenz-Update interessiert hier nicht
+ // reference update is of no interest
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
{
- pDocShell = NULL; // ungueltig geworden
+ pDocShell = NULL; // became invalid
}
}
@@ -1132,7 +1132,7 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre
pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID );
pDocShell->SetDocumentModified();
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (here and from dialog)
}
}
}
@@ -1167,7 +1167,7 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex )
pDocShell->SetDocumentModified();
bDone = sal_True;
- //! Undo ?!?! (hier und aus Dialog)
+ //! Undo ?!?! (here and from dialog)
}
}
}
@@ -1214,7 +1214,7 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex )
uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // muss zu getByIndex passen
+ return ::getCppuType((const uno::Reference< sheet::XLabelRange >*)0); // must be suitable for getByIndex
}
commit a47a3537bf6851e0842cd784f59d76c876df5b61
Author: Sven Wehner <mail at svenwehner.de>
Date: Tue Jan 14 22:33:19 2014 +0100
Translate German comments to English
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6d6befa..23acf88 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1675,7 +1675,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
// -----------------------------------------------------------------------
//########################################################################
-// Hilfsklassen
+// Helper classes
//========================================================================
// class SfxStyleControllerItem_Impl ------------------------------------------
@@ -1685,7 +1685,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
const Reference< XDispatchProvider >& rDispatchProvider,
sal_uInt16 nSlotId, // Family-ID
const OUString& rCommand, // .uno: command bound to this item
- SvxStyleToolBoxControl& rTbxCtl ) // Controller-Instanz, dem dieses Item zugeordnet ist.
+ SvxStyleToolBoxControl& rTbxCtl ) // controller instance, which the item is assigned to.
: SfxStatusListener( rDispatchProvider, nSlotId, rCommand ),
rControl( rTbxCtl )
{
commit a0dff5e2e2e2c5418087927a354e2091629c4ac9
Author: Sven Wehner <mail at svenwehner.de>
Date: Tue Jan 14 22:26:52 2014 +0100
Translate German comments to English
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 6181035..7b922dd 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -24,7 +24,7 @@
#include <svx/svxdllapi.h>
//************************************************************
-// Vorausdeklarationen
+// Forward Declarations
//************************************************************
class ImpCaptParams;
@@ -34,7 +34,7 @@ namespace sdr { namespace properties {
}}
//************************************************************
-// Hilfsklasse SdrCaptObjGeoData
+// Helper Class SdrCaptObjGeoData
//************************************************************
// #109872#
@@ -53,14 +53,14 @@ class SVX_DLLPUBLIC SdrCaptionObj : public SdrRectObj
private:
// to allow sdr::properties::CaptionProperties access to ImpRecalcTail()
friend class sdr::properties::CaptionProperties;
- friend class SdrTextObj; // fuer ImpRecalcTail() bei AutoGrow
+ friend class SdrTextObj; // for ImpRecalcTail() during AutoGrow
protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
private:
- Polygon aTailPoly; // das ganze Polygon des Schwanzes
+ Polygon aTailPoly; // the whole tail polygon
sal_Bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE
sal_Bool mbFixedTail; // for calc note box fixed tail, default FALSE
Point maFixedTailPos; // for calc note box fixed tail position.
commit 8e7275ebe52c6d5f350b54f87f9ea5c36bc74ef6
Author: Sven Wehner <mail at svenwehner.de>
Date: Tue Jan 14 22:22:59 2014 +0100
Translate German comments to English
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 006a70d..593b95e 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -73,9 +73,9 @@ public:
void SetOptionsHdl( const Link& rLink );
};
-// --------------------------------------
-// - Hilfsfunktionen fuer Print-Dialoge -
-// --------------------------------------
+// -------------------------------------
+// - Helper functions for print dialog -
+// -------------------------------------
#define IMPL_PRINTDLG_STATUS_UPDATE 15000
commit c9b20ca3e69d346a0bcd3766fd4de84e478f2426
Author: Sven Wehner <mail at svenwehner.de>
Date: Tue Jan 14 22:18:53 2014 +0100
Translate German comments to English
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index bd314d9..f04cbb7 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -64,11 +64,11 @@ class SVT_DLLPUBLIC IMapObject
protected:
sal_uInt16 nReadVersion;
- // Binaer-Im-/Export
+ // binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const = 0;
virtual void ReadIMapObject( SvStream& rIStm ) = 0;
- // Hilfsmethoden
+ // helper methods
void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const;
void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const;
void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const;
More information about the Libreoffice-commits
mailing list