You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/02/16 14:38:05 UTC
(openoffice) branch AOO42X updated (a05d1af74b -> 0f724e754c)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from a05d1af74b Fix spelling (#286)
new 9bc59f1c12 Fix typo (vaild), cleanup
new 0f724e754c Fix spelling (#287)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/autodoc/source/parser/cpp/defdescr.hxx | 25 ++--
.../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +-
main/comphelper/inc/comphelper/componentmodule.hxx | 2 +-
.../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Object.cxx | 22 ++--
main/dbaccess/source/core/inc/core_resource.hxx | 4 +-
.../source/ext/adabas/Acomponentmodule.cxx | 2 +-
.../source/ext/adabas/Acomponentmodule.hxx | 2 +-
main/dbaccess/source/ui/inc/moduledbu.hxx | 2 +-
main/dbaccess/source/ui/misc/moduledbu.cxx | 2 +-
main/extensions/source/inc/componentmodule.cxx | 2 +-
main/extensions/source/inc/componentmodule.hxx | 2 +-
main/forms/source/inc/frm_resource.hxx | 2 +-
main/formula/source/core/inc/core_resource.hxx | 4 +-
main/formula/source/ui/inc/ModuleHelper.hxx | 2 +-
main/formula/source/ui/resource/ModuleHelper.cxx | 2 +-
main/framework/inc/dispatch/menudispatcher.hxx | 2 +-
main/framework/inc/services/logindialog.hxx | 4 +-
main/framework/inc/services/pathsettings.hxx | 2 +-
main/framework/source/application/login.cxx | 2 +-
main/framework/source/jobs/job.cxx | 2 +-
main/framework/source/jobs/jobdata.cxx | 2 +-
main/framework/source/jobs/jobdispatch.cxx | 4 +-
.../DesktopEnvironment/FunctionHelper.java | 4 +-
.../OfficeDev/DesktopEnvironment/Interceptor.java | 2 +-
main/reportdesign/inc/ModuleHelper.hxx | 2 +-
.../reportdesign/source/core/inc/core_resource.hxx | 2 +-
main/reportdesign/source/core/sdr/ModuleHelper.cxx | 2 +-
main/sal/inc/osl/socket.h | 24 ++--
main/sfx2/source/doc/printhelper.cxx | 2 +-
main/svx/inc/galtheme.hrc | 2 +-
main/svx/inc/svx/fmresids.hrc | 4 +-
main/sw/source/core/frmedt/fefly1.cxx | 135 ++++++++++-----------
.../star/reflection/InvalidTypeNameException.idl | 13 +-
main/uui/source/iahndl-filter.cxx | 2 +-
main/vcl/inc/unx/wmadaptor.hxx | 100 +++++++--------
main/vcl/unx/generic/fontmanager/parseAFM.hxx | 4 +-
main/winaccessibility/inc/AccResource.hxx | 2 +-
38 files changed, 189 insertions(+), 208 deletions(-)
(openoffice) 02/02: Fix spelling (#287)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0f724e754cc7abf9c033ad4bbcb6a6cb21f637dd
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Mon Feb 17 00:31:48 2025 +1000
Fix spelling (#287)
(cherry picked from commit 816026e9023e2ca4c99a15ad59c9243e4552fc65)
---
.../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +-
main/comphelper/inc/comphelper/componentmodule.hxx | 2 +-
.../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Object.cxx | 22 +++++++++++-----------
main/dbaccess/source/core/inc/core_resource.hxx | 4 ++--
.../source/ext/adabas/Acomponentmodule.cxx | 2 +-
.../source/ext/adabas/Acomponentmodule.hxx | 2 +-
main/dbaccess/source/ui/inc/moduledbu.hxx | 2 +-
main/dbaccess/source/ui/misc/moduledbu.cxx | 2 +-
main/extensions/source/inc/componentmodule.cxx | 2 +-
main/extensions/source/inc/componentmodule.hxx | 2 +-
main/forms/source/inc/frm_resource.hxx | 2 +-
main/formula/source/core/inc/core_resource.hxx | 4 ++--
main/formula/source/ui/inc/ModuleHelper.hxx | 2 +-
main/formula/source/ui/resource/ModuleHelper.cxx | 2 +-
main/framework/inc/dispatch/menudispatcher.hxx | 2 +-
main/framework/inc/services/logindialog.hxx | 4 ++--
main/framework/inc/services/pathsettings.hxx | 2 +-
main/framework/source/application/login.cxx | 2 +-
main/framework/source/jobs/job.cxx | 2 +-
main/framework/source/jobs/jobdata.cxx | 2 +-
main/framework/source/jobs/jobdispatch.cxx | 4 ++--
.../DesktopEnvironment/FunctionHelper.java | 4 ++--
.../OfficeDev/DesktopEnvironment/Interceptor.java | 2 +-
main/reportdesign/inc/ModuleHelper.hxx | 2 +-
.../reportdesign/source/core/inc/core_resource.hxx | 2 +-
main/reportdesign/source/core/sdr/ModuleHelper.cxx | 2 +-
main/sfx2/source/doc/printhelper.cxx | 2 +-
main/svx/inc/galtheme.hrc | 2 +-
main/svx/inc/svx/fmresids.hrc | 4 ++--
main/uui/source/iahndl-filter.cxx | 2 +-
main/winaccessibility/inc/AccResource.hxx | 2 +-
32 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 9b9405bb41..72306d946e 100644
--- a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1517,7 +1517,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
}
else
{
- // this is a sort of dispose() from the new model,so release ressources here
+ // this is a sort of dispose() from the new model,so release resources here
try
{
this->dispose();
diff --git a/main/comphelper/inc/comphelper/componentmodule.hxx b/main/comphelper/inc/comphelper/componentmodule.hxx
index 3d0e207fed..b87807693d 100644
--- a/main/comphelper/inc/comphelper/componentmodule.hxx
+++ b/main/comphelper/inc/comphelper/componentmodule.hxx
@@ -183,7 +183,7 @@ namespace comphelper
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class COMPHELPER_DLLPUBLIC OModuleClient
{
diff --git a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 4e009ccdc0..8140fa7cfd 100644
--- a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -628,7 +628,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS
jobject out(0);
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings: no Java environment anymore!" );
{
const char* pSignature = _pOptionalAdditionalString
diff --git a/main/connectivity/source/drivers/jdbc/Object.cxx b/main/connectivity/source/drivers/jdbc/Object.cxx
index bf27913317..85a364371d 100644
--- a/main/connectivity/source/drivers/jdbc/Object.cxx
+++ b/main/connectivity/source/drivers/jdbc/Object.cxx
@@ -241,7 +241,7 @@ sal_Bool java_lang_Object::callBooleanMethod( const char* _pMethodName, jmethodI
jboolean out( sal_False );
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"()Z", _inout_MethodID);
// call method
out = t.pEnv->CallBooleanMethod( object, _inout_MethodID );
@@ -254,7 +254,7 @@ sal_Bool java_lang_Object::callBooleanMethodWithIntArg( const char* _pMethodName
{
jboolean out( sal_False );
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethodWithIntArg: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callBooleanMethodWithIntArg: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(I)Z", _inout_MethodID);
// call method
out = t.pEnv->CallBooleanMethod( object, _inout_MethodID, _nArgument );
@@ -273,7 +273,7 @@ jobject java_lang_Object::callResultSetMethod( JNIEnv& _rEnv,const char* _pMetho
sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID,bool _bIgnoreException ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"()I", _inout_MethodID);
// call method
@@ -289,7 +289,7 @@ sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID&
sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(I)I", _inout_MethodID);
// call method
jint out( t.pEnv->CallIntMethod( object, _inout_MethodID , _nArgument) );
@@ -301,7 +301,7 @@ sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, j
void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _inout_MethodID) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"()V", _inout_MethodID);
// call method
@@ -312,7 +312,7 @@ void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _ino
void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(I)V", _inout_MethodID);
// call method
@@ -326,7 +326,7 @@ void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmeth
void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
// call method
t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument );
@@ -339,7 +339,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet
::rtl::OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java environment anymore!" );
// call method
jstring out = (jstring)callObjectMethod(t.pEnv,_pMethodName,"()Ljava/lang/String;", _inout_MethodID);
@@ -369,7 +369,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char*
::rtl::OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java environment anymore!" );
jstring out = (jstring)callObjectMethodWithIntArg(t.pEnv,_pMethodName,"(I)Ljava/lang/String;",_inout_MethodID,_nArgument);
return JavaString2String( t.pEnv, out );
}
@@ -377,7 +377,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char*
void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(Ljava/lang/String;)V", _inout_MethodID);
jdbc::LocalRef< jstring > str( t.env(),convertwchar_tToJavaString(t.pEnv,_nArgument));
@@ -389,7 +389,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm
sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const
{
SDBThreadAttach t;
- OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java enviroment anymore!" );
+ OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java environment anymore!" );
obtainMethodId(t.pEnv, _pMethodName,"(Ljava/lang/String;)I", _inout_MethodID);
//TODO: Check if the code below is needed
diff --git a/main/dbaccess/source/core/inc/core_resource.hxx b/main/dbaccess/source/core/inc/core_resource.hxx
index 932064516f..e9c3bdbc08 100644
--- a/main/dbaccess/source/core/inc/core_resource.hxx
+++ b/main/dbaccess/source/core/inc/core_resource.hxx
@@ -42,7 +42,7 @@ namespace dbaccess
//==================================================================
//= ResourceManager
- //= handling ressources within the DBA-Core library
+ //= handling resources within the DBA-Core library
//==================================================================
class ResourceManager
{
@@ -108,7 +108,7 @@ namespace dbaccess
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class OModuleClient
{
diff --git a/main/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/main/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 4851493a76..8dec853199 100644
--- a/main/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/main/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -70,7 +70,7 @@ namespace COMPMOD_NAMESPACE
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
};
diff --git a/main/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/main/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index 3450ed5d17..d9d1527e91 100644
--- a/main/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/main/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -163,7 +163,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//=========================================================================
//= OModuleResourceClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class OModuleResourceClient
{
diff --git a/main/dbaccess/source/ui/inc/moduledbu.hxx b/main/dbaccess/source/ui/inc/moduledbu.hxx
index 20240d7ecb..c5d953a837 100644
--- a/main/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/main/dbaccess/source/ui/inc/moduledbu.hxx
@@ -75,7 +75,7 @@ private:
//=========================================================================
//= OModuleClient
//=========================================================================
-/** base class for objects which uses any global module-specific ressources
+/** base class for objects which uses any global module-specific resources
*/
class OModuleClient
{
diff --git a/main/dbaccess/source/ui/misc/moduledbu.cxx b/main/dbaccess/source/ui/misc/moduledbu.cxx
index 56e4aa93e6..c413371751 100644
--- a/main/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/main/dbaccess/source/ui/misc/moduledbu.cxx
@@ -61,7 +61,7 @@ public:
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
diff --git a/main/extensions/source/inc/componentmodule.cxx b/main/extensions/source/inc/componentmodule.cxx
index 583239c49e..fda9a5fa0d 100644
--- a/main/extensions/source/inc/componentmodule.cxx
+++ b/main/extensions/source/inc/componentmodule.cxx
@@ -60,7 +60,7 @@ namespace COMPMOD_NAMESPACE
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
};
diff --git a/main/extensions/source/inc/componentmodule.hxx b/main/extensions/source/inc/componentmodule.hxx
index 16d9310cb4..80620364d2 100644
--- a/main/extensions/source/inc/componentmodule.hxx
+++ b/main/extensions/source/inc/componentmodule.hxx
@@ -147,7 +147,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//=========================================================================
//= OModuleResourceClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class OModuleResourceClient
{
diff --git a/main/forms/source/inc/frm_resource.hxx b/main/forms/source/inc/frm_resource.hxx
index 8aa21e3119..cbf93adc06 100644
--- a/main/forms/source/inc/frm_resource.hxx
+++ b/main/forms/source/inc/frm_resource.hxx
@@ -35,7 +35,7 @@ namespace frm
//==================================================================
//= ResourceManager
- //= handling ressources within the FormLayer library
+ //= handling resources within the FormLayer library
//==================================================================
class ResourceManager
{
diff --git a/main/formula/source/core/inc/core_resource.hxx b/main/formula/source/core/inc/core_resource.hxx
index 2f891ff856..27f0270ead 100644
--- a/main/formula/source/core/inc/core_resource.hxx
+++ b/main/formula/source/core/inc/core_resource.hxx
@@ -42,7 +42,7 @@ namespace formula
//==================================================================
//= ResourceManager
- //= handling ressources within the FORMULA-Core library
+ //= handling resources within the FORMULA-Core library
//==================================================================
class ResourceManager
{
@@ -89,7 +89,7 @@ namespace formula
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class OModuleClient
{
diff --git a/main/formula/source/ui/inc/ModuleHelper.hxx b/main/formula/source/ui/inc/ModuleHelper.hxx
index d4a7781135..abe8559494 100644
--- a/main/formula/source/ui/inc/ModuleHelper.hxx
+++ b/main/formula/source/ui/inc/ModuleHelper.hxx
@@ -67,7 +67,7 @@ namespace formula
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class FORMULA_DLLPUBLIC OModuleClient
{
diff --git a/main/formula/source/ui/resource/ModuleHelper.cxx b/main/formula/source/ui/resource/ModuleHelper.cxx
index 3dc7ba508f..00d896a7cc 100644
--- a/main/formula/source/ui/resource/ModuleHelper.cxx
+++ b/main/formula/source/ui/resource/ModuleHelper.cxx
@@ -58,7 +58,7 @@ public:
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
diff --git a/main/framework/inc/dispatch/menudispatcher.hxx b/main/framework/inc/dispatch/menudispatcher.hxx
index a2c2867afd..052a1992b2 100644
--- a/main/framework/inc/dispatch/menudispatcher.hxx
+++ b/main/framework/inc/dispatch/menudispatcher.hxx
@@ -210,7 +210,7 @@ class MenuDispatcher : // interfaces
/*-****************************************************************************************************//**
@short dispose current instance
- @descr If service helper isn't required any longer call this method to release all used ressources.
+ @descr If service helper isn't required any longer call this method to release all used resources.
@seealso -
diff --git a/main/framework/inc/services/logindialog.hxx b/main/framework/inc/services/logindialog.hxx
index 23f6cf8f5b..29bdc70ae7 100644
--- a/main/framework/inc/services/logindialog.hxx
+++ b/main/framework/inc/services/logindialog.hxx
@@ -280,7 +280,7 @@ class cIMPL_Dialog : public ModalDialog
/*-****************************************************************************************************//**
@short default ctor
- @descr This ctor initialize the dialog, load ressources but not set values on edits or check boxes!
+ @descr This ctor initialize the dialog, load resources but not set values on edits or check boxes!
These is implemented by setValues() on the same class.
You must give us a language identifier to describe which resource should be used!
@@ -297,7 +297,7 @@ class cIMPL_Dialog : public ModalDialog
/*-****************************************************************************************************//**
@short default dtor
- @descr This dtor deinitialize the dialog and free all used ressources.
+ @descr This dtor deinitialize the dialog and free all used resources.
But you can't get the values of the dialog. Use getValues() to do this.
@seealso method getValues()
diff --git a/main/framework/inc/services/pathsettings.hxx b/main/framework/inc/services/pathsettings.hxx
index 95295092d7..581ee99b9a 100644
--- a/main/framework/inc/services/pathsettings.hxx
+++ b/main/framework/inc/services/pathsettings.hxx
@@ -169,7 +169,7 @@ class PathSettings : public css::lang::XTypeProvider ,
during this ctor runs! */
PathSettings(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
- /** free all used ressources ... if it was not already done. */
+ /** free all used resources ... if it was not already done. */
virtual ~PathSettings();
/** declaration of XInterface, XTypeProvider, XServiceInfo */
diff --git a/main/framework/source/application/login.cxx b/main/framework/source/application/login.cxx
index faf811af38..efcb7378c1 100644
--- a/main/framework/source/application/login.cxx
+++ b/main/framework/source/application/login.cxx
@@ -155,7 +155,7 @@ void LoginApplication::Main()
Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY );
Reference< XPropertySet > xPropertySet( xLoginDialog , UNO_QUERY );
- // Work with valid ressources only!
+ // Work with valid resources only!
// Otherwise do nothing ...
if (
( xLoginDialog.is() == sal_True ) &&
diff --git a/main/framework/source/jobs/job.cxx b/main/framework/source/jobs/job.cxx
index 5600ffc955..00b75c8c61 100644
--- a/main/framework/source/jobs/job.cxx
+++ b/main/framework/source/jobs/job.cxx
@@ -795,7 +795,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) throw(css::uno::RuntimeException)
{
die();
- // Do nothing else here. Our internal ressources was released ...
+ // Do nothing else here. Our internal resources was released ...
}
//________________________________
diff --git a/main/framework/source/jobs/jobdata.cxx b/main/framework/source/jobs/jobdata.cxx
index ed748268a7..f81950ce2c 100644
--- a/main/framework/source/jobs/jobdata.cxx
+++ b/main/framework/source/jobs/jobdata.cxx
@@ -149,7 +149,7 @@ void JobData::operator=( const JobData& rCopy )
/**
@short let this instance die
@descr There is no chance any longer to work. We have to
- release all used ressources and free used memory.
+ release all used resources and free used memory.
*/
JobData::~JobData()
{
diff --git a/main/framework/source/jobs/jobdispatch.cxx b/main/framework/source/jobs/jobdispatch.cxx
index fe879e9325..111ced4af3 100644
--- a/main/framework/source/jobs/jobdispatch.cxx
+++ b/main/framework/source/jobs/jobdispatch.cxx
@@ -114,11 +114,11 @@ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::lang::XMultiSer
//________________________________
/**
@short let this instance die
- @descr We have to release all used ressources and free used memory.
+ @descr We have to release all used resources and free used memory.
*/
JobDispatch::~JobDispatch()
{
- // release all used ressources
+ // release all used resources
m_xSMGR = css::uno::Reference< css::lang::XMultiServiceFactory >();
m_xFrame = css::uno::Reference< css::frame::XFrame >();
}
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 2382430e48..355b53b344 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -299,7 +299,7 @@ public class FunctionHelper
// This exception is thrown by the native JNI code if it try to get
// the systemw window handle. A possible reason can be an invisible
// java window. In this case it should be enough to set return
- // values to null. All other ressources (which was created before)
+ // values to null. All other resources (which was created before)
// will be freed automatically if scope wil be leaved.
System.out.println("May be the NativeView object wasn't really visible at calling time of getNativeWindow()?");
xPeer = null;
@@ -382,7 +382,7 @@ public class FunctionHelper
if(xFrame!=null)
{
// Try to dispose the frame. He should deregister himself at the desktop object
- // and free all internal used ressources (e.g. the container window) automatically.
+ // and free all internal used resources (e.g. the container window) automatically.
// It's possible to do that here - because frame has no component inside yet.
// So nobody can disagree with that.
// After the dispose() call forget all references to this frame and let him die.
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
index 87f0a51e98..ba4c3920d7 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
@@ -579,7 +579,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener,
// ____________________
/**
- * This class listen on the intercepted frame to free all used ressources on closing.
+ * This class listen on the intercepted frame to free all used resources on closing.
* We forget the reference to the frame only here. Deregistration
* isn't necessary here - because this frame dies and wish to forgoten.
*
diff --git a/main/reportdesign/inc/ModuleHelper.hxx b/main/reportdesign/inc/ModuleHelper.hxx
index 0e9d8c0b50..c2fabdf57f 100644
--- a/main/reportdesign/inc/ModuleHelper.hxx
+++ b/main/reportdesign/inc/ModuleHelper.hxx
@@ -68,7 +68,7 @@ namespace rptui
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific resources
*/
class REPORTDESIGN_DLLPUBLIC OModuleClient
{
diff --git a/main/reportdesign/source/core/inc/core_resource.hxx b/main/reportdesign/source/core/inc/core_resource.hxx
index f31d1753f3..7059040d6f 100644
--- a/main/reportdesign/source/core/inc/core_resource.hxx
+++ b/main/reportdesign/source/core/inc/core_resource.hxx
@@ -36,7 +36,7 @@ namespace reportdesign
//==================================================================
//= ResourceManager
- //= handling ressources within the DBA-Core library
+ //= handling resources within the DBA-Core library
//==================================================================
class ResourceManager
{
diff --git a/main/reportdesign/source/core/sdr/ModuleHelper.cxx b/main/reportdesign/source/core/sdr/ModuleHelper.cxx
index 1fcc40d2f7..26855b3801 100644
--- a/main/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/main/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -58,7 +58,7 @@ public:
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
diff --git a/main/sfx2/source/doc/printhelper.cxx b/main/sfx2/source/doc/printhelper.cxx
index 2d6eafd2a9..d47bb2c3a4 100644
--- a/main/sfx2/source/doc/printhelper.cxx
+++ b/main/sfx2/source/doc/printhelper.cxx
@@ -497,7 +497,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
/* waits for finishing of the print job and moves the temp file afterwards
Note: Starting of the job is done outside this thread!
- But we have to free some of the given ressources on heap!
+ But we have to free some of the given resources on heap!
*/
void SAL_CALL run()
{
diff --git a/main/svx/inc/galtheme.hrc b/main/svx/inc/galtheme.hrc
index a3d393c5b5..33252b51c7 100644
--- a/main/svx/inc/galtheme.hrc
+++ b/main/svx/inc/galtheme.hrc
@@ -25,7 +25,7 @@
#define RID_GALLERYSTR_THEME_START (6000)
-// These defines are used to map gallery names to translated string ressources. Since
+// These defines are used to map gallery names to translated string resources. Since
// galleries may be copied from older offices to newer, do *never* change these
// IDs except adding new ones (and adapting RID_GALLERYSTR_THEME_LAST). The ID
// *is* written into the binary file *.thm (which is a gallery theme combined of
diff --git a/main/svx/inc/svx/fmresids.hrc b/main/svx/inc/svx/fmresids.hrc
index 788c154a58..6cec36e025 100644
--- a/main/svx/inc/svx/fmresids.hrc
+++ b/main/svx/inc/svx/fmresids.hrc
@@ -26,8 +26,8 @@
// include -----------------------------------------------------------
#include <svl/solar.hrc>
-// unnamed ressources -------------------------------------------------------
-// sub ressources .....................
+// unnamed resources -------------------------------------------------------
+// sub resources .....................
// ImageList-Id's -----------------------------------------------------------
#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0)
diff --git a/main/uui/source/iahndl-filter.cxx b/main/uui/source/iahndl-filter.cxx
index 1cfe84c058..920e94989d 100644
--- a/main/uui/source/iahndl-filter.cxx
+++ b/main/uui/source/iahndl-filter.cxx
@@ -96,7 +96,7 @@ handleNoSuchFilterRequest_(
uno::Reference< document::XInteractionFilterSelect > xFilterTransport;
getContinuations(rContinuations, &xAbort, &xFilterTransport);
- // check necessary ressources - if they don't exist - abort or
+ // check necessary resources - if they don't exist - abort or
// break this operation
if (!xAbort.is())
return;
diff --git a/main/winaccessibility/inc/AccResource.hxx b/main/winaccessibility/inc/AccResource.hxx
index 8d8e286b57..81fc1b3770 100644
--- a/main/winaccessibility/inc/AccResource.hxx
+++ b/main/winaccessibility/inc/AccResource.hxx
@@ -32,7 +32,7 @@ class SimpleResMgr;
//==================================================================
//= ResourceManager
-//= handling ressources within the FormLayer library
+//= handling resources within the FormLayer library
//==================================================================
class ResourceManager
{
(openoffice) 01/02: Fix typo (vaild), cleanup
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9bc59f1c127558478aafe4f44429a7ef467765f4
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Feb 16 15:31:42 2025 +0100
Fix typo (vaild), cleanup
(cherry picked from commit d11ac732c2ba6981498374757fddc29abbf2b738)
---
main/autodoc/source/parser/cpp/defdescr.hxx | 25 ++--
main/sal/inc/osl/socket.h | 24 ++--
main/sw/source/core/frmedt/fefly1.cxx | 135 ++++++++++-----------
.../star/reflection/InvalidTypeNameException.idl | 13 +-
main/vcl/inc/unx/wmadaptor.hxx | 100 +++++++--------
main/vcl/unx/generic/fontmanager/parseAFM.hxx | 4 +-
6 files changed, 141 insertions(+), 160 deletions(-)
diff --git a/main/autodoc/source/parser/cpp/defdescr.hxx b/main/autodoc/source/parser/cpp/defdescr.hxx
index 7fa62eba17..2eb364d3f8 100644
--- a/main/autodoc/source/parser/cpp/defdescr.hxx
+++ b/main/autodoc/source/parser/cpp/defdescr.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,26 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef ADC_CPP_DEFDESCR_HXX
#define ADC_CPP_DEFDESCR_HXX
-
-
-
namespace cpp
{
@@ -54,11 +49,11 @@ class DefineDescription
const str_vector & i_rDefinition );
~DefineDescription();
- /// Only vaild if (eDefineType == type_define) else returns "".
+ // Only valid if (eDefineType == type_define) else returns "".
void GetDefineText(
csv::StreamStr & o_rText ) const;
- /// Only vaild if (eDefineType == type_macro) else returns "".
+ // Only valid if (eDefineType == type_macro) else returns "".
void GetMacroText(
csv::StreamStr & o_rText,
const StringVector &
@@ -75,9 +70,6 @@ class DefineDescription
E_DefineType eDefineType;
};
-
-
-
// IMPLEMENTATION
inline uintt
DefineDescription::ParamCount() const
@@ -86,8 +78,7 @@ inline DefineDescription::E_DefineType
DefineDescription::DefineType() const
{ return eDefineType; }
-
-
-
} // end namespace cpp
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sal/inc/osl/socket.h b/main/sal/inc/osl/socket.h
index ce2fbbc910..06c4c98fd8 100644
--- a/main/sal/inc/osl/socket.h
+++ b/main/sal/inc/osl/socket.h
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _OSL_SOCKET_H_
#define _OSL_SOCKET_H_
@@ -48,7 +46,6 @@ extern "C" {
*/
typedef struct oslSocketAddrImpl * oslSocketAddr;
-
/**
Represents the address-family of a socket
*/
@@ -311,7 +308,7 @@ oslSocketResult SAL_CALL osl_getDottedInetAddrOfSocketAddr(oslSocketAddr Addr, r
oslSocketResult SAL_CALL osl_setAddrOfSocketAddr( oslSocketAddr Addr, sal_Sequence *pByteSeq );
/** Returns the addr field in the struct sockaddr.
- @param ppByteSeq out parameter. After the call, *ppByteSeq contains the ipadrress
+ @param ppByteSeq out parameter. After the call, *ppByteSeq contains the ipaddress
in network byteorder. *ppByteSeq may be 0 in case of an invalid socket handle.
@return <code>osl_Socket_Ok</code> or <code>osl_Socket_Error</code>
*/
@@ -417,7 +414,7 @@ oslSocket SAL_CALL osl_createSocket(oslAddrFamily Family,
/** Retrieves the Address of the local end of the socket.
Note that a socket must be bound or connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
@@ -425,7 +422,7 @@ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket Socket);
/** Retrieves the Address of the remote end of the socket.
Note that a socket must be connected before
- a vaild address can be returned.
+ a valid address can be returned.
@return 0 if socket-address could not be created, otherwise you get
the created Socket-Address.
*/
@@ -764,7 +761,6 @@ sal_Bool SAL_CALL osl_enableNonBlockingMode(oslSocket Socket,
*/
sal_Bool SAL_CALL osl_isNonBlockingMode(oslSocket Socket);
-
/** Queries the socket for its type.
@return one of:
<ul>
@@ -809,7 +805,6 @@ void SAL_CALL osl_destroySocketSet(oslSocketSet Set);
*/
void SAL_CALL osl_clearSocketSet(oslSocketSet Set);
-
/** Adds a socket to the set.
@param Set the set were the socket is added.
@param Socket the socket to be added.
@@ -864,7 +859,6 @@ void SAL_CALL osl_closeSocket(oslSocket Socket);
*/
sal_Int32 SAL_CALL osl_readSocket( oslSocket Socket, void *pBuffer, sal_Int32 nSize );
-
/** Writes n bytes from pBuffer to the stream. The method avoids
incomplete writes due to packet boundaries.
@param pBuffer contains the data to be written.
@@ -877,10 +871,10 @@ sal_Int32 SAL_CALL osl_writeSocket( oslSocket Socket, const void *pBuffer, sal_I
/**@} end section oslSocket
*/
-
-
#ifdef __cplusplus
}
#endif
#endif /* _OSL_SOCKET_H_ */
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/core/frmedt/fefly1.cxx b/main/sw/source/core/frmedt/fefly1.cxx
index 5a3442d61f..c011e17238 100644
--- a/main/sw/source/core/frmedt/fefly1.cxx
+++ b/main/sw/source/core/frmedt/fefly1.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -60,7 +58,7 @@
#include <ndtxt.hxx>
#include <edimp.hxx>
#include <swtable.hxx>
-#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
+#include <mvsave.hxx> // Strukturen zum Sichern beim Move/Delete
#include <ndgrf.hxx>
#include <flyfrms.hxx>
#include <flypos.hxx>
@@ -110,22 +108,22 @@ sal_Bool lcl_SetNewFlyPos( const SwNode& rNode, SwFmtAnchor& rAnchor,
}
else
{
- const SwCntntNode *pCntNd = rNode.GetCntntNode();
+ const SwCntntNode *pCntNd = rNode.GetCntntNode();
const SwCntntFrm* pCFrm = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False ) : 0;
const SwPageFrm *pPg = pCFrm ? pCFrm->FindPageFrm() : 0;
rAnchor.SetPageNum( pPg ? pPg->GetPhyPageNum() : 1 );
- rAnchor.SetType( FLY_AT_PAGE );
+ rAnchor.SetType( FLY_AT_PAGE );
}
return bRet;
}
sal_Bool lcl_FindAnchorPos(
- SwEditShell& rEditShell,
- SwDoc& rDoc,
- const Point& rPt,
- const SwFrm& rFrm,
- SfxItemSet& rSet )
+ SwEditShell& rEditShell,
+ SwDoc& rDoc,
+ const Point& rPt,
+ const SwFrm& rFrm,
+ SfxItemSet& rSet )
{
sal_Bool bRet = sal_True;
SwFmtAnchor aNewAnch( (SwFmtAnchor&)rSet.Get( RES_ANCHOR ) );
@@ -136,13 +134,13 @@ sal_Bool lcl_FindAnchorPos(
Point aTmpPnt( rPt );
switch( nNew )
{
- case FLY_AS_CHAR: // sollte der nicht auch mit hinein?
- case FLY_AT_PARA:
- case FLY_AT_CHAR: // LAYER_IMPL
- {
- //Ausgehend von der linken oberen Ecke des Fly den
- //dichtesten CntntFrm suchen.
- const SwFrm* pFrm = rFrm.IsFlyFrm() ? ((SwFlyFrm&)rFrm).GetAnchorFrm()
+ case FLY_AS_CHAR: // sollte der nicht auch mit hinein?
+ case FLY_AT_PARA:
+ case FLY_AT_CHAR: // LAYER_IMPL
+ {
+ // Ausgehend von der linken oberen Ecke des Fly den
+ // dichtesten CntntFrm suchen.
+ const SwFrm* pFrm = rFrm.IsFlyFrm() ? ((SwFlyFrm&)rFrm).GetAnchorFrm()
: &rFrm;
pNewAnch = ::FindAnchor( pFrm, aTmpPnt );
if( pNewAnch->IsProtected() )
@@ -151,9 +149,9 @@ sal_Bool lcl_FindAnchorPos(
break;
}
- SwPosition aPos( *((SwCntntFrm*)pNewAnch)->GetNode() );
- if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
- {
+ SwPosition aPos( *((SwCntntFrm*)pNewAnch)->GetNode() );
+ if ((FLY_AT_CHAR == nNew) || (FLY_AS_CHAR == nNew))
+ {
// es muss ein TextNode gefunden werden, denn nur in diesen
// ist ein Inhaltsgebundene Frames zu verankern
SwCrsrMoveState aState( MV_SETONLYTEXT );
@@ -180,8 +178,8 @@ sal_Bool lcl_FindAnchorPos(
case FLY_AT_FLY: // LAYER_IMPL
{
- //Ausgehend von der linken oberen Ecke des Fly den
- //dichtesten SwFlyFrm suchen.
+ // Ausgehend von der linken oberen Ecke des Fly den
+ // dichtesten SwFlyFrm suchen.
SwCrsrMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( rDoc.GetNodes() );
aTmpPnt.X() -= 1; //nicht im Fly landen!!
@@ -199,10 +197,10 @@ sal_Bool lcl_FindAnchorPos(
}
}
- aNewAnch.SetType( nNew = FLY_AT_PAGE );
+ aNewAnch.SetType( nNew = FLY_AT_PAGE );
// no break
- case FLY_AT_PAGE:
+ case FLY_AT_PAGE:
pNewAnch = rFrm.FindPageFrm();
aNewAnch.SetPageNum( pNewAnch->GetPhyPageNum() );
break;
@@ -219,9 +217,9 @@ sal_Bool lcl_FindAnchorPos(
//! also used in unoframe.cxx
//
sal_Bool lcl_ChkAndSetNewAnchor(
- SwEditShell& rEditShell,
- const SwFlyFrm& rFly,
- SfxItemSet& rSet )
+ SwEditShell& rEditShell,
+ const SwFlyFrm& rFly,
+ SfxItemSet& rSet )
{
const SwFrmFmt& rFmt = *rFly.GetFmt();
const SwFmtAnchor &rOldAnch = rFmt.GetAnchor();
@@ -235,8 +233,8 @@ sal_Bool lcl_ChkAndSetNewAnchor(
SwDoc* pDoc = (SwDoc*)rFmt.GetDoc();
#ifdef DBG_UTIL
- ASSERT( !(nNew == FLY_AT_PAGE &&
- (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld ) &&
+ ASSERT( !(nNew == FLY_AT_PAGE &&
+ (FLY_AT_PARA==nOld || FLY_AT_CHAR==nOld || FLY_AS_CHAR==nOld ) &&
pDoc->IsInHeaderFooter( rOldAnch.GetCntntAnchor()->nNode )),
"Unerlaubter Ankerwechsel in Head/Foot." );
#endif
@@ -252,11 +250,11 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
// !!Rahmen immer selektieren, wenn sie nicht selektiert sind.
// - Es kann ein neuer 'alter' sein weil der Anker gewechselt wurde.
// - 'alte' Rahmen sind vorher immer selektiert denn sonst wird nix
- // an ihnen veraendert.
+ // an ihnen verändert.
// Der Rahmen darf nicht per Dokumentposition selektiert werden, weil er
// auf jedenfall selektiert sein muss!
- SwViewImp *pImpl = Imp();
- if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
+ SwViewImp *pImpl = Imp();
+ if( GetWin() && (bNew || !pImpl->GetDrawView()->AreObjectsMarked()) )
{
ASSERT( rFrm.IsFlyFrm(), "SelectFlyFrm will einen Fly" );
@@ -266,20 +264,20 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
return;
//Damit der Anker ueberhaupt noch gepaintet wird.
- if( rFrm.IsFlyInCntFrm() && rFrm.GetAnchorFrm() )
- rFrm.GetAnchorFrm()->SetCompletePaint();
+ if( rFrm.IsFlyInCntFrm() && rFrm.GetAnchorFrm() )
+ rFrm.GetAnchorFrm()->SetCompletePaint();
- // --> OD 2004-06-11 #i28701# - no format at all.
-// //Hier wurde immer kalkuliert. Leider ist der Sonderfall Fly in Fly mit
-// //Spalten u.U. sehr kritisch wenn der innenliegende zuerst formatiert
-// //wird. Um kein Risiko einzugehen entschaerfen wir nur diesen Sonderfall.
-// if( !rFrm.GetAnchorFrm()->IsInFly() )
-// rFrm.Calc();
+ // --> OD 2004-06-11 #i28701# - no format at all.
+// //Hier wurde immer kalkuliert. Leider ist der Sonderfall Fly in Fly mit
+// //Spalten u.U. sehr kritisch wenn der innenliegende zuerst formatiert
+// //wird. Um kein Risiko einzugehen entschärfen wir nur diesen Sonderfall.
+// if( !rFrm.GetAnchorFrm()->IsInFly() )
+// rFrm.Calc();
- if( pImpl->GetDrawView()->AreObjectsMarked() )
- pImpl->GetDrawView()->UnmarkAll();
+ if( pImpl->GetDrawView()->AreObjectsMarked() )
+ pImpl->GetDrawView()->UnmarkAll();
- pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
+ pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
pImpl->GetPageView(), sal_False, sal_False );
KillPams();
ClearMark();
@@ -1038,8 +1036,8 @@ void SwFEShell::SetPageObjsNewPage( SvPtrarr& rFillArr, int nOffset )
SwFmtAnchor aNewAnchor( pFmt->GetAnchor() );
if ((FLY_AT_PAGE != aNewAnchor.GetAnchorId()) ||
0 >= ( nNewPage = aNewAnchor.GetPageNum() + nOffset ) )
- // chaos::Anchor wurde veraendert oder ungueltige SeitenNummer,
- // also nicht veraendern !!
+ // chaos::Anchor wurde verändert oder ungültige SeitenNummer,
+ // also nicht verändern !!
continue;
if( sal_uInt16(nNewPage) > nMaxPage )
@@ -1104,8 +1102,8 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
if( !rSet.Set( pFly->GetFmt()->GetAttrSet(), sal_True ) )
return sal_False;
- //Und die Attribute durchschaufeln. Unerlaubte Attribute entfernen, dann
- //alle restlichen Attribute besorgen und eintragen.
+ // Und die Attribute durchschaufeln. Unerlaubte Attribute entfernen, dann
+ // alle restlichen Attribute besorgen und eintragen.
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == rSet.GetItemState( RES_ANCHOR, sal_False, &pItem ) )
{
@@ -1115,7 +1113,7 @@ sal_Bool SwFEShell::GetFlyFrmAttr( SfxItemSet &rSet ) const
if ( FLY_AT_PAGE != eType )
{
// OD 12.11.2003 #i22341# - content anchor of anchor item is needed.
- // Thus, don't overwrite anchor item by default contructed anchor item.
+ // Thus, don't overwrite anchor item by default constructed anchor item.
//rSet.Put( SwFmtAnchor( eType ) );
if ( FLY_AS_CHAR == eType )
{
@@ -1633,7 +1631,7 @@ const uno::Reference < embed::XEmbeddedObject > SwFEShell::GetOleRef() const
xObj = pNd->GetOLEObj().GetOleRef();
}
return xObj;
-}
+}
String SwFEShell::GetUniqueGrfName() const
@@ -2081,7 +2079,7 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
{
String aString = (*aIt)->GetName();
- /* rFmt is not a vaild successor or predecessor of
+ /* rFmt is not a valid successor or predecessor of
itself */
if (aString != rReference && aString != rFmt.GetName())
{
@@ -2208,7 +2206,7 @@ void SwFEShell::SetObjDescription( const String& rDescription )
void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly )
{
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 1
SvGlobalName aCLSID( xObj->getClassID() );
const bool bStarMath = ( SotExchange::IsMath( aCLSID ) != 0 );
ASSERT( bStarMath, "AlignFormulaToBaseline should only be called for Math objects" );
@@ -2226,7 +2224,7 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
if ( pFly && pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
{
// get baseline from Math object
- uno::Any aBaseline;
+ uno::Any aBaseline;
if( svt::EmbeddedObjectRef::TryRunningState( xObj ) )
{
uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY );
@@ -2259,23 +2257,22 @@ void SwFEShell::AlignFormulaToBaseline( const uno::Reference < embed::XEmbeddedO
SwFmtVertOrient aVert( rVert );
aVert.SetPos( -nBaseline );
aVert.SetVertOrient( com::sun::star::text::VertOrientation::NONE );
-
+
pFrmFmt->LockModify();
pFrmFmt->SetFmtAttr( aVert );
pFrmFmt->UnlockModify();
pFly->InvalidatePos();
- }
+ }
}
-
void SwFEShell::AlignAllFormulasToBaseline()
{
- StartAllAction();
+ StartAllAction();
- SwStartNode *pStNd;
- SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
- while ( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
- {
+ SwStartNode *pStNd;
+ SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
+ while ( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
+ {
++aIdx;
SwOLENode *pOleNode = dynamic_cast< SwOLENode * >( &aIdx.GetNode() );
if ( pOleNode )
@@ -2287,10 +2284,12 @@ void SwFEShell::AlignAllFormulasToBaseline()
if ( SotExchange::IsMath( aCLSID ) )
AlignFormulaToBaseline( xObj );
}
- }
+ }
- aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
- }
+ aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 );
+ }
- EndAllAction();
+ EndAllAction();
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl b/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
index 5d4232559b..0460d8d6e8 100644
--- a/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
+++ b/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,21 +7,19 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
-#ifndef __com_sun_star_reflection_InvaildTypeNameException_idl__
+#ifndef __com_sun_star_reflection_InvalidTypeNameException_idl__
#define __com_sun_star_reflection_InvalidTypeNameException_idl__
#ifndef __com_sun_star_uno_Exception_idl__
@@ -43,7 +41,6 @@ published exception InvalidTypeNameException : com::sun::star::uno::Exception
{
};
-
//=============================================================================
}; }; }; };
diff --git a/main/vcl/inc/unx/wmadaptor.hxx b/main/vcl/inc/unx/wmadaptor.hxx
index c22bb34bfa..22a2ccf444 100644
--- a/main/vcl/inc/unx/wmadaptor.hxx
+++ b/main/vcl/inc/unx/wmadaptor.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _VCL_WMADAPTOR_HXX_
#define _VCL_WMADAPTOR_HXX_
@@ -97,7 +95,7 @@ public:
WIN_ICONS,
WIN_WORKSPACE_NAMES,
WIN_CLIENT_LIST,
-
+
// atoms for general WM hints
WM_STATE,
MOTIF_WM_HINTS,
@@ -124,7 +122,7 @@ public:
};
/*
- * flags for frame decoration
+ * flags for frame decoration
*/
static const int decoration_Title = 0x00000001;
static const int decoration_Border = 0x00000002;
@@ -135,7 +133,7 @@ public:
static const int decoration_All = 0x10000000;
/*
- * window type
+ * window type
*/
enum WMWindowType
{
@@ -171,8 +169,8 @@ protected:
bool getNetWmName();
/*
- * returns whether this instance is useful
- * only useful for createWMAdaptor
+ * returns whether this instance is useful
+ * only useful for createWMAdaptor
*/
virtual bool isValid() const;
@@ -181,19 +179,19 @@ public:
virtual ~WMAdaptor();
/*
- * creates a vaild WMAdaptor instance for the SalDisplay
+ * creates a valid WMAdaptor instance for the SalDisplay
*/
static WMAdaptor* createWMAdaptor( SalDisplay* );
/*
- * may return an empty string if the window manager could
- * not be identified.
+ * may return an empty string if the window manager could
+ * not be identified.
*/
const String& getWindowManagerName() const
{ return m_aWMName; }
/*
- * gets the number of workareas
+ * gets the number of workareas
*/
int getWorkAreaCount() const
{ return m_aWMWorkAreas.size(); }
@@ -207,22 +205,22 @@ public:
*/
int getWindowWorkArea( XLIB_Window aWindow ) const;
/*
- * gets the specified workarea
+ * gets the specified workarea
*/
const Rectangle& getWorkArea( int n ) const
{ return m_aWMWorkAreas[n]; }
-
+
/*
* attempt to switch the desktop to a certain workarea
* if bConsiderWM is true, then on some WMs the call will not result in any action
*/
void switchToWorkArea( int nWorkArea, bool bConsiderWM = true ) const;
-
+
/*
- * sets window title
+ * sets window title
*/
virtual void setWMName( X11SalFrame* pFrame, const String& rWMName ) const;
-
+
/*
* set NET_WM_PID
*/
@@ -232,26 +230,26 @@ public:
* set WM_CLIENT_MACHINE
*/
virtual void setClientMachine( X11SalFrame* pFrame ) const;
-
+
virtual void answerPing( X11SalFrame*, XClientMessageEvent* ) const;
/*
- * maximizes frame
- * maximization can be toggled in either direction
- * to get the original position and size
- * use maximizeFrame( pFrame, false, false )
+ * maximizes frame
+ * maximization can be toggled in either direction
+ * to get the original position and size
+ * use maximizeFrame( pFrame, false, false )
*/
virtual void maximizeFrame( X11SalFrame* pFrame, bool bHorizontal = true, bool bVertical = true ) const;
/*
- * start/stop fullscreen mode on a frame
+ * start/stop fullscreen mode on a frame
*/
virtual void showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const;
/*
- * tell whether legacy partial full screen handling is necessary
- * see #i107249#: NET_WM_STATE_FULLSCREEN is not well defined, but de facto
- * modern WM's interpret it the "right" way, namely they make "full screen"
- * taking twin view or Xinerama into account and honor the positioning hints
- * to see which screen actually was meant to use for fullscreen.
+ * tell whether legacy partial full screen handling is necessary
+ * see #i107249#: NET_WM_STATE_FULLSCREEN is not well defined, but de facto
+ * modern WM's interpret it the "right" way, namely they make "full screen"
+ * taking twin view or Xinerama into account and honor the positioning hints
+ * to see which screen actually was meant to use for fullscreen.
*/
bool isLegacyPartialFullscreen() const
{ return m_bLegacyPartialFullscreen; }
@@ -268,55 +266,55 @@ public:
* set _NET_WM_USER_TIME property, if NetWM
*/
virtual void setUserTime( X11SalFrame* i_pFrame, long i_nUserTime ) const;
-
+
/*
- * tells whether fullscreen mode is supported by WM
+ * tells whether fullscreen mode is supported by WM
*/
bool supportsFullScreen() const { return m_aWMAtoms[ NET_WM_STATE_FULLSCREEN ] != 0; }
/*
- * shade/unshade frame
+ * shade/unshade frame
*/
virtual void shade( X11SalFrame* pFrame, bool bToShaded ) const;
/*
- * set hints what decoration is needed;
- * must be called before showing the frame
+ * set hints what decoration is needed;
+ * must be called before showing the frame
*/
virtual void setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pTransientFrame = NULL ) const;
/*
- * tells whether there is WM support for splash screens
+ * tells whether there is WM support for splash screens
*/
bool supportsSplash() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_SPLASH ] != 0; }
/*
- * tells whteher there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR
+ * tells whether there is WM support for NET_WM_WINDOW_TYPE_TOOLBAR
*/
bool supportsToolbar() const { return m_aWMAtoms[ NET_WM_WINDOW_TYPE_TOOLBAR ] != 0; }
/*
- * enables always on top or equivalent if possible
+ * enables always on top or equivalent if possible
*/
virtual void enableAlwaysOnTop( X11SalFrame* pFrame, bool bEnable ) const;
/*
- * tells whether enableAlwaysOnTop actually works with this WM
+ * tells whether enableAlwaysOnTop actually works with this WM
*/
bool isAlwaysOnTopOK() const { return m_bEnableAlwaysOnTopWorks; }
-
+
/*
- * handle WM messages (especially WM state changes)
+ * handle WM messages (especially WM state changes)
*/
virtual int handlePropertyNotify( X11SalFrame* pFrame, XPropertyEvent* pEvent ) const;
-
+
/*
* called by SalFrame::Show: time to update state properties
*/
virtual void frameIsMapping( X11SalFrame* ) const;
/*
- * gets a WM atom
+ * gets a WM atom
*/
Atom getAtom( WMAtom eAtom ) const
{ return m_aWMAtoms[ eAtom ]; }
@@ -333,23 +331,25 @@ public:
{ return m_nInitWinGravity; }
/*
- * expected behaviour is that the WM will not allow transient
- * windows to get stacked behind the windows they are transient for
+ * expected behavior is that the WM will not allow transient
+ * windows to get stacked behind the windows they are transient for
*/
bool isTransientBehaviourAsExpected() const
{ return m_bTransientBehaviour; }
/*
- * changes the transient hint of a window to reference frame
- * if reference frame is NULL the root window is used instead
+ * changes the transient hint of a window to reference frame
+ * if reference frame is NULL the root window is used instead
*/
void changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame* pReferenceFrame ) const;
-
+
/* set fullscreen monitor range; takes X11 window as input since it is also used by gtk plugin
*/
- virtual void setFullScreenMonitors( XLIB_Window i_aWindow, sal_Int32 i_nScreen );
+ virtual void setFullScreenMonitors( XLIB_Window i_aWindow, sal_Int32 i_nScreen );
};
} // namespace
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/unx/generic/fontmanager/parseAFM.hxx b/main/vcl/unx/generic/fontmanager/parseAFM.hxx
index 35277905b5..fcd8bf6e02 100644
--- a/main/vcl/unx/generic/fontmanager/parseAFM.hxx
+++ b/main/vcl/unx/generic/fontmanager/parseAFM.hxx
@@ -73,7 +73,7 @@
*
* There is a procedure in parseAFM.c, called parseFile, that can be
* called from any application wishing to get information from the AFM File.
- * This procedure expects 3 parameters: a vaild file descriptor, a pointer
+ * This procedure expects 3 parameters: a valid file descriptor, a pointer
* to a (FontInfo *) variable (for which space will be allocated and then
* will be filled in with the data requested), and a mask specifying
* which data from the AFM File should be saved in the FontInfo structure.
@@ -128,7 +128,7 @@ namespace psp {
* parser went on. This could include problems like the count for any given
* section does not add up to how many entries there actually were, or
* there was a key that was not recognized. The return record may contain
- * vaild data or it may not.
+ * valid data or it may not.
*
* earlyEOF means that an End of File was encountered before expected. This
* may mean that the AFM file had been truncated, or improperly formed.