[Libreoffice-commits] core.git: basctl/source basic/source connectivity/source framework/inc framework/source registry/test sc/source sfx2/source sw/source vcl/source vcl/unx
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Feb 21 13:34:43 UTC 2017
basctl/source/basicide/baside2.cxx | 8 ++--
basctl/source/basicide/basides1.cxx | 8 ++--
basctl/source/basicide/bastype3.cxx | 2 -
basctl/source/basicide/macrodlg.cxx | 2 -
basic/source/classes/sb.cxx | 4 +-
basic/source/classes/sbxmod.cxx | 2 -
basic/source/comp/dim.cxx | 2 -
connectivity/source/drivers/firebird/PreparedStatement.cxx | 2 -
framework/inc/helper/ocomponentenumeration.hxx | 2 -
framework/source/helper/ocomponentenumeration.cxx | 2 -
framework/source/helper/oframes.cxx | 2 -
registry/test/testregcpp.cxx | 26 ++++++-------
sc/source/filter/inc/xlview.hxx | 2 -
sfx2/source/bastyp/fltfnc.cxx | 2 -
sfx2/source/view/viewfrm.cxx | 4 +-
sw/source/filter/html/htmlbas.cxx | 2 -
vcl/source/gdi/CommonSalLayout.cxx | 2 -
vcl/unx/generic/gdi/salgdi.cxx | 2 -
18 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 7bc1c438008517cc9d475a21cdc4a06c6d25eb8f
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Mon Feb 13 22:18:09 2017 +0100
Fix typos/translations, following 04644956e53d
No automatic tools
Change-Id: I3a6d18760f90c4ee02b9380758f97f6fca6c4428
Reviewed-on: https://gerrit.libreoffice.org/30874
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 7a5b1a5..7f89ade 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -318,7 +318,7 @@ void ModulWindow::BasicExecute()
if ( !m_aStatus.bIsRunning )
{
- DBG_ASSERT( m_xModule.is(), "Kein Modul!" );
+ DBG_ASSERT( m_xModule.is(), "No Module!" );
AddStatus( BASWIN_RUNNINGBASIC );
sal_uInt16 nStart, nEnd;
TextSelection aSel = GetEditView()->GetSelection();
@@ -525,7 +525,7 @@ void ModulWindow::ToggleBreakPoint( sal_uLong nLine )
void ModulWindow::UpdateBreakPoint( const BreakPoint& rBrk )
{
- DBG_ASSERT( XModule().is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "No Module!" );
if ( XModule().is() )
{
@@ -696,7 +696,7 @@ void ModulWindow::BasicAddWatch()
void ModulWindow::EditMacro( const OUString& rMacroName )
{
- DBG_ASSERT( XModule().is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "No Module!" );
if ( XModule().is() )
{
@@ -757,7 +757,7 @@ bool ModulWindow::AllowUndo()
void ModulWindow::UpdateData()
{
- DBG_ASSERT( XModule().is(), "Kein Modul!" );
+ DBG_ASSERT( XModule().is(), "No Module!" );
// UpdateData is called when the source has changed from outside
// => interrupts undesired!
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 4d4cde8..3202ce4 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -314,7 +314,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
else
pModule = pBasic->GetModules().front().get();
}
- DBG_ASSERT( pModule, "Kein Modul!" );
+ DBG_ASSERT( pModule, "No Module!" );
if ( pModule && !pModule->GetMethods()->Find( rInfo.GetMethod(), SbxClassType::Method ) )
CreateMacro( pModule, rInfo.GetMethod() );
}
@@ -395,7 +395,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SfxMacroInfoItem& rInfo = static_cast<const SfxMacroInfoItem&>(rReq.GetArgs()->Get(SID_BASICIDE_ARG_MACROINFO ));
BasicManager* pBasMgr = const_cast<BasicManager*>(rInfo.GetBasicManager());
- DBG_ASSERT( pBasMgr, "Store source: Kein BasMgr?" );
+ DBG_ASSERT( pBasMgr, "Store source: No BasMgr?" );
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
VclPtr<ModulWindow> pWin = FindBasWin( aDocument, rInfo.GetLib(), rInfo.GetModule(), false, true );
if ( pWin )
@@ -1184,7 +1184,7 @@ VclPtr<ModulWindow> Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
if (SbClassModuleObject* pCMO = dynamic_cast<SbClassModuleObject*>(pActiveModule))
pActiveModule = pCMO->getClassModule();
- DBG_ASSERT( pActiveModule, "Kein aktives Modul im ErrorHdl?!" );
+ DBG_ASSERT( pActiveModule, "No active module in ErrorHdl!?" );
if ( pActiveModule )
{
VclPtr<ModulWindow> pWin;
@@ -1196,7 +1196,7 @@ VclPtr<ModulWindow> Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
OUString aLibName = pLib->GetName();
pWin = FindBasWin( aDocument, aLibName, pActiveModule->GetName(), true );
- DBG_ASSERT( pWin, "Error/Step-Hdl: Fenster wurde nicht erzeugt/gefunden!" );
+ DBG_ASSERT( pWin, "Error/Step-Hdl: Window was not created/found!" );
SetCurLib( aDocument, aLibName );
SetCurWindow( pWin, true );
}
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 49e2281..c197778 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -221,7 +221,7 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
pVar = static_cast<StarBASIC*>(pVar)->FindModule( aName );
break;
case OBJ_TYPE_METHOD:
- DBG_ASSERT(dynamic_cast<SbxObject*>(pVar), "FindVariable: invalid modul/object");
+ DBG_ASSERT(dynamic_cast<SbxObject*>(pVar), "FindVariable: invalid module/object");
if(!pVar)
{
break;
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 80c820e..66fc105 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -300,7 +300,7 @@ void MacroChooser::DeleteMacro()
}
SbModule* pModule = pMethod->GetModule();
- assert(pModule && "DeleteMacro: Kein Modul?!");
+ assert(pModule && "DeleteMacro: No Module?!");
OUString aSource( pModule->GetSource32() );
sal_uInt16 nStart, nEnd;
pMethod->GetLineRange( nStart, nEnd );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index fde845d..f00b6a2 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -408,7 +408,7 @@ const SFX_VB_ErrorItem SFX_VB_ErrorTab[] =
// The StarBASIC factory is a hack. When a SbModule is created, its pointer
// is saved and given to the following SbProperties/SbMethods. This restores
-// the Modul-relationshop. But it works only when a modul is loaded.
+// the Module-relationship. But it works only when a module is loaded.
// Can cause troubles with separately loaded properties!
SbxBase* SbiFactory::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
@@ -1311,7 +1311,7 @@ SbxVariable* StarBASIC::Find( const OUString& rName, SbxClassType t )
{
if( pModule->IsVisible() )
{
- // Remember modul fpr Main() call
+ // Remember module for Main() call
// or is the name equal?!?
if( pModule->GetName().equalsIgnoreAsciiCase( rName ) )
{
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index dd92692..79f210a 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -442,7 +442,7 @@ IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit, void*, void )
QuitApplication();
}
-// A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
+// A Basic module has set EXTSEARCH, so that the elements, that the module contains,
// could be found from other module.
SbModule::SbModule( const OUString& rName, bool bVBACompat )
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 2bdf696..dc6522c 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -298,7 +298,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
SbiSymDef* pDef;
SbiExprListPtr pDim;
- // #40689, Statics -> Modul-Initialising, skip in Sub
+ // #40689, Statics -> Module-Initialising, skip in Sub
sal_uInt32 nEndOfStaticLbl = 0;
if( !bVBASupportOn && bStatic )
{
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 970c24c..dbef990 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -304,7 +304,7 @@ namespace {
/**
* Take out the number part of a fix point decimal without
- * the information of where is the fracional part from a
+ * the information of where is the fractional part from a
* string representation of a number. (e.g. 54.654 -> 54654)
*/
sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource)
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index af76786..cb25523 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -146,7 +146,7 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper< css::container::X
// (should be private everyway!)
/*-****************************************************************************************************
- @short debug-method to check incoming parameter of some other mehods of this class
+ @short debug-method to check incoming parameter of some other methods of this class
@descr The following methods are used to check parameters for other methods
of this class. The return value is used directly for an ASSERT(...).
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 673a0a3..fd663af 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -93,7 +93,7 @@ Any SAL_CALL OComponentEnumeration::nextElement()
return aComponent;
}
-// proteced method
+// protected method
void OComponentEnumeration::impl_resetObject()
{
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 687a25d..6453aa7 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL OFrames::hasElements()
return bHasElements;
}
-// proteced method
+// protected method
void OFrames::impl_resetObject()
{
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index bc9d447..d222b45 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -57,67 +57,67 @@ void test_coreReflection()
RTConstValue aConst;
- writer.setDoku(OUString("Hallo ich bin ein Modul"));
+ writer.setDoku(OUString("Hello I am a module"));
writer.setFileName(OUString("DummyFile"));
aConst.m_type = RT_TYPE_BOOL;
aConst.m_value.aBool = sal_True;
writer.setFieldData(0, OUString("aConstBool"),
OUString("boolean"),
- OUString("ich bin ein boolean"),
+ OUString("I am a boolean"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_BYTE;
aConst.m_value.aByte = 127;
writer.setFieldData(1, OUString("aConstByte"),
OUString("byte"),
- OUString("ich bin ein byte"),
+ OUString("I am a byte"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_INT16;
aConst.m_value.aShort = -10;
writer.setFieldData(2, OUString("aConstShort"),
OUString("short"),
- OUString("ich bin ein short"),
+ OUString("I am a short"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_UINT16;
aConst.m_value.aUShort = 10;
writer.setFieldData(3, OUString("aConstUShort"),
OUString("unsigned short"),
- OUString("ich bin ein unsigned short"),
+ OUString("I am an unsigned short"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_INT32;
aConst.m_value.aLong = -100000;
writer.setFieldData(4, OUString("aConstLong"),
OUString("long"),
- OUString("ich bin ein long"),
+ OUString("I am a long"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_UINT32;
aConst.m_value.aULong = 100000;
writer.setFieldData(5, OUString("aConstULong"),
OUString("unsigned long"),
- OUString("ich bin ein unsigned long"),
+ OUString("I am an unsigned long"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_INT64;
aConst.m_value.aHyper = -100000000;
writer.setFieldData(6, OUString("aConstHyper"),
OUString("hyper"),
- OUString("ich bin ein hyper"),
+ OUString("I am an hyper"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_UINT64;
aConst.m_value.aUHyper = 100000000;
writer.setFieldData(7, OUString("aConstULong"),
OUString("unsigned long"),
- OUString("ich bin ein unsigned long"),
+ OUString("I am an unsigned long"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_FLOAT;
aConst.m_value.aFloat = -2e-10f;
writer.setFieldData(8, OUString("aConstFloat"),
OUString("float"),
- OUString("ich bin ein float"),
+ OUString("I am a float"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_DOUBLE;
aConst.m_value.aDouble = -2e-100; writer.setFieldData(9, OUString("aConstDouble"),
OUString("double"),
- OUString("ich bin ein double"),
+ OUString("I am a double"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
aConst.m_type = RT_TYPE_STRING;
OUString tmpStr("dies ist ein unicode string");
@@ -125,7 +125,7 @@ void test_coreReflection()
writer.setFieldData(10, OUString("aConstString"),
OUString("string"),
- OUString("ich bin ein string"),
+ OUString("I am a string"),
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
const sal_uInt8* pBlop = writer.getBlop();
@@ -152,7 +152,7 @@ void test_coreReflection()
aReadConst = reader.getFieldConstValue(10);
OString aConstStr = OUStringToOString(aConst.m_value.aString, RTL_TEXTENCODING_ASCII_US);
- REG_ENSURE(aConstStr.equals("dies ist ein unicode string"), "testCoreReflection error 9b");
+ REG_ENSURE(aConstStr.equals("this is an unicode string"), "testCoreReflection error 9b");
}
}
diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx
index 5bdd68d..4de059d 100644
--- a/sc/source/filter/inc/xlview.hxx
+++ b/sc/source/filter/inc/xlview.hxx
@@ -142,7 +142,7 @@ struct XclTabViewData
bool mbShowOutline; /// true = Show outlines.
Color maTabBgColor; /// Tab Color default = (COL_AUTO )
bool IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO); };
- sal_uInt32 mnTabBgColorId; /// pallette color id
+ sal_uInt32 mnTabBgColorId; /// palette color id
explicit XclTabViewData();
~XclTabViewData();
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 3132535..96d1fa1 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1117,7 +1117,7 @@ void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
if( xFilterCFG.is() && xTypeCFG.is() )
{
- // select right query to get right set of filters for search modul
+ // select right query to get right set of filters for search module
uno::Sequence< OUString > lFilterNames = xFilterCFG->getElementNames();
if ( lFilterNames.getLength() )
{
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 0805bd8..3f1b106 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2404,7 +2404,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra
/*
add new recorded dispatch macro script into the application global basic
lib container. It generates a new unique id for it and insert the macro
- by using this number as name for the modul
+ by using this number as name for the module
*/
void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
{
@@ -2549,7 +2549,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
sRoutine.append(sMacro);
sRoutine.append( "\nend sub\n" );
- // create the modul inside the library and insert the macro routine
+ // create the module inside the library and insert the macro routine
aTemp <<= sRoutine.makeStringAndClear();
if ( bReplace )
{
diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx
index 4259e91..539c07d 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -241,7 +241,7 @@ void SwHTMLParser::InsertBasicDocEvent( const OUString& aEvent, const OUString&
return;
SwDocShell *pDocSh = m_xDoc->GetDocShell();
- OSL_ENSURE( pDocSh, "Wo ist die DocShell?" );
+ OSL_ENSURE( pDocSh, "Where is the DocShell?" );
if( !pDocSh )
return;
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 3451478..70cf6fb 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -827,7 +827,7 @@ bool CommonSalLayout::IsKashidaPosValid(int nCharPos) const
{
// The position is the first glyphs, this would happen if we
// changed the text styling in the middle of a word. Since we don’t
- // do ligatures accross layout engine instances, thid can’t be a
+ // do ligatures across layout engine instances, this can’t be a
// ligature so it should be fine.
if (pIter == m_GlyphItems.begin())
return true;
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 5a937fc..e8683df 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -250,7 +250,7 @@ bool X11SalGraphics::GetDitherPixmap( SalColor nSalColor )
char pBits[64];
char *pBitsPtr = pBits;
- // Set the pallette-entries for the dithering tile
+ // Set the palette-entries for the dithering tile
sal_uInt8 nSalColorRed = SALCOLOR_RED ( nSalColor );
sal_uInt8 nSalColorGreen = SALCOLOR_GREEN ( nSalColor );
sal_uInt8 nSalColorBlue = SALCOLOR_BLUE ( nSalColor );
More information about the Libreoffice-commits
mailing list