diff options
-rw-r--r-- | registry/test/testregcpp.cxx | 54 | ||||
-rw-r--r-- | reportdesign/inc/reportformula.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/dlgpage.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/metadata.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 | ||||
-rw-r--r-- | rsc/inc/rsctools.hxx | 4 | ||||
-rw-r--r-- | rsc/source/parser/rscibas.cxx | 2 | ||||
-rw-r--r-- | rsc/source/prj/gui.cxx | 2 | ||||
-rw-r--r-- | rsc/source/res/rscarray.cxx | 2 | ||||
-rw-r--r-- | rsc/source/rscpp/cpp.h | 2 | ||||
-rw-r--r-- | rsc/source/rscpp/cppdef.h | 6 |
11 files changed, 43 insertions, 41 deletions
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx index d222b45c6c94..837e91cf3ddb 100644 --- a/registry/test/testregcpp.cxx +++ b/registry/test/testregcpp.cxx @@ -120,7 +120,7 @@ void test_coreReflection() OUString("I am a double"), OUString("DummyFile"), RTFieldAccess::CONST, aConst); aConst.m_type = RT_TYPE_STRING; - OUString tmpStr("dies ist ein unicode string"); + OUString tmpStr("this is a unicode string"); aConst.m_value.aString = tmpStr.getStr(); writer.setFieldData(10, OUString("aConstString"), @@ -162,7 +162,7 @@ void test_coreReflection() OUString("ModuleA/StructA"), OUString(), 3, 0, 0); - writer.setDoku(OUString("Hallo ich bin eine Struktur")); + writer.setDoku(OUString("Hello I am a structure")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("asal_uInt32"), @@ -191,11 +191,11 @@ void test_coreReflection() aConst.m_type = RT_TYPE_UINT32; aConst.m_value.aULong = 10; - writer.setDoku(OUString("Hallo ich bin ein Enum")); + writer.setDoku(OUString("Hello I am an enum")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("ENUM_VAL_1"), - OUString(), OUString("ich bin ein enum value"), + OUString(), OUString("I am an enum value"), OUString(), RTFieldAccess::CONST, aConst); aConst.m_value.aULong = 10; @@ -218,7 +218,7 @@ void test_coreReflection() RTUik aUik = {1,2,3,4,5}; writer.setUik(aUik); - writer.setDoku(OUString("Hallo ich bin ein Interface")); + writer.setDoku(OUString("Hello I am an interface")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("aString"), @@ -236,7 +236,7 @@ void test_coreReflection() writer.setMethodData(0, OUString("methodA"), OUString("double"), RTMethodMode::TWOWAY, 2, 1, - OUString("Hallo ich bin die methodA")); + OUString("Hello I am the methodA")); writer.setParamData(0, 0, OUString("ModuleA/StructA"), OUString("aStruct"), RT_PARAM_IN); writer.setParamData(0, 1, OUString("unsigned short"), @@ -273,11 +273,11 @@ void test_coreReflection() OUString("ModuleA/ExceptionA"), OUString(), 1, 0, 0); - writer.setDoku(OUString("Hallo ich bin eine Exception")); + writer.setDoku(OUString("Hello I am an exception")); writer.setFieldData(0, OUString("aSource"), OUString("stardiv/uno/XInterface"), - OUString("ich bin ein interface member"), + OUString("I am an interface member"), OUString(), RTFieldAccess::READWRITE); const sal_uInt8* pBlop = writer.getBlop(); @@ -291,23 +291,23 @@ void test_coreReflection() OUString("ModuleA/ServiceA"), OUString(), 1, 0, 4); - writer.setDoku(OUString("Hallo ich bin ein Service")); + writer.setDoku(OUString("Hello I am a service")); writer.setFileName(OUString("DummyFile")); writer.setFieldData(0, OUString("aProperty"), OUString("stardiv/uno/XInterface"), - OUString("ich bin eine property"), + OUString("I am a property"), OUString(), RTFieldAccess::READWRITE); writer.setReferenceData(0, OUString("ModuleA/XInterfaceA"), RTReferenceType::SUPPORTS, - OUString("Hallo ich eine Reference auf ein supported interface"), + OUString("Hello I am a reference to a supported interface"), RTFieldAccess::OPTIONAL); writer.setReferenceData(1, OUString("ModuleA/XInterfaceA"), RTReferenceType::OBSERVES, - OUString("Hallo ich eine Reference auf ein observed interface")); + OUString("Hello I am a reference to an observed interface")); writer.setReferenceData(2, OUString("ModuleA/ServiceB"), RTReferenceType::EXPORTS, - OUString("Hallo ich eine Reference auf einen exported service")); + OUString("Hello I am a reference to an exported service")); writer.setReferenceData(3, OUString("ModuleA/ServiceB"), RTReferenceType::NEEDS, - OUString("Hallo ich eine Reference auf einen needed service")); + OUString("Hello I am a reference to a needed service")); const sal_uInt8* pBlop = writer.getBlop(); sal_uInt32 aBlopSize = writer.getBlopSize(); @@ -337,26 +337,26 @@ void test_coreReflection() RTConstValue aConst; - writer.setDoku(OUString("Hallo ich bin eine Constants Group")); + writer.setDoku(OUString("Hello I am a constants group")); writer.setFileName(OUString("DummyFile")); aConst.m_type = RT_TYPE_BOOL; aConst.m_value.aBool = sal_True; writer.setFieldData(0, OUString("ConstantsA_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("ConstantsA_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("ConstantsA_aConstShort"), OUString("short"), - OUString("ich bin ein short"), + OUString("I am a short"), OUString("DummyFile"), RTFieldAccess::CONST, aConst); const sal_uInt8* pBlop = writer.getBlop(); @@ -491,7 +491,7 @@ void test_registry_CppApi() REG_ENSURE(!key8.closeKey(), "test_registry_CppApi error 8d"); - sal_Char* Value=(sal_Char*)"Mein erster Value"; + sal_Char* Value=(sal_Char*)"My first value"; REG_ENSURE(!rootKey.setValue(OUString("mySecondKey"), RegValueType::STRING, Value, 18), "test_registry_CppApi error 9"); RegValueType valueType; @@ -508,9 +508,9 @@ void test_registry_CppApi() rtl_freeMemory(readValue); const sal_Char* pList[3]; - const sal_Char* n1= "Hallo"; - const sal_Char* n2= "jetzt komm"; - const sal_Char* n3= "ich"; + const sal_Char* n1= "Hello"; + const sal_Char* n2= "now I"; + const sal_Char* n3= "come"; pList[0]=n1; pList[1]=n2; @@ -544,7 +544,7 @@ void test_registry_CppApi() REG_ENSURE(pLong[2] == longList.getElement(2), "test_registry_CppApi error 13j"); - OUString sWTestValue("Mein erster Unicode Value"); + OUString sWTestValue("My first unicode value"); const sal_Unicode* wTestValue= sWTestValue.getStr(); REG_ENSURE(!rootKey.setValue(OUString("mySixthKey"), RegValueType::UNICODE, (void*)wTestValue, (rtl_ustr_getLength(wTestValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 13j1"); @@ -556,9 +556,9 @@ void test_registry_CppApi() REG_ENSURE(rtl_ustr_compare(wTestValue, pTmpValue) == 0, "test_registry_CppApi error 13j4"); const sal_Unicode* pUnicode[3]; - OUString w1("Hallo"); - OUString w2("jetzt komm"); - OUString w3("ich als unicode"); + OUString w1("Hello"); + OUString w2("now I"); + OUString w3("come as unicode"); pUnicode[0]=w1.getStr(); pUnicode[1]=w2.getStr(); @@ -642,7 +642,7 @@ void test_registry_CppApi() REG_ENSURE(!key1.closeKey() && !key2.closeKey(), "test_registry_CppApi error 41"); - const sal_Unicode* wValue= OUString("Mein erster Unicode Value").getStr(); + const sal_Unicode* wValue= OUString("My first unicode value").getStr(); REG_ENSURE(!key3.setValue(OUString(), RegValueType::UNICODE, (void*)wValue, (rtl_ustr_getLength(wValue)+1)*sizeof(sal_Unicode)), "test_registry_CppApi error 42"); diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index 972f8dbe4daa..7d10243aee86 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -90,7 +90,7 @@ namespace rptui /** returns a bracketed field name of the formula denotes a field reference, or the undecorated expression if the formula denotes an expression. - Effectively, this means the method returns the complete formular, stripped by the prefix + Effectively, this means the method returns the complete formula, stripped by the prefix which indicates a field or a expression. */ OUString getBracketedFieldOrExpression() const; diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index cea73765dd8a..49d82cf32502 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -25,7 +25,7 @@ namespace rptui { /************************************************************************* |* -|* Seite einrichten-Tab-Dialog +|* Page setup tab dialog |* \************************************************************************/ class ORptPageDialog : public SfxTabDialog diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index e3fb3e81b846..bf82cc555795 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -65,7 +65,7 @@ namespace rptui } - // Vergleichen von PropertyInfo + // compare PropertyInfo struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool > { bool operator()( const OPropertyInfoImpl& _lhs, const OPropertyInfoImpl& _rhs ) @@ -185,7 +185,7 @@ namespace rptui const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName) { - // intialisierung + // initialization if(!s_pPropertyInfos) getPropertyInfo(); OPropertyInfoImpl aSearch(_rName, 0L, OUString(), "", PropUIFlags::NONE); @@ -202,7 +202,7 @@ namespace rptui const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { - // intialisierung + // initialization if(!s_pPropertyInfos) getPropertyInfo(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 41cf6fc02472..07ad27198690 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3275,7 +3275,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { getDesignView()->unmarkAllObjects(); - // Anhand des FormatKeys wird festgestellt, welches Feld benoetigt wird + // the FormatKey determines which field is required OSectionWindow* pSectionWindow[2]; pSectionWindow[0] = getDesignView()->getMarkedSection(); diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx index c54b4a1dd4e7..dcfade4adaf7 100644 --- a/rsc/inc/rsctools.hxx +++ b/rsc/inc/rsctools.hxx @@ -30,7 +30,7 @@ class RscPtrPtr; #include <rtl/ustring.hxx> #include <osl/endian.h> -// Zeichensatz +// character set enum COMPARE { LESS = -1, EQUAL = 0, GREATER = 1 }; enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN }; @@ -84,7 +84,7 @@ class RscWriteRc public: RscWriteRc( RSCBYTEORDER_TYPE nOrder = RSC_SYSTEMENDIAN ); ~RscWriteRc(); - sal_uInt32 IncSize( sal_uInt32 nSize );// gibt die vorherige Groesse + sal_uInt32 IncSize( sal_uInt32 nSize ); // gives the previous size void * GetBuffer() { return GetPointer( 0 ); diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 4ad3c6b522b0..556563b76512 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -187,7 +187,7 @@ RscTupel * RscTypCont::InitStringLongTupel() RscTop * pTupel; Atom nId; - // Clientvariablen einfuegen + // insert client variables pTupel = new RscTupel( pHS->getID( "CharsLongTupel" ), RSC_NOTYPE ); nId = aNmTb.Put( "ItemText", VARNAME ); pTupel->SetVariable( nId, &aString ); diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index 10b3565dcaac..323bc5728cc0 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -63,7 +63,7 @@ int rsc2_main( int argc, char **argv ) aError = pCompiler->Start(); } - delete pHS; // wird durch InitRscCompiler erzeugt + delete pHS; // is generated by InitRscCompiler if( aError.IsOk() ) return 0; diff --git a/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx index 08dd08d4b8cc..ba5f8fe16cbc 100644 --- a/rsc/source/res/rscarray.cxx +++ b/rsc/source/res/rscarray.cxx @@ -129,7 +129,7 @@ void RscArray::Destroy( const RSCINST & rInst ) pClassData = reinterpret_cast<RscArrayInst *>(rInst.pData + nOffInstData); - //Baum rekursiv loeschen + // delete the tree recursively ::Destroy( pClassData->pNode ); } diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 11524ecfb4be..4dcf1c89abd9 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -245,7 +245,7 @@ extern SIZES size_table[]; /* For #if sizeof sizes */ #ifndef _NO_PROTO int rscpp_main( int argc, char **argv ); #endif -#define MAIN rscpp_main /* fuer die cpp.lib muss main() geandert werden */ +#define MAIN rscpp_main /* main() needs to be changed for the cpp.lib */ #else #ifdef _WIN32 #define MAIN __cdecl main diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h index ffbb57c567c0..32d35a87d252 100644 --- a/rsc/source/rscpp/cppdef.h +++ b/rsc/source/rscpp/cppdef.h @@ -151,8 +151,10 @@ #else #define PAR_MAC (31 + 1) #endif -/* NWORK wg. grooossen Makros in *.src erhoeht, - da wir bald 10 Sprachen haben werden gleich ordentlich reingehauen.. */ +/* + * NWORK increased due to large macros in *.src, + * added a proper bunch right away, because we are soon going to have 10 languages. + */ #define NWORK 128000 #define NBUFF NWORK #define NFWORK 1024 |