From 2c3f58eff2bac36e39d81c1f8facce5ed6a1ffd2 Mon Sep 17 00:00:00 2001 From: Johnny_M Date: Sat, 13 May 2017 15:23:33 +0200 Subject: Translate German comments and debug strings (leftovers in dirs a... to c...) Translates all (leftovers) found using a custom regex, in directories not shown by /bin/find-german-comments and beginning with "a" to "c". Change-Id: I3b0152ee78ad80a29d714cbd98bf888f31be4763 Reviewed-on: https://gerrit.libreoffice.org/37573 Reviewed-by: Eike Rathke Tested-by: Eike Rathke --- basctl/source/basicide/baside2b.cxx | 2 +- basctl/source/basicide/basidesh.src | 4 +- basctl/source/basicide/bastype2.cxx | 2 +- basctl/source/basicide/breakpoint.cxx | 2 +- basctl/source/basicide/macrodlg.cxx | 2 +- basic/source/classes/sbxmod.cxx | 2 +- basic/source/comp/codegen.cxx | 2 +- basic/source/inc/filefmt.hxx | 4 +- basic/source/runtime/methods.cxx | 2 +- basic/source/runtime/runtime.cxx | 4 +- .../sidebar/ChartSidebarSelectionListener.hxx | 2 +- cli_ure/readme.txt | 2 +- comphelper/source/misc/syntaxhighlight.cxx | 2 +- comphelper/source/streaming/basicio.cxx | 2 +- comphelper/source/streaming/oslfile2streamwrap.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 4 +- connectivity/source/drivers/dbase/dindexnode.cxx | 12 +++--- connectivity/source/drivers/file/FResultSet.cxx | 2 +- connectivity/source/drivers/jdbc/Array.cxx | 8 ++-- connectivity/source/drivers/jdbc/Blob.cxx | 8 ++-- .../source/drivers/jdbc/CallableStatement.cxx | 42 +++++++++---------- connectivity/source/drivers/jdbc/Clob.cxx | 6 +-- connectivity/source/drivers/jdbc/InputStream.cxx | 2 +- connectivity/source/drivers/jdbc/JConnection.cxx | 6 +-- connectivity/source/drivers/jdbc/JStatement.cxx | 38 ++++++++--------- .../source/drivers/jdbc/PreparedStatement.cxx | 48 +++++++++++----------- connectivity/source/drivers/jdbc/Reader.cxx | 4 +- connectivity/source/drivers/jdbc/ResultSet.cxx | 26 ++++++------ connectivity/source/drivers/odbc/OFunctions.cxx | 2 +- cui/source/tabpages/numfmt.cxx | 2 +- cui/source/tabpages/tplneend.cxx | 2 +- 31 files changed, 124 insertions(+), 124 deletions(-) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bc137c171825..afc85ea00b70 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1237,7 +1237,7 @@ void EditorWindow::DoSyntaxHighlight( sal_uLong nPara ) void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara ) { - // line is only added to 'Liste' (list), processed in TimerHdl + // line is only added to list, processed in TimerHdl // => don't manipulate breaks while EditEngine is formatting if ( pProgress ) pProgress->StepProgress(); diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 0fd062d44fd5..1aa3f828e3b4 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -147,12 +147,12 @@ String RID_STR_BASIC }; String RID_STR_LINE { - // Abkuerzung fuer 'Zeile' + // Abbreviation for 'line' Text [ en-US ] = "Ln" ; }; String RID_STR_COLUMN { - // Abkuerzung fuer 'Spalte' + // Abbreviation for 'column' Text [ en-US ] = "Col" ; }; String RID_BASICIDE_OBJECTBAR diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 39f026b651ac..ca63f9ca569e 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -606,7 +606,7 @@ SvTreeListEntry* TreeListBox::CloneEntry( SvTreeListEntry* pSource ) SvTreeListEntry* pNew = SvTreeListBox::CloneEntry( pSource ); Entry* pUser = static_cast(pSource->GetUserData()); - assert(pUser && "User-Daten?!"); + assert(pUser && "User data?!"); DBG_ASSERT( pUser->GetType() != OBJ_TYPE_DOCUMENT, "TreeListBox::CloneEntry: document?!" ); Entry* pNewUser = new Entry( *pUser ); diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx index 8e8973d7b2bd..23ce9a8e674e 100644 --- a/basctl/source/basicide/breakpoint.cxx +++ b/basctl/source/basicide/breakpoint.cxx @@ -59,7 +59,7 @@ void BreakPointList::InsertSorted(BreakPoint* pNewBrk) { if ( pNewBrk->nLine <= (*i)->nLine ) { - DBG_ASSERT( (*i)->nLine != pNewBrk->nLine, "BreakPoint existiert schon!" ); + DBG_ASSERT( (*i)->nLine != pNewBrk->nLine, "BreakPoint exists already!" ); maBreakPoints.insert( i, pNewBrk ); return; } diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index db4f1142942f..b77778efe407 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -539,7 +539,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void ) IMPL_LINK_NOARG( MacroChooser, EditModifyHdl, Edit&, void ) { - // select the module in which the macro is put at Neu (new), + // select the module in which the macro is put at "new", // if BasicManager or Lib is selecting SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry(); if ( pCurEntry ) diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index aca923d8c7d5..9f74c7415172 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -2063,7 +2063,7 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller ) SAL_INFO("basic", "SbMethod::Call Have been passed a caller 0x" << pCaller ); mCaller = pCaller; } - // RefCount vom Modul hochzaehlen + // Increment the RefCount of the module tools::SvRef pMod_ = static_cast(GetParent()); tools::SvRef pBasic = static_cast(pMod_->GetParent()); diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 94e1356394ba..a3acf6732b9f 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -180,7 +180,7 @@ void SbiCodeGen::Save() { p->SetFlag( SbiImageFlags::INITCODE ); } - // Die Entrypoints: + // The entry points: for( SbiSymDef* pDef = pParser->aPublics.First(); pDef; pDef = pParser->aPublics.Next() ) { diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx index 94be6db80b39..03ef2f0dc3ab 100644 --- a/basic/source/inc/filefmt.hxx +++ b/basic/source/inc/filefmt.hxx @@ -156,8 +156,8 @@ enum class FileOffset { // sal_uInt32 the record's length // sal_uInt16 number of strings // Data for every public: -// sal_uInt16 1. Zeile (Sub XXX) -// sal_uInt16 2. Zeile (End Sub) +// sal_uInt16 1st line (Sub XXX) +// sal_uInt16 2nd line (End Sub) // SBX-objects: // sal_uInt16 number of objects diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 3fd6e025a7c9..42c4a4703364 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -3647,7 +3647,7 @@ RTLFUNC(Rnd) // Syntax: Shell("Path",[ Window-Style,[ "Params", [ bSync = sal_False ]]]) -// WindowStyles (VBA-kompatibel): +// WindowStyles (VBA compatible): // 2 == Minimized // 3 == Maximized // 10 == Full-Screen (text mode applications OS/2, WIN95, WNT) diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 526c51054513..5314e8f413c7 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -203,7 +203,7 @@ SbiRuntime::pStep0 SbiRuntime::aStep0[] = { // all opcodes without operands SbiRuntime::pStep1 SbiRuntime::aStep1[] = { // all opcodes with one operand &SbiRuntime::StepLOADNC, // loading a numeric constant (+ID) &SbiRuntime::StepLOADSC, // loading a string constant (+ID) - &SbiRuntime::StepLOADI, // Immediate Load (+Wert) + &SbiRuntime::StepLOADI, // Immediate Load (+value) &SbiRuntime::StepARGN, // save a named Args in Argv (+StringID) &SbiRuntime::StepPAD, // bring string to a definite length (+length) // branches @@ -2777,7 +2777,7 @@ void SbiRuntime::StepLOADSC( sal_uInt32 nOp1 ) PushVar( p ); } -// Immediate Load (+Wert) +// Immediate Load (+value) void SbiRuntime::StepLOADI( sal_uInt32 nOp1 ) { diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index bf3bdbd2558a..4f2b082dc823 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -36,7 +36,7 @@ public: // listen to all chart selection changes explicit ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); - // only liste to the changes of eType + // only listen to the changes of eType ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType); virtual ~ChartSidebarSelectionListener() override; diff --git a/cli_ure/readme.txt b/cli_ure/readme.txt index 2567c351aa45..89fe2172aba6 100644 --- a/cli_ure/readme.txt +++ b/cli_ure/readme.txt @@ -187,7 +187,7 @@ CLI_URETYPES_POLICY_ASSEMBLY=policy.2.0.cli_uretypes Because a change of a major is only done if the code has changed incompatibly, we must not redirect old client code to the new assembly. Actually we would not need a policy file here. The name of the policy file has changed as well so as to refer to the new version. Since -the name is new and refers to the version 2 auf cli_uretypes, we can start with the policy version +the name is new and refers to the version 2 of cli_uretypes, we can start with the policy version from 1. The next compatible change would require to change the version to these: diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 31e923fcf40c..bcfdb3f15fa0 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -338,7 +338,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const sal_Unicode*& pos, /*out*/ bool bIdentifierChar; do { - // Naechstes Zeichen holen + // Fetch next character c = *pos; bIdentifierChar = testCharFlags( c, CharFlags::InIdentifier ); if( bIdentifierChar ) diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 0caf2ab683fa..98d8174f1d63 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -53,7 +53,7 @@ const css::uno::Reference& operator >> ( const css::uno::Reference& _rxInStream, css::awt::FontDescriptor& _rFont) { - // schreiben des Fontdescriptors + // writing the FontDescriptor _rFont.Name = _rxInStream->readUTF(); _rFont.Height = _rxInStream->readShort(); _rFont.Width = _rxInStream->readShort(); diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 1a9c1200db5c..888e0134f799 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -58,7 +58,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 if (eError != FileBase::E_None) throw css::io::BufferSizeExceededException(OUString(),static_cast(this)); - // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen + // If the read character < MaxLength, adjust css::uno::Sequence if (nRead < (sal_uInt32)nBytesToRead) aData.realloc( sal::static_int_cast< sal_Int32 >(nRead) ); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 8a343a3404a9..d1b8960f79da 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1316,7 +1316,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) switch(cTyp) { case 'C': - OSL_ENSURE(nPrecision < 255, "ODbaseTable::Create: Column zu lang!"); + OSL_ENSURE(nPrecision < 255, "ODbaseTable::Create: Column too long!"); if (nPrecision > 254) { throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName); @@ -1328,7 +1328,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) case 'F': case 'N': OSL_ENSURE(nPrecision >= nScale, - "ODbaseTable::Create: Feldlaenge muss groesser Nachkommastellen sein!"); + "ODbaseTable::Create: Field length must be larger than decimal places!"); if (nPrecision < nScale) { throwInvalidColumnType(STR_INVALID_PRECISION_SCALE, aName); diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 0130de2905d0..7ad42f34f5dd 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -334,7 +334,7 @@ bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode) bool ONDXPage::Append(ONDXNode& rNode) { - DBG_ASSERT(!IsFull(), "kein Append moeglich"); + DBG_ASSERT(!IsFull(), "no Append possible"); return Insert(nCount, rNode); } @@ -476,8 +476,8 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage) void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage) { - DBG_ASSERT(HasParent(), "kein Vater vorhanden"); - DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau"); + DBG_ASSERT(HasParent(), "no parent existing"); + DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Wrong index setup"); /* Merge 2 pages */ ONDXNode aResultNode; @@ -1027,20 +1027,20 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch, ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) { - DBG_ASSERT(nCount > nPos, "falscher Indexzugriff"); + DBG_ASSERT(nCount > nPos, "incorrect index access"); return ppNodes[nPos]; } const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const { - DBG_ASSERT(nCount > nPos, "falscher Indexzugriff"); + DBG_ASSERT(nCount > nPos, "incorrect index access"); return ppNodes[nPos]; } void ONDXPage::Remove(sal_uInt16 nPos) { - DBG_ASSERT(nCount > nPos, "falscher Indexzugriff"); + DBG_ASSERT(nCount > nPos, "incorrect index access"); for (sal_uInt16 i = nPos; i < (nCount-1); i++) (*this)[i] = (*this)[i+1]; diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 56ddbd7c2821..eabbb78a0cfe 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1291,7 +1291,7 @@ bool OResultSet::OpenImpl() m_pFileSet->get().push_back(i + 1); } } - OSL_ENSURE(m_pFileSet.is(),"Kein KeySet vorhanden! :-("); + OSL_ENSURE(m_pFileSet.is(),"No KeySet existing! :-("); if(bDistinct && m_pFileSet.is()) { diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 9322687a0b29..9cc6ecc50741 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -54,7 +54,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jobject obj = convertTypeMapToJavaMap(typeMap); static const char * const cSignature = "(Ljava/util/Map;)[Ljava/lang/Object;"; @@ -72,7 +72,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jobject obj = convertTypeMapToJavaMap(typeMap); static const char * const cSignature = "(IILjava/util/Map;)[Ljava/lang/Object;"; @@ -90,7 +90,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // convert Parameter jobject obj = convertTypeMapToJavaMap(typeMap); @@ -110,7 +110,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // convert parameter jobject obj = convertTypeMapToJavaMap(typeMap); diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index 7f0581104ada..ec4bb0b0e74b 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -51,7 +51,7 @@ jclass java_sql_Blob::getMyClass() const sal_Int64 SAL_CALL java_sql_Blob::length( ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // initialize temporary variable @@ -68,7 +68,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); css::uno::Sequence< sal_Int8 > aSeq; { // initialize temporary variable @@ -93,7 +93,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getBinaryStream","()Ljava/io/InputStream;", mID); // WARNING: the caller becomes the owner of the returned pointer @@ -103,7 +103,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinarySt sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // initialize temporary variable diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index f9c3d426bdbf..769cc520e147 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -70,7 +70,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTyp sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethod( "wasNull", mID ); @@ -78,14 +78,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; @@ -97,7 +97,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); Sequence< sal_Int8 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jbyteArray out = static_cast(callObjectMethodWithIntArg(t.pEnv,"getBytes","(I)[B", mID, columnIndex)); @@ -112,7 +112,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); @@ -120,7 +120,7 @@ css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIn } double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); double (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod; @@ -129,7 +129,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod; @@ -138,7 +138,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); @@ -146,7 +146,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod; @@ -155,7 +155,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callObjectMethodWithIntArg(t.pEnv,"getObject","(I)Ljava/lang/Object;", mID, columnIndex); @@ -165,7 +165,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod; @@ -176,7 +176,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callStringMethodWithIntArg("getString",mID,columnIndex); @@ -184,7 +184,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); @@ -194,7 +194,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); @@ -206,7 +206,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -227,7 +227,7 @@ void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -265,7 +265,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getChara Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); @@ -275,7 +275,7 @@ Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sa Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); @@ -284,7 +284,7 @@ Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_ } Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); @@ -294,7 +294,7 @@ Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_ Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); @@ -318,7 +318,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); if( t.pEnv && !object ){ // initialize temporary variable static const char * const cMethodName = "prepareCall"; diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index e309a32ffb52..3793b3c7543c 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -50,7 +50,7 @@ jclass java_sql_Clob::getMyClass() const sal_Int64 SAL_CALL java_sql_Clob::length( ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // initialize temporary variable @@ -67,7 +67,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); OUString aStr; { // initialize temporary variable @@ -97,7 +97,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacte sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) { jlong out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jvalue args[1]; diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index a33d3786892a..856c0de38fb1 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -86,7 +86,7 @@ sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 throw css::io::BufferSizeExceededException( THROW_WHERE, *this ); jint out(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jbyteArray pByteArray = t.pEnv->NewByteArray(nBytesToRead); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index fce0c21ccd8e..d089a3e43e0e 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -341,7 +341,7 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) Reference< XDatabaseMetaData > xMetaData = m_xMetaData; if(!xMetaData.is()) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/DatabaseMetaData;", mID); if(out) @@ -416,7 +416,7 @@ Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMa ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); callObjectMethod(t.pEnv,"getTypeMap","()Ljava/util/Map;", mID); // WARNING: the caller becomes the owner of the returned pointer @@ -533,7 +533,7 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); OUString aStr; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // initialize temporary Variable diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 444a1f58a500..24a0910f6910 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -148,7 +148,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); // initialize temporary Variable try @@ -185,7 +185,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) void SAL_CALL java_sql_Statement_Base::cancel( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("cancel",mID); @@ -205,7 +205,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) void SAL_CALL java_sql_Statement::clearBatch( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -222,7 +222,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); jboolean out(false); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); m_sSqlStatement = sql; @@ -256,7 +256,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_QUERY, sql ); jobject out(nullptr); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -303,7 +303,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -317,7 +317,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); Sequence< sal_Int32 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jintArray out = static_cast(callObjectMethod(t.pEnv,"executeBatch","()[I", mID)); @@ -338,7 +338,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_UPDATE, sql ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); m_sSqlStatement = sql; static jmethodID mID(nullptr); @@ -348,7 +348,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callResultSetMethod(t.env(),"getResultSet",mID); @@ -360,7 +360,7 @@ Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSe sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); sal_Int32 out = callIntMethod_ThrowSQL("getUpdateCount", mID); @@ -442,7 +442,7 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID); } @@ -469,7 +469,7 @@ OUString java_sql_Statement_Base::getCursorName() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); try @@ -486,7 +486,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setQueryTimeOut", mID, _par0); @@ -499,7 +499,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_SET_ESCAPE_PROCESSING, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); m_bEscapeProcessing = _par0; createStatement( t.pEnv ); static jmethodID mID(nullptr); @@ -510,7 +510,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0); @@ -541,7 +541,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_FETCH_DIRECTION, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); @@ -553,7 +553,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_FETCH_SIZE, _par0 ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); @@ -563,7 +563,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0); @@ -573,7 +573,7 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 34161a71a4aa..0a995a50d6fd 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -99,7 +99,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethod( "execute", mID ); @@ -112,7 +112,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_UPDATE ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("executeUpdate", mID); @@ -125,7 +125,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); m_aLogger.log( LogLevel::FINER, STR_LOG_STRING_PARAMETER, parameterIndex, x ); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { // initialize temporary Variable createStatement(t.pEnv); static const char * const cSignature = "(ILjava/lang/String;)V"; @@ -153,7 +153,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callResultSetMethod(t.env(),"executeQuery",mID); @@ -168,7 +168,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setBoolean", "(IZ)V", mID, parameterIndex, x); @@ -181,7 +181,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setByte", "(IB)V", mID, parameterIndex, x); @@ -194,7 +194,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); java_sql_Date aT(x); static jmethodID mID(nullptr); @@ -208,7 +208,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); java_sql_Time aT(x); static jmethodID mID(nullptr); @@ -222,7 +222,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); java_sql_Timestamp aD(x); @@ -235,7 +235,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setDouble", "(ID)V", mID, parameterIndex, x); @@ -248,7 +248,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setFloat", "(IF)V", mID, parameterIndex, x); @@ -261,7 +261,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setInt", "(II)V", mID, parameterIndex, x); @@ -274,7 +274,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setLong", "(IJ)V", mID, parameterIndex, x); @@ -287,7 +287,7 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setNull", "(II)V", mID, parameterIndex, sqlType); @@ -324,7 +324,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -384,7 +384,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setObject", "(ILjava/lang/Object;)V", mID, parameterIndex, nullptr); @@ -410,7 +410,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("setShort", "(IS)V", mID, parameterIndex, x); @@ -423,7 +423,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -457,7 +457,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); SDBThreadAttach t; - assert(t.pEnv && "Java Enviroment geloescht worden!"); + assert(t.pEnv && "Java enviroment has been deleted!"); { createStatement(t.pEnv); @@ -515,7 +515,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); // initialize temporary variable @@ -587,7 +587,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -600,7 +600,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { createStatement(t.pEnv); static jmethodID mID(nullptr); @@ -614,7 +614,7 @@ css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatc ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); css::uno::Sequence< sal_Int32 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jintArray out = static_cast(callObjectMethod(t.pEnv,"executeBatch","()[I", mID)); @@ -632,7 +632,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedS { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); createStatement(t.pEnv); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 10c3e29341c2..e9a38075347c 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -79,7 +79,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) if(m_buf != boost::none) return 1; jboolean out; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { static const char * const cSignature = "()Z"; @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aD sal_Int32 nCharsToRead = (nBytesToRead + 1)/2; jint outChars(0); - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jcharArray pCharArray = t.pEnv->NewCharArray(nCharsToRead); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 2b5f7fded2fe..5c6ba79e0e00 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -104,7 +104,7 @@ void java_sql_ResultSet::disposing() m_xMetaData.clear(); if( object ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("close", mID); clearObject(*t.pEnv); @@ -137,7 +137,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBinaryStream","(I)Ljava/io/InputStream;", mID, columnIndex); @@ -147,7 +147,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getCharacterStream","(I)Ljava/io/Reader;", mID, columnIndex); @@ -174,7 +174,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) { Sequence< sal_Int8 > aSeq; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jbyteArray out = static_cast(callObjectMethodWithIntArg(t.pEnv,"getBytes","(I)[B", mID, columnIndex)); if (out) @@ -190,7 +190,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -238,7 +238,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/ResultSetMetaData;", mID); @@ -247,7 +247,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getArray","(I)Ljava/sql/Array;", mID, columnIndex); @@ -258,7 +258,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getClob","(I)Ljava/sql/Clob;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -267,7 +267,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getBlob","(I)Ljava/sql/Blob;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -277,7 +277,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getRef","(I)Ljava/sql/Ref;", mID, columnIndex); @@ -290,7 +290,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen { jobject out(nullptr); Any aRet; - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); { jvalue args[2]; // convert parameter @@ -364,7 +364,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTime","(I)Ljava/sql/Time;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer @@ -374,7 +374,7 @@ css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) { - SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); + SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!"); static jmethodID mID(nullptr); jobject out = callObjectMethodWithIntArg(t.pEnv,"getTimestamp","(I)Ljava/sql/Timestamp;", mID, columnIndex); // WARNING: the caller becomes the owner of the returned pointer diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx index 252570155159..27170cd4b392 100644 --- a/connectivity/source/drivers/odbc/OFunctions.cxx +++ b/connectivity/source/drivers/odbc/OFunctions.cxx @@ -20,7 +20,7 @@ #include "odbc/OFunctions.hxx" #include -// Implib-Definitionen fuer ODBC-DLL/shared library: +// Implib definitions for ODBC-DLL/shared library: namespace connectivity { diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 1e9bc43aa912..6a48ae3316d1 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -589,7 +589,7 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet* rSet ) if ( pValFmtAttr ) { - EditHdl_Impl(m_pEdFormat); // UpdateOptions_Impl() als Seiteneffekt + EditHdl_Impl(m_pEdFormat); // UpdateOptions_Impl() as a side effect } else // DONT_KNOW { diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 8ac0b7a99763..2eaac554ff91 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -369,7 +369,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) m_pLbLineEnds->Modify(*pLineEndList->GetLineEnd(nPos), nPos, pLineEndList->GetUiBitmap(nPos)); m_pLbLineEnds->SelectEntryPos( nPos ); - // Flag fuer modifiziert setzen + // set flag for modified *pnLineEndListState |= ChangeType::MODIFIED; *pPageType = PageType::Bitmap; -- cgit