[Libreoffice-commits] .: 2 commits - bean/com chart2/Library_charttools.mk chart2/source comphelper/inc cui/source dbaccess/source extensions/source forms/source formula/inc formula/source framework/inc framework/source idl/source l10ntools/inc l10ntools/source odk/examples reportdesign/inc reportdesign/source rsc/inc rsc/source sc/inc sc/source sd/source sfx2/source solenv/bin svtools/inc svtools/source svx/inc svx/source sw/inc sw/source tools/inc tools/source unotools/inc unotools/source uui/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Jul 30 00:26:40 PDT 2012
bean/com/sun/star/comp/beans/OOoBean.java | 4
chart2/Library_charttools.mk | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/main/UndoCommandDispatch.cxx | 2
chart2/source/inc/ResourceManager.hxx | 47 +++++++++
chart2/source/inc/RessourceManager.hxx | 47 ---------
chart2/source/tools/ResId.cxx | 4
chart2/source/tools/ResourceManager.cxx | 41 ++++++++
chart2/source/tools/RessourceManager.cxx | 41 --------
comphelper/inc/comphelper/componentmodule.hxx | 2
cui/source/customize/eventdlg.hrc | 2
dbaccess/source/core/inc/core_resource.hxx | 4
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
dbaccess/source/ui/inc/moduledbu.hxx | 4
dbaccess/source/ui/misc/moduledbu.cxx | 16 +--
extensions/source/inc/componentmodule.cxx | 18 +--
extensions/source/inc/componentmodule.hxx | 4
forms/source/inc/frm_resource.hxx | 2
formula/inc/formula/omoduleclient.hxx | 2
formula/source/core/inc/core_resource.hxx | 4
formula/source/ui/inc/ModuleHelper.hxx | 2
formula/source/ui/resource/ModuleHelper.cxx | 16 +--
framework/inc/dispatch/menudispatcher.hxx | 2
framework/inc/jobs/job.hxx | 4
framework/inc/services/logindialog.hxx | 18 +--
framework/inc/services/pathsettings.hxx | 2
framework/source/classes/framecontainer.cxx | 2
framework/source/classes/taskcreator.cxx | 2
framework/source/dispatch/mailtodispatcher.cxx | 2
framework/source/jobs/job.cxx | 8 -
framework/source/jobs/jobdata.cxx | 2
framework/source/jobs/jobdispatch.cxx | 4
framework/source/jobs/jobresult.cxx | 2
framework/source/services/backingcomp.cxx | 4
framework/source/unotypes/fwl.xml | 2
idl/source/prj/command.cxx | 2
l10ntools/inc/cfgmerge.hxx | 6 -
l10ntools/inc/export.hxx | 2
l10ntools/inc/tokens.h | 6 -
l10ntools/source/cfgmerge.cxx | 10 +-
l10ntools/source/export.cxx | 12 +-
l10ntools/source/srclex.l | 10 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java | 2
reportdesign/inc/ModuleHelper.hxx | 4
reportdesign/source/core/inc/core_resource.hxx | 2
reportdesign/source/core/sdr/ModuleHelper.cxx | 16 +--
rsc/inc/rscall.h | 2
rsc/source/parser/erscerr.cxx | 2
rsc/source/rsc/rsc.cxx | 6 -
sc/inc/sc.hrc | 2
sc/source/filter/xml/xmldrani.cxx | 4
sc/source/filter/xml/xmldrani.hxx | 4
sc/source/filter/xml/xmlimprt.cxx | 6 -
sc/source/filter/xml/xmlimprt.hxx | 6 -
sc/source/ui/dbgui/tpsort.cxx | 4
sc/source/ui/inc/tpsort.hxx | 4
sc/source/ui/pagedlg/hfedtdlg.src | 2
sd/source/core/glob.src | 2
sfx2/source/control/templatelocalview.cxx | 1
sfx2/source/doc/printhelper.cxx | 4
solenv/bin/deliver.pl | 2
svtools/inc/svtools/collatorres.hxx | 16 +--
svtools/inc/svtools/indexentryres.hxx | 16 +--
svtools/source/control/collatorres.cxx | 48 +++++-----
svtools/source/control/ctrlbox.src | 2
svtools/source/control/indexentryres.cxx | 44 ++++-----
svx/inc/svx/fmresids.hrc | 4
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 2
sw/inc/rcid.hrc | 2
sw/source/ui/config/optdlg.src | 2
sw/source/ui/config/redlopt.src | 2
sw/source/ui/inc/srtdlg.hxx | 4
sw/source/ui/inc/swuicnttab.hxx | 4
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/lingu/olmenu.src | 2
sw/source/ui/misc/autocorr.src | 2
sw/source/ui/misc/linenum.src | 2
sw/source/ui/misc/num.src | 2
sw/source/ui/misc/redlndlg.src | 2
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/ui/ribbar/inputwin.src | 4
sw/source/ui/smartmenu/stmenu.src | 2
sw/source/ui/table/chartins.src | 2
tools/inc/tools/resmgr.hxx | 2
tools/source/rc/resmgr.cxx | 4
unotools/inc/unotools/componentresmodule.hxx | 2
unotools/source/misc/componentresmodule.cxx | 14 +-
uui/source/fltdlg.cxx | 2
90 files changed, 322 insertions(+), 321 deletions(-)
New commits:
commit 68f0d408a4261a86b5d1e4fedf1d473c6873dcef
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 30 09:24:31 2012 +0200
Missing #include
Change-Id: I722621fac1be2fdcfff6f1b141d417208385f062
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index e1916da..bc1cf1b 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -11,6 +11,7 @@
#include <comphelper/processfactory.hxx>
#include <sfx2/doctempl.hxx>
+#include <sfx2/templatelocalviewitem.hxx>
#include <sfx2/templateview.hxx>
#include <sfx2/templateviewitem.hxx>
#include <sfx2/templatefolderviewitem.hxx>
commit 889de665ec9d2ac25a9dccd4830cb97ed0c7c56e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jul 30 08:41:34 2012 +0200
Typo ressource -> resource
Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java
index f5eac0e..07e6e1a 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -522,7 +522,7 @@ public class OOoBean
if either of the arguments is out of the specified range.
@throws java.io.IOException
- if an IO error occurs reading the ressource specified by the URL.
+ if an IO error occurs reading the resource specified by the URL.
@throws com.sun.star.lang.NoConnectionException
if no connection can be established.
@@ -806,7 +806,7 @@ public class OOoBean
if either of the arguments is out of the specified range.
@throws java.io.IOException
- if an IO error occurs reading the ressource specified by the URL.
+ if an IO error occurs reading the resource specified by the URL.
@throws com.sun.star.lang.NoConnectionException
if no connection is established.
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index d38804d..2e4eb6b 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -105,7 +105,7 @@ $(eval $(call gb_Library_add_exception_objects,charttools,\
chart2/source/tools/RelativePositionHelper \
chart2/source/tools/RelativeSizeHelper \
chart2/source/tools/ResId \
- chart2/source/tools/RessourceManager \
+ chart2/source/tools/ResourceManager \
chart2/source/tools/Scaling \
chart2/source/tools/SceneProperties \
chart2/source/tools/_serviceregistration_tools \
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index e54339c..e3c4401 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1490,7 +1490,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/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 6f0728f..24cfb50 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -29,7 +29,7 @@
#include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h>
-// for ressource strings STR_UNDO and STR_REDO
+// for resource strings STR_UNDO and STR_REDO
#include <svtools/svtools.hrc>
#include <svtools/svtresid.hxx>
diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx
new file mode 100644
index 0000000..1659461
--- /dev/null
+++ b/chart2/source/inc/ResourceManager.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 regarding copyright
+ * ownership. The ASF licenses this file 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 .
+ */
+#ifndef CHART2_RESOURCEMANAGER_HXX
+#define CHART2_RESOURCEMANAGER_HXX
+
+#include "charttoolsdllapi.hxx"
+
+// defined in <tools/resmgr.hxx>
+class ResMgr;
+
+namespace chart
+{
+
+class ResourceManager
+{
+public:
+ static ::ResMgr & getResourceManager();
+
+private:
+ // not implemented -- avoid instantiation
+ ResourceManager();
+
+ static ::ResMgr * m_pResourceManager;
+};
+
+} // namespace chart
+
+// CHART2_RESOURCEMANAGER_HXX
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx
deleted file mode 100644
index 07a3bdf..0000000
--- a/chart2/source/inc/RessourceManager.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-#ifndef CHART2_RESSOURCEMANAGER_HXX
-#define CHART2_RESSOURCEMANAGER_HXX
-
-#include "charttoolsdllapi.hxx"
-
-// defined in <tools/resmgr.hxx>
-class ResMgr;
-
-namespace chart
-{
-
-class RessourceManager
-{
-public:
- static ::ResMgr & getRessourceManager();
-
-private:
- // not implemented -- avoid instantiation
- RessourceManager();
-
- static ::ResMgr * m_pRessourceManager;
-};
-
-} // namespace chart
-
-// CHART2_RESSOURCEMANAGER_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx
index be273d6..ed4c80e 100644
--- a/chart2/source/tools/ResId.cxx
+++ b/chart2/source/tools/ResId.cxx
@@ -19,14 +19,14 @@
#include "ResId.hxx"
-#include "RessourceManager.hxx"
+#include "ResourceManager.hxx"
#include <tools/string.hxx>
namespace chart
{
SchResId::SchResId( sal_Int16 nId )
- : ResId( nId, RessourceManager::getRessourceManager() )
+ : ResId( nId, ResourceManager::getResourceManager() )
{
}
diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx
new file mode 100644
index 0000000..db7ea9d
--- /dev/null
+++ b/chart2/source/tools/ResourceManager.cxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 regarding copyright
+ * ownership. The ASF licenses this file 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 .
+ */
+
+
+#include "ResourceManager.hxx"
+
+#include <tools/resmgr.hxx>
+
+namespace chart
+{
+
+ResMgr * ResourceManager::m_pResourceManager = 0;
+
+ResMgr & ResourceManager::getResourceManager()
+{
+ // not threadsafe
+ if( ! m_pResourceManager )
+ m_pResourceManager = ResMgr::CreateResMgr("chartcontroller");
+ OSL_ASSERT( m_pResourceManager );
+ return *m_pResourceManager;
+}
+
+} // namespace chart
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RessourceManager.cxx b/chart2/source/tools/RessourceManager.cxx
deleted file mode 100644
index 29a68ee..0000000
--- a/chart2/source/tools/RessourceManager.cxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- */
-
-
-#include "RessourceManager.hxx"
-
-#include <tools/resmgr.hxx>
-
-namespace chart
-{
-
-ResMgr * RessourceManager::m_pRessourceManager = 0;
-
-ResMgr & RessourceManager::getRessourceManager()
-{
- // not threadsafe
- if( ! m_pRessourceManager )
- m_pRessourceManager = ResMgr::CreateResMgr("chartcontroller");
- OSL_ASSERT( m_pRessourceManager );
- return *m_pRessourceManager;
-}
-
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 17b0da3..e01a133 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -169,7 +169,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/cui/source/customize/eventdlg.hrc b/cui/source/customize/eventdlg.hrc
index a9eb7d3..d51ba85 100644
--- a/cui/source/customize/eventdlg.hrc
+++ b/cui/source/customize/eventdlg.hrc
@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/* StarView ressource header file */
+/* StarView resource header file */
////DF temp to figure out what's needed from these
//DF #include "sfx.hrc"
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index af6b537..727d131 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -36,7 +36,7 @@ namespace dbaccess
//==================================================================
//= ResourceManager
- //= handling ressources within the DBA-Core library
+ //= handling resources within the DBA-Core library
//==================================================================
class ResourceManager
{
@@ -101,7 +101,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/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 3f7cc84..7bb0c29 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -25,7 +25,7 @@
namespace dbaui
{
// ================================================================================================
- // SbaCommentUndoAction - Undo-Basisklasse fuer Aktionen, deren GetComment einen aus einer Sba-Ressource
+ // SbaCommentUndoAction - Undo-Basisklasse fuer Aktionen, deren GetComment einen aus einer Sba-Resource
// geladenen String liefert
class OCommentUndoAction : public SfxUndoAction
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 84a2997..3d34259 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -67,7 +67,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
{
@@ -79,7 +79,7 @@ public:
//=========================================================================
//= ModuleRes
//=========================================================================
-/** specialized ResId, using the ressource manager provided by the global module
+/** specialized ResId, using the resource manager provided by the global module
*/
class ModuleRes : public ::ResId
{
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx
index 6702d3b..b18e7c0 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -40,21 +40,21 @@ namespace dbaui
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
+ ResMgr* m_pResources;
public:
/// ctor
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
DBG_NAME(OModuleImpl)
//-------------------------------------------------------------------------
OModuleImpl::OModuleImpl()
- :m_pRessources(NULL)
+ :m_pResources(NULL)
{
DBG_CTOR(OModuleImpl,NULL);
@@ -63,8 +63,8 @@ OModuleImpl::OModuleImpl()
//-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl()
{
- if (m_pRessources)
- delete m_pRessources;
+ if (m_pResources)
+ delete m_pResources;
DBG_DTOR(OModuleImpl,NULL);
}
@@ -74,12 +74,12 @@ ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
- if (!m_pRessources)
+ if (!m_pResources)
{
// create a manager with a fixed prefix
- m_pRessources = ResMgr::CreateResMgr(rtl::OString("dbu").getStr());
+ m_pResources = ResMgr::CreateResMgr(rtl::OString("dbu").getStr());
}
- return m_pRessources;
+ return m_pResources;
}
//=========================================================================
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 6c0b995..e60acbf 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -55,7 +55,7 @@ namespace COMPMOD_NAMESPACE
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
+ ResMgr* m_pResources;
sal_Bool m_bInitialized;
rtl::OString m_sFilePrefix;
@@ -64,14 +64,14 @@ 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; }
};
//-------------------------------------------------------------------------
OModuleImpl::OModuleImpl()
- :m_pRessources(NULL)
+ :m_pResources(NULL)
,m_bInitialized(sal_False)
{
}
@@ -79,27 +79,27 @@ namespace COMPMOD_NAMESPACE
//-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl()
{
- if (m_pRessources)
- delete m_pRessources;
+ if (m_pResources)
+ delete m_pResources;
}
//-------------------------------------------------------------------------
ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
- if (!m_pRessources && !m_bInitialized)
+ if (!m_pResources && !m_bInitialized)
{
DBG_ASSERT(!m_sFilePrefix.isEmpty(), "OModuleImpl::getResManager: no resource file prefix!");
// create a manager with a fixed prefix
- m_pRessources = ResMgr::CreateResMgr(m_sFilePrefix.getStr());
- DBG_ASSERT(m_pRessources,
+ m_pResources = ResMgr::CreateResMgr(m_sFilePrefix.getStr());
+ DBG_ASSERT(m_pResources,
rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ")
.append(m_sFilePrefix)
.append(")!").getStr());
m_bInitialized = sal_True;
}
- return m_pRessources;
+ return m_pResources;
}
//=========================================================================
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 3268264..6b4dadf 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -143,7 +143,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
{
@@ -155,7 +155,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//=========================================================================
//= ModuleRes
//=========================================================================
- /** specialized ResId, using the ressource manager provided by the global module
+ /** specialized ResId, using the resource manager provided by the global module
*/
class ModuleRes : public ::ResId
{
diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx
index 7a8be59..aa30f1c 100644
--- a/forms/source/inc/frm_resource.hxx
+++ b/forms/source/inc/frm_resource.hxx
@@ -31,7 +31,7 @@ namespace frm
//==================================================================
//= ResourceManager
- //= handling ressources within the FormLayer library
+ //= handling resources within the FormLayer library
//==================================================================
class ResourceManager
{
diff --git a/formula/inc/formula/omoduleclient.hxx b/formula/inc/formula/omoduleclient.hxx
index 72e774e..76fcee9 100644
--- a/formula/inc/formula/omoduleclient.hxx
+++ b/formula/inc/formula/omoduleclient.hxx
@@ -27,7 +27,7 @@
namespace formula {
-/** Base class for objects which use any global module-specific ressources.
+/** Base class for objects which use any global module-specific resources.
*/
class FORMULA_DLLPUBLIC OModuleClient: private boost::noncopyable
{
diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx
index fc8f7be..a16749b 100644
--- a/formula/source/core/inc/core_resource.hxx
+++ b/formula/source/core/inc/core_resource.hxx
@@ -29,7 +29,7 @@ namespace formula
{
//==================================================================
//= ResourceManager
- //= handling ressources within the FORMULA-Core library
+ //= handling resources within the FORMULA-Core library
//==================================================================
class ResourceManager
{
@@ -57,7 +57,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/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx
index 2e83053..fb89aae 100644
--- a/formula/source/ui/inc/ModuleHelper.hxx
+++ b/formula/source/ui/inc/ModuleHelper.hxx
@@ -62,7 +62,7 @@ namespace formula
//=========================================================================
//= ModuleRes
//=========================================================================
- /** specialized ResId, using the ressource manager provided by the global module
+ /** specialized ResId, using the resource manager provided by the global module
*/
class ModuleRes : public ::ResId
{
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index 6215f00..485e814 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -45,21 +45,21 @@ namespace formula
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
+ ResMgr* m_pResources;
public:
/// ctor
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
DBG_NAME( rpt_OModuleImpl )
//-------------------------------------------------------------------------
OModuleImpl::OModuleImpl()
- :m_pRessources(NULL)
+ :m_pResources(NULL)
{
DBG_CTOR( rpt_OModuleImpl,NULL);
@@ -68,8 +68,8 @@ OModuleImpl::OModuleImpl()
//-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl()
{
- if (m_pRessources)
- delete m_pRessources;
+ if (m_pResources)
+ delete m_pResources;
DBG_DTOR( rpt_OModuleImpl,NULL);
}
@@ -79,12 +79,12 @@ ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
- if (!m_pRessources)
+ if (!m_pResources)
{
// create a manager with a fixed prefix
- m_pRessources = ResMgr::CreateResMgr("forui");
+ m_pResources = ResMgr::CreateResMgr("forui");
}
- return m_pRessources;
+ return m_pResources;
}
//=========================================================================
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 8d22bff..43f32ce 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -215,7 +215,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/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 217ad0d..6d55a7c 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -119,7 +119,7 @@ class Job : public css::lang::XTypeProvider
/**
For some special cases we must know the environment, in which
this job runs. Means the frame inside which we may was triggered.
- We use it too, to listen for closing events of this ressource.
+ We use it too, to listen for closing events of this resource.
Please note: If m_xFrame is set - m_xModel should be NULL.
Only one environment can be supported realy.
@@ -129,7 +129,7 @@ class Job : public css::lang::XTypeProvider
/**
For some special cases we must know the environment, in which
this job runs. Means the document inside which we may was triggered.
- We use it too, to listen for closing events of this ressource.
+ We use it too, to listen for closing events of this resource.
Please note: If m_xModel is set - m_xFrame should be NULL.
Only one environment can be supported realy.
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index 115ca13..39919ff 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -226,13 +226,13 @@ 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 ressource should be used!
+ You must give us a language identifier to describe which resource should be used!
@seealso method setValues()
- @param "aLanguage" , identifier to describe ressource language
+ @param "aLanguage" , identifier to describe resource language
@param "pParent" , parent window handle for dialog! If is it NULL -> no parent exist ...
@return -
@@ -243,7 +243,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()
@@ -314,16 +314,16 @@ class cIMPL_Dialog : public ModalDialog
void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort );
/*-****************************************************************************************************//**
- @short get a ressource for given id from right ressource file
- @descr This dialog need his own ressource. We can't use the global ressource manager!
+ @short get a resource for given id from right resource file
+ @descr This dialog need his own resource. We can't use the global resource manager!
We must use our own.
- You must give us the ressource language. If no right ressource could be found -
+ You must give us the resource language. If no right resource could be found -
any existing one is used automaticly!
@seealso method setValues()
- @param "nId" ; id to convert it in right ressource id
- @param "aLanguage" ; type of ressource language
+ @param "nId" ; id to convert it in right resource id
+ @param "aLanguage" ; type of resource language
@return -
@onerror -
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 660a24b..36198ad 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -176,7 +176,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/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 6c2bbdd..cf33f93 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -84,7 +84,7 @@ FrameContainer::FrameContainer()
/**-***************************************************************************************************************
@short deinitialize may a filled container
- @descr Special features (if the currently are running) will be dsiabled and we free all used other ressources.
+ @descr Special features (if the currently are running) will be dsiabled and we free all used other resources.
@threadsafe not neccessary - its not a singleton
@modified 01.07.2002 14:43,as96863
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index 644ab54..4d7a35b 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -88,7 +88,7 @@ TaskCreator::TaskCreator( const css::uno::Reference< css::lang::XMultiServiceFac
/*-****************************************************************************************************//**
@short deinitialize instance
- @descr We should release all used ressource which are not needed any longer.
+ @descr We should release all used resource which are not needed any longer.
@modified 16.05.2002 09:33, as96863
*//*-*****************************************************************************************************/
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index ee00c47..cc7fe62 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -260,7 +260,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
@return <TRUE/> if dispatch could be started successfully
Note: Our internal used shell executor doesn't return any state value - so we must
belive that call was successfully.
- <FALSE/> if neccessary ressource couldn't be created or an exception was thrown.
+ <FALSE/> if neccessary resource couldn't be created or an exception was thrown.
@modified 30.04.2002 14:49, as96863
*/
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 5b61cd3..46e84ab 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -555,7 +555,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
connection.
Further we are listener for closing of the (possible valid)
- given frame. We must be shure, that this ressource won't be gone
+ given frame. We must be shure, that this resource won't be gone
if our internal job is still running.
*/
void Job::impl_startListening()
@@ -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 ...
}
//________________________________
@@ -895,7 +895,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent ,
void SAL_CALL Job::notifyClosing( 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 ...
}
//________________________________
@@ -934,7 +934,7 @@ void SAL_CALL Job::disposing( const css::lang::EventObject& aEvent ) throw(css::
/* } SAFE */
die();
- // Do nothing else here. Our internal ressources was released ...
+ // Do nothing else here. Our internal resources was released ...
}
} // namespace framework
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index a6cf7c4..f2b990a 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -152,7 +152,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/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 8f41143..d18ae51 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -117,11 +117,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/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index b78a82b..e97825b 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -172,7 +172,7 @@ JobResult::JobResult( const JobResult& rCopy )
//________________________________
/**
@short standard dtor
- @descr Free all internaly used ressources at the end of living.
+ @descr Free all internaly used resources at the end of living.
*/
JobResult::~JobResult()
{
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx
index 451af43..ff10901 100644
--- a/framework/source/services/backingcomp.cxx
+++ b/framework/source/services/backingcomp.cxx
@@ -667,7 +667,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
/** kill this instance.
It can be called from our owner frame only. But there is no possibility to check the calli.
- We have to release all our internal used ressources and die. From this point we can throw
+ We have to release all our internal used resources and die. From this point we can throw
DisposedExceptions for every further interface request ... but current implementation doesn`t do so ...
*/
@@ -782,7 +782,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference
currently not used
@throw com::sun::star::uno::RuntimeException
- if some ressources are missing
+ if some resources are missing
Means if may be attachedFrame() wasn't called before.
*/
diff --git a/framework/source/unotypes/fwl.xml b/framework/source/unotypes/fwl.xml
index a9693de..823d520 100644
--- a/framework/source/unotypes/fwl.xml
+++ b/framework/source/unotypes/fwl.xml
@@ -9,7 +9,7 @@
<author> Andreas Schluens </author>
<name> com.sun.star.comp.framework.TypeDetection </name>
<description>
- Supports a type detection of a specified ressource (document).
+ Supports a type detection of a specified resource (document).
</description>
<loader-name> com.sun.star.loader.SharedLibrary </loader-name>
<language> c++ </language>
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 73e10f8..a8b5ef1 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -110,7 +110,7 @@ char CommandLineSyntax[] =
"-fs<slotmap file> -fl<listing file>\n"
"-fo<odl file> -fd<data base file>\n"
"-fi<item implementation> -ft<type library file> (not OLE)\n"
-"-fr<ressource file> -fm<makefile target file>\n"
+"-fr<resource file> -fm<makefile target file>\n"
"-fC<c++ source file> -fH<c++ header file>\n"
"-fc<c source file> -fh<c header file>\n"
"-rsc <*.srs header line>\n"
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 6c82cc3..c554aaf 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -122,7 +122,7 @@ protected:
rtl::OString &rText,
const rtl::OString &rLangIndex )=0;
- virtual void WorkOnRessourceEnd()=0;
+ virtual void WorkOnResourceEnd()=0;
virtual void Output(const rtl::OString & rOutput)=0;
@@ -174,7 +174,7 @@ protected:
const rtl::OString &rIsoLang
);
- void WorkOnRessourceEnd();
+ void WorkOnResourceEnd();
void Output(const rtl::OString& rOutput);
public:
CfgExport(
@@ -202,7 +202,7 @@ private:
protected:
virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex);
- void WorkOnRessourceEnd();
+ void WorkOnResourceEnd();
void Output(const rtl::OString& rOutput);
public:
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index bf1809b..7e6a912 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -398,7 +398,7 @@ public:
//
/******************************************************************************
-* Purpose: holds information of data to merge (one ressource)
+* Purpose: holds information of data to merge (one resource)
******************************************************************************/
class MergeDataFile;
diff --git a/l10ntools/inc/tokens.h b/l10ntools/inc/tokens.h
index c42ee50..1d035a7 100644
--- a/l10ntools/inc/tokens.h
+++ b/l10ntools/inc/tokens.h
@@ -39,9 +39,9 @@
/*------------------------------------------------------ */
#define CONDITION 501 /* #if... | #endif ... | ... */
#define EMPTYLINE 502 /* */
-#define RESSOURCE 503 /* Menu MID_TEST */
-#define RESSOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */
-#define SMALRESSOURCE 505 /* PageItem { */
+#define RESOURCE 503 /* Menu MID_TEST */
+#define RESOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */
+#define SMALRESOURCE 505 /* PageItem { */
#define TEXTLINE 506 /* TEXT = "hhh" */
#define LONGTEXTLINE 507 /* TEXT = "hhh" TEST "HHH" ... */
#define TEXT 508 /* "Something like this" */
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index faaa6d5..92427af 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -294,7 +294,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
break;
case CFG_TEXT_START: {
if ( sCurrentResTyp != sTokenName ) {
- WorkOnRessourceEnd();
+ WorkOnResourceEnd();
rtl::OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ];
@@ -330,7 +330,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
}
else if ( sTokenName == "label" ) {
if ( sCurrentResTyp != sTokenName ) {
- WorkOnRessourceEnd();
+ WorkOnResourceEnd();
rtl::OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ];
@@ -348,7 +348,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName ))
{
if (sCurrentText.isEmpty())
- WorkOnRessourceEnd();
+ WorkOnResourceEnd();
aStack.Pop();
pStackData = aStack.GetStackData();
}
@@ -476,7 +476,7 @@ CfgExport::~CfgExport()
}
/*****************************************************************************/
-void CfgExport::WorkOnRessourceEnd()
+void CfgExport::WorkOnResourceEnd()
/*****************************************************************************/
{
if ( bLocalize ) {
@@ -612,7 +612,7 @@ void CfgMerge::Output(const rtl::OString& rOutput)
}
/*****************************************************************************/
-void CfgMerge::WorkOnRessourceEnd()
+void CfgMerge::WorkOnResourceEnd()
/*****************************************************************************/
{
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 065d7b7..fc6f5bc 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -359,9 +359,9 @@ int Export::Execute( int nToken, const char * pToken )
// res. exists at cur. level
pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
}
- else if (( nToken != RESSOURCE ) &&
- ( nToken != RESSOURCEEXPR ) &&
- ( nToken != SMALRESSOURCE ) &&
+ else if (( nToken != RESOURCE ) &&
+ ( nToken != RESOURCEEXPR ) &&
+ ( nToken != SMALRESOURCE ) &&
( nToken != LEVELUP ) &&
( nToken != NORMDEFINE ) &&
( nToken != RSCDEFINE ) &&
@@ -454,8 +454,8 @@ int Export::Execute( int nToken, const char * pToken )
case RSCDEFINE:
bDefine = sal_True; // res. defined in macro
- case RESSOURCE:
- case RESSOURCEEXPR: {
+ case RESOURCE:
+ case RESOURCEEXPR: {
bDontWriteOutput = sal_False;
if ( nToken != RSCDEFINE )
bNextMustBeDefineEOL = sal_False;
@@ -495,7 +495,7 @@ int Export::Execute( int nToken, const char * pToken )
}
}
break;
- case SMALRESSOURCE: {
+ case SMALRESOURCE: {
bDontWriteOutput = sal_False;
// this is the beginning of a new res.
bNextMustBeDefineEOL = sal_False;
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 2fbd3f0..e99eea4 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -1,7 +1,7 @@
%{
/*
- * lexer for parsing ressource source files (*.src)
+ * lexer for parsing resource source files (*.src)
*
*/
@@ -112,13 +112,13 @@ void YYWarning();
[a-zA-Z]+[ \t]+[^={;\n]+\n[ \t]*"#".*\n[ \t]*"{" |
[a-zA-Z]+[ \t]+[^={;\n]+\n?([ \t]*"//".*\n)*[ \t]*"{" {
-/* RESSOURCE // String TTT_XX ... */
- WorkOnTokenSet( RESSOURCE, yytext );
+/* RESOURCE // String TTT_XX ... */
+ WorkOnTokenSet( RESOURCE, yytext );
}
^[\t ]*[a-zA-Z_]+[\t ]*"\\"?[\t ]*\n?[ \t]*"{"[\t ]*"\\"? {
-/* SMALRESSOURCE // String ... */
- WorkOnTokenSet( SMALRESSOURCE, yytext );
+/* SMALRESOURCE // String ... */
+ WorkOnTokenSet( SMALRESOURCE, yytext );
}
[\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[ \t]*L?\".*\".*\n? {
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
index 0a53b9a..36d2c8c 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
@@ -224,7 +224,7 @@ public class CustomizeView extends JPanel
* @param aEvent
* describes the check box and his state
* we can use to toogle the requested office
- * ressource.
+ * resource.
*/
public void actionPerformed(ActionEvent aEvent)
{
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 8f3f7f1..9fcee93 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -310,7 +310,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 automaticly if scope wil be leaved.
System.out.println("May be the NativeView object wasn't realy visible at calling time of getNativeWindow()?");
xPeer = null;
@@ -393,7 +393,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) automaticly.
+ // and free all internal used resources (e.g. the container window) automaticly.
// 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/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
index da1b68b..8370659 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
@@ -590,7 +590,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 neccessary here - because this frame dies and wish to forgoten.
*
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index ad1cb67..297216e 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -72,7 +72,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
{
@@ -84,7 +84,7 @@ namespace rptui
//=========================================================================
//= ModuleRes
//=========================================================================
- /** specialized ResId, using the ressource manager provided by the global module
+ /** specialized ResId, using the resource manager provided by the global module
*/
class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
{
diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx
index 078ae04..468cabb 100644
--- a/reportdesign/source/core/inc/core_resource.hxx
+++ b/reportdesign/source/core/inc/core_resource.hxx
@@ -32,7 +32,7 @@ namespace reportdesign
//==================================================================
//= ResourceManager
- //= handling ressources within the DBA-Core library
+ //= handling resources within the DBA-Core library
//==================================================================
class ResourceManager
{
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index 58a2860..f6f6071 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -54,21 +54,21 @@ namespace rptui
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
+ ResMgr* m_pResources;
public:
/// ctor
OModuleImpl();
~OModuleImpl();
- /// get the manager for the ressources of the module
+ /// get the manager for the resources of the module
ResMgr* getResManager();
};
DBG_NAME( rpt_OModuleImpl )
//-------------------------------------------------------------------------
OModuleImpl::OModuleImpl()
- :m_pRessources(NULL)
+ :m_pResources(NULL)
{
DBG_CTOR( rpt_OModuleImpl,NULL);
@@ -77,8 +77,8 @@ OModuleImpl::OModuleImpl()
//-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl()
{
- if (m_pRessources)
- delete m_pRessources;
+ if (m_pResources)
+ delete m_pResources;
DBG_DTOR( rpt_OModuleImpl,NULL);
}
@@ -88,12 +88,12 @@ ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
- if (!m_pRessources)
+ if (!m_pResources)
{
// create a manager with a fixed prefix
- m_pRessources = ResMgr::CreateResMgr("rptui");
+ m_pResources = ResMgr::CreateResMgr("rptui");
}
- return m_pRessources;
+ return m_pResources;
}
//=========================================================================
diff --git a/rsc/inc/rscall.h b/rsc/inc/rscall.h
index 9bddec4..789df42 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.h
@@ -64,7 +64,7 @@ extern AtomContainer* pHS;
#define INCLUDE_FLAG 0x0040 // der Include-Pfad wurde erweitert
#define MSCPREPRO_FLAG 0x0080 // spezial Preprozessor
#define PRINTSYNTAX_FLAG 0x0100 // Syntax ausgeben
-#define PRELOAD_FLAG 0x0200 // Alle Ressourcen Preloaden
+#define PRELOAD_FLAG 0x0200 // Alle Resourcen Preloaden
#define SMART_FLAG 0x0400 // abgekuertze Name
#define SRSDEFAULT_FLAG 0x1000 // immer der Default geschrieben
#define NOSYSRESTEST_FLAG 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur)
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index b2442f0..e08cefa 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -192,7 +192,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
StdLstOut( "-fh=<filename> Header file.\n" );
StdLstOut( "-fc=<filename> Code file.\n" );
StdLstOut( "-ft=<filename> Touch a file when done in rsc2 (for dependencies)\n" );
- StdLstOut( "-fr=<filename> Ressource constructor .cxx-file.\n" );
+ StdLstOut( "-fr=<filename> Resource constructor .cxx-file.\n" );
StdLstOut( "-fx=<filename> Name of .src-file.\n" );
StdLstOut( "-oil=<dir> Output directory for image list files\n" );
StdLstOut( "-r<ENV>=<path> replace <path> by <ENV> in image list files\n" );
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index cdf3ff4..d422de9 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -176,7 +176,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
}
}
else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
- { // Alle Ressourcen mit Preload
+ { // Alle Resourcen mit Preload
nCommands |= PRELOAD_FLAG;
}
else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) )
@@ -249,7 +249,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
aOutputCxx = (*ppStr) + 4;
}
else if( !rsc_strnicmp( (*ppStr) + 1, "fr=", 3 ) )
- { // Name fuer .cxx-file der Ressource Konstruktoren
+ { // Name fuer .cxx-file der Resource Konstruktoren
aOutputRcCtor = (*ppStr) + 4;
}
else if( !rsc_strnicmp( (*ppStr) + 1, "fx=", 3 ) )
@@ -992,7 +992,7 @@ ERRTYPE RscCompiler::Link()
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) )
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputRcCtor.getStr() );
- pTC->pEH->StdOut( "Generating .cxx ressource constructor file\n" );
+ pTC->pEH->StdOut( "Generating .cxx resource constructor file\n" );
// Schreibe Datei
pTC->WriteRcCtor( foutput );
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e92ec8c..b5e6b8a 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -647,7 +647,7 @@
#define SID_SORT_USERDEF (SC_PARAM_START+4)
#define SID_SORT_NATURALSORT (SC_PARAM_START+5)
-// ressources
+// resources
#define RID_OBJECTBAR_APP (SC_RESOURCE_START)
#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1)
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 479e61c..e8fc14e 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -320,7 +320,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
{
ScImportParam aParam;
aParam.bNative = bNative;
- aParam.aDBName = sDatabaseName.isEmpty() ? sConnectionRessource : sDatabaseName;
+ aParam.aDBName = sDatabaseName.isEmpty() ? sConnectionResource : sDatabaseName;
aParam.aStatement = sSourceObject;
sheet::DataImportMode eMode = static_cast<sheet::DataImportMode>(nSourceType);
switch (eMode)
@@ -741,7 +741,7 @@ ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
}
}
if (!sConRes.isEmpty())
- pDatabaseRangeContext->SetConnectionRessource(sConRes);
+ pDatabaseRangeContext->SetConnectionResource(sConRes);
}
ScXMLConResContext::~ScXMLConResContext()
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index ff659f8..b035bc5 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -80,7 +80,7 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
boost::scoped_ptr<ScQueryParam> mpQueryParam;
ScRange maRange;
rtl::OUString sDatabaseRangeName;
- rtl::OUString sConnectionRessource;
+ rtl::OUString sConnectionResource;
rtl::OUString sDatabaseName;
rtl::OUString sSourceObject;
com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence;
@@ -132,7 +132,7 @@ public:
virtual void EndElement();
void SetDatabaseName(const rtl::OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; }
- void SetConnectionRessource(const rtl::OUString sTempConRes) { sConnectionRessource = sTempConRes; }
+ void SetConnectionResource(const rtl::OUString sTempConRes) { sConnectionResource = sTempConRes; }
void SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; }
void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; }
void SetNative(const bool bTempNative) { bNative = bTempNative; }
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index c3e3cd7..55693ef 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1214,7 +1214,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESSOURCE},
+ { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESOURCE},
{ XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT },
{ XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT },
XML_TOKEN_MAP_END
@@ -1234,7 +1234,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap()
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESSOURCE },
+ { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE },
{ XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
XML_TOKEN_MAP_END
};
@@ -1253,7 +1253,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap()
{
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF },
- { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESSOURCE },
+ { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESOURCE },
{ XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME },
XML_TOKEN_MAP_END
};
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 624d781..65f7a5e 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -433,7 +433,7 @@ enum ScXMLDatabaseRangeSourceSQLAttrTokens
{
XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME,
XML_TOK_SOURCE_SQL_ATTR_HREF,
- XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESSOURCE,
+ XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESOURCE,
XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT,
XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT
};
@@ -442,7 +442,7 @@ enum ScXMLDatabaseRangeSourceTableAttrTokens
{
XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_HREF,
- XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESSOURCE,
+ XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESOURCE,
XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME
};
@@ -450,7 +450,7 @@ enum ScXMLDatabaseRangeSourceQueryAttrTokens
{
XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME,
XML_TOK_SOURCE_QUERY_ATTR_HREF,
- XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESSOURCE,
+ XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESOURCE,
XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME
};
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 3dccaa0..41c6e9f 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -548,8 +548,8 @@ ScTabPageSortOptions::~ScTabPageSortOptions()
void ScTabPageSortOptions::Init()
{
- // CollatorRessource has user-visible names for sort algorithms
- pColRes = new CollatorRessource();
+ // CollatorResource has user-visible names for sort algorithms
+ pColRes = new CollatorResource();
//! use CollatorWrapper from document?
pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() );
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index a89084b..75315e7 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -113,7 +113,7 @@ private:
// Sort Options
class ScDocument;
-class CollatorRessource;
+class CollatorResource;
class CollatorWrapper;
class ScTabPageSortOptions : public SfxTabPage
@@ -173,7 +173,7 @@ private:
ScSortDlg* pDlg;
ScAddress theOutPos;
- CollatorRessource* pColRes;
+ CollatorResource* pColRes;
CollatorWrapper* pColWrap;
#ifdef _TPSORT_CXX
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index 3c3236d..fb0ed98 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include "hfedtdlg.hrc"
#define HFEDIT_DLGTITLE \
Text [ en-US ] = "Headers/Footers" ; \
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index a3c5436..617e575 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#define __RSC
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 85659b5..cf7b5cf 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -487,7 +487,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()
{
@@ -777,7 +777,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// b)
else
{
- // Note: we create(d) some ressource on the heap. (thread and tep file)
+ // Note: we create(d) some resource on the heap. (thread and tep file)
// They will be delected by the thread automaticly if he finish his run() method.
ImplUCBPrintWatcher* pWatcher = new ImplUCBPrintWatcher( pPrinter, pUCBPrintTempFile, sUcbUrl );
pWatcher->create();
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 4502615..2d9f565 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -522,7 +522,7 @@ sub parse_dlst
next;
}
push(@action_data, ['copy', $_]);
- # for each ressource file (.res) copy its image list (.ilst)
+ # for each resource file (.res) copy its image list (.ilst)
if ( /\.res\s/ ) {
my $imagelist = $_;
$imagelist =~ s/\.res/\.$ilst_ext/g;
diff --git a/svtools/inc/svtools/collatorres.hxx b/svtools/inc/svtools/collatorres.hxx
index c91197e..7b4eb52 100644
--- a/svtools/inc/svtools/collatorres.hxx
+++ b/svtools/inc/svtools/collatorres.hxx
@@ -1,25 +1,25 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef SVTOOLS_COLLATORRESSOURCE_HXX
-#define SVTOOLS_COLLATORRESSOURCE_HXX
+#ifndef SVTOOLS_COLLATORRESOURCE_HXX
+#define SVTOOLS_COLLATORRESOURCE_HXX
#include "svtools/svtdllapi.h"
#include <rtl/ustring.hxx>
-class CollatorRessourceData;
+class CollatorResourceData;
-class SVT_DLLPUBLIC CollatorRessource
+class SVT_DLLPUBLIC CollatorResource
{
private:
- CollatorRessourceData *mp_Data;
+ CollatorResourceData *mp_Data;
public:
- CollatorRessource();
- ~CollatorRessource();
+ CollatorResource();
+ ~CollatorResource();
const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
};
-#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */
+#endif /* SVTOOLS_COLLATORRESOURCE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/indexentryres.hxx b/svtools/inc/svtools/indexentryres.hxx
index 1277107..c1692c6 100644
--- a/svtools/inc/svtools/indexentryres.hxx
+++ b/svtools/inc/svtools/indexentryres.hxx
@@ -1,25 +1,25 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX
-#define SVTOOLS_INDEXENTRYRESSOURCE_HXX
+#ifndef SVTOOLS_INDEXENTRYRESOURCE_HXX
+#define SVTOOLS_INDEXENTRYRESOURCE_HXX
#include "svtools/svtdllapi.h"
#include <rtl/ustring.hxx>
-class IndexEntryRessourceData;
+class IndexEntryResourceData;
-class SVT_DLLPUBLIC IndexEntryRessource
+class SVT_DLLPUBLIC IndexEntryResource
{
private:
- IndexEntryRessourceData *mp_Data;
+ IndexEntryResourceData *mp_Data;
public:
- IndexEntryRessource ();
- ~IndexEntryRessource ();
+ IndexEntryResource ();
+ ~IndexEntryResource ();
const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
};
-#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */
+#endif /* SVTOOLS_INDEXENTRYRESOURCE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 7c669c6..315f1b1 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -37,25 +37,25 @@
//
// -------------------------------------------------------------------------
-class CollatorRessourceData
+class CollatorResourceData
{
- friend class CollatorRessource;
+ friend class CollatorResource;
private: /* data */
rtl::OUString ma_Name;
rtl::OUString ma_Translation;
private: /* member functions */
- CollatorRessourceData () {}
+ CollatorResourceData () {}
public:
- CollatorRessourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
+ CollatorResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
: ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
const rtl::OUString& GetAlgorithm () const { return ma_Name; }
const rtl::OUString& GetTranslation () const { return ma_Translation; }
- ~CollatorRessourceData () {}
+ ~CollatorResourceData () {}
- CollatorRessourceData& operator= (const CollatorRessourceData& r_From)
+ CollatorResourceData& operator= (const CollatorResourceData& r_From)
{
ma_Name = r_From.GetAlgorithm();
ma_Translation = r_From.GetTranslation();
@@ -69,36 +69,36 @@ class CollatorRessourceData
//
// -------------------------------------------------------------------------
-#define COLLATOR_RESSOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1)
+#define COLLATOR_RESOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1)
-CollatorRessource::CollatorRessource()
+CollatorResource::CollatorResource()
{
- mp_Data = new CollatorRessourceData[COLLATOR_RESSOURCE_COUNT];
+ mp_Data = new CollatorResourceData[COLLATOR_RESOURCE_COUNT];
#define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
#define RESSTR(rid) SvtResId(rid).toString()
- mp_Data[0] = CollatorRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_COLLATE_ALPHANUMERIC));
- mp_Data[1] = CollatorRessourceData (ASCSTR("charset"), RESSTR(STR_SVT_COLLATE_CHARSET));
- mp_Data[2] = CollatorRessourceData (ASCSTR("dict"), RESSTR(STR_SVT_COLLATE_DICTIONARY));
- mp_Data[3] = CollatorRessourceData (ASCSTR("normal"), RESSTR(STR_SVT_COLLATE_NORMAL));
- mp_Data[4] = CollatorRessourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_COLLATE_PINYIN));
- mp_Data[5] = CollatorRessourceData (ASCSTR("radical"), RESSTR(STR_SVT_COLLATE_RADICAL));
- mp_Data[6] = CollatorRessourceData (ASCSTR("stroke"), RESSTR(STR_SVT_COLLATE_STROKE));
- mp_Data[7] = CollatorRessourceData (ASCSTR("unicode"), RESSTR(STR_SVT_COLLATE_UNICODE));
- mp_Data[8] = CollatorRessourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_COLLATE_ZHUYIN));
- mp_Data[9] = CollatorRessourceData (ASCSTR("phonebook"), RESSTR(STR_SVT_COLLATE_PHONEBOOK));
- mp_Data[10] = CollatorRessourceData (ASCSTR("phonetic (alphanumeric first)"), RESSTR(STR_SVT_COLLATE_PHONETIC_F));
- mp_Data[11] = CollatorRessourceData (ASCSTR("phonetic (alphanumeric last)"), RESSTR(STR_SVT_COLLATE_PHONETIC_L));
+ mp_Data[0] = CollatorResourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_COLLATE_ALPHANUMERIC));
+ mp_Data[1] = CollatorResourceData (ASCSTR("charset"), RESSTR(STR_SVT_COLLATE_CHARSET));
+ mp_Data[2] = CollatorResourceData (ASCSTR("dict"), RESSTR(STR_SVT_COLLATE_DICTIONARY));
+ mp_Data[3] = CollatorResourceData (ASCSTR("normal"), RESSTR(STR_SVT_COLLATE_NORMAL));
+ mp_Data[4] = CollatorResourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_COLLATE_PINYIN));
+ mp_Data[5] = CollatorResourceData (ASCSTR("radical"), RESSTR(STR_SVT_COLLATE_RADICAL));
+ mp_Data[6] = CollatorResourceData (ASCSTR("stroke"), RESSTR(STR_SVT_COLLATE_STROKE));
+ mp_Data[7] = CollatorResourceData (ASCSTR("unicode"), RESSTR(STR_SVT_COLLATE_UNICODE));
+ mp_Data[8] = CollatorResourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_COLLATE_ZHUYIN));
+ mp_Data[9] = CollatorResourceData (ASCSTR("phonebook"), RESSTR(STR_SVT_COLLATE_PHONEBOOK));
+ mp_Data[10] = CollatorResourceData (ASCSTR("phonetic (alphanumeric first)"), RESSTR(STR_SVT_COLLATE_PHONETIC_F));
+ mp_Data[11] = CollatorResourceData (ASCSTR("phonetic (alphanumeric last)"), RESSTR(STR_SVT_COLLATE_PHONETIC_L));
}
-CollatorRessource::~CollatorRessource()
+CollatorResource::~CollatorResource()
{
delete[] mp_Data;
}
const rtl::OUString&
-CollatorRessource::GetTranslation(const rtl::OUString &r_Algorithm)
+CollatorResource::GetTranslation(const rtl::OUString &r_Algorithm)
{
sal_Int32 nIndex = r_Algorithm.indexOf('.');
rtl::OUString aLocaleFreeAlgorithm;
@@ -113,7 +113,7 @@ CollatorRessource::GetTranslation(const rtl::OUString &r_Algorithm)
aLocaleFreeAlgorithm = r_Algorithm.copy(nIndex, r_Algorithm.getLength() - nIndex);
}
- for (sal_uInt32 i = 0; i < COLLATOR_RESSOURCE_COUNT; i++)
+ for (sal_uInt32 i = 0; i < COLLATOR_RESOURCE_COUNT; i++)
{
if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm())
return mp_Data[i].GetTranslation();
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 2bb6c8c..b31c875 100644
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -55,7 +55,7 @@ String STR_SVT_AUTOMATIC_COLOR
};
/*
- * resources for CollatorRessource / CollatorRessourceData resp.
+ * resources for CollatorResource / CollatorResourceData resp.
*/
String STR_SVT_COLLATE_ALPHANUMERIC
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 3b0007c..3e5c564 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -37,25 +37,25 @@
//
// -------------------------------------------------------------------------
-class IndexEntryRessourceData
+class IndexEntryResourceData
{
- friend class IndexEntryRessource;
+ friend class IndexEntryResource;
private: /* data */
rtl::OUString ma_Name;
rtl::OUString ma_Translation;
private: /* member functions */
- IndexEntryRessourceData () {}
+ IndexEntryResourceData () {}
public:
- IndexEntryRessourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
+ IndexEntryResourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
: ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
const rtl::OUString& GetAlgorithm () const { return ma_Name; }
const rtl::OUString& GetTranslation () const { return ma_Translation; }
- ~IndexEntryRessourceData () {}
+ ~IndexEntryResourceData () {}
- IndexEntryRessourceData& operator= (const IndexEntryRessourceData& r_From)
+ IndexEntryResourceData& operator= (const IndexEntryResourceData& r_From)
{
ma_Name = r_From.GetAlgorithm();
ma_Translation = r_From.GetTranslation();
@@ -69,47 +69,47 @@ class IndexEntryRessourceData
//
// -------------------------------------------------------------------------
-#define INDEXENTRY_RESSOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1)
+#define INDEXENTRY_RESOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1)
-IndexEntryRessource::IndexEntryRessource()
+IndexEntryResource::IndexEntryResource()
{
- mp_Data = new IndexEntryRessourceData[INDEXENTRY_RESSOURCE_COUNT];
+ mp_Data = new IndexEntryResourceData[INDEXENTRY_RESOURCE_COUNT];
#define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
#define RESSTR(rid) SvtResId(rid).toString()
mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC));
+ IndexEntryResourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC));
mp_Data[STR_SVT_INDEXENTRY_DICTIONARY - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("dict"), RESSTR(STR_SVT_INDEXENTRY_DICTIONARY));
+ IndexEntryResourceData (ASCSTR("dict"), RESSTR(STR_SVT_INDEXENTRY_DICTIONARY));
mp_Data[STR_SVT_INDEXENTRY_PINYIN - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_INDEXENTRY_PINYIN));
+ IndexEntryResourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_INDEXENTRY_PINYIN));
mp_Data[STR_SVT_INDEXENTRY_PINYIN - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("radical"), RESSTR(STR_SVT_INDEXENTRY_RADICAL));
+ IndexEntryResourceData (ASCSTR("radical"), RESSTR(STR_SVT_INDEXENTRY_RADICAL));
mp_Data[STR_SVT_INDEXENTRY_STROKE - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("stroke"), RESSTR(STR_SVT_INDEXENTRY_STROKE));
+ IndexEntryResourceData (ASCSTR("stroke"), RESSTR(STR_SVT_INDEXENTRY_STROKE));
mp_Data[STR_SVT_INDEXENTRY_STROKE - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_INDEXENTRY_ZHUYIN));
+ IndexEntryResourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_INDEXENTRY_ZHUYIN));
mp_Data[STR_SVT_INDEXENTRY_ZHUYIN - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("phonetic (alphanumeric first) (grouped by syllable)"),
+ IndexEntryResourceData (ASCSTR("phonetic (alphanumeric first) (grouped by syllable)"),
RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FS));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_FS - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("phonetic (alphanumeric first) (grouped by consonant)"),
+ IndexEntryResourceData (ASCSTR("phonetic (alphanumeric first) (grouped by consonant)"),
RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FC));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_FC - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("phonetic (alphanumeric last) (grouped by syllable)"),
+ IndexEntryResourceData (ASCSTR("phonetic (alphanumeric last) (grouped by syllable)"),
RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LS));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_LS - STR_SVT_INDEXENTRY_START] =
- IndexEntryRessourceData (ASCSTR("phonetic (alphanumeric last) (grouped by consonant)"),
+ IndexEntryResourceData (ASCSTR("phonetic (alphanumeric last) (grouped by consonant)"),
RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LC));
}
-IndexEntryRessource::~IndexEntryRessource()
+IndexEntryResource::~IndexEntryResource()
{
delete[] mp_Data;
}
-const rtl::OUString& IndexEntryRessource::GetTranslation(const rtl::OUString &r_Algorithm)
+const rtl::OUString& IndexEntryResource::GetTranslation(const rtl::OUString &r_Algorithm)
{
sal_Int32 nIndex = r_Algorithm.indexOf('.');
rtl::OUString aLocaleFreeAlgorithm;
@@ -121,7 +121,7 @@ const rtl::OUString& IndexEntryRessource::GetTranslation(const rtl::OUString &r_
aLocaleFreeAlgorithm = r_Algorithm.copy(nIndex, r_Algorithm.getLength() - nIndex);
}
- for (sal_uInt32 i = 0; i < INDEXENTRY_RESSOURCE_COUNT; i++)
+ for (sal_uInt32 i = 0; i < INDEXENTRY_RESOURCE_COUNT; i++)
if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm())
return mp_Data[i].GetTranslation();
return r_Algorithm;
diff --git a/svx/inc/svx/fmresids.hrc b/svx/inc/svx/fmresids.hrc
index 1ead072..e88680e 100644
--- a/svx/inc/svx/fmresids.hrc
+++ b/svx/inc/svx/fmresids.hrc
@@ -21,8 +21,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/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index 5518db7..730132d 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -63,7 +63,7 @@ namespace drawinglayer
if(GRAPHIC_NONE == aGraphic.GetType())
{
- // no source, use fallback ressource emty OLE graphic
+ // no source, use fallback resource emty OLE graphic
const Bitmap aEmptyOLEBitmap(SdrOle2Obj::GetEmtyOLEReplacementBitmap());
aGraphic = Graphic(aEmptyOLEBitmap);
bScaleContent = true;
diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc
index 6081a5e..90d7957 100644
--- a/sw/inc/rcid.hrc
+++ b/sw/inc/rcid.hrc
@@ -121,7 +121,7 @@
#define RC_RIBBAR_BEGIN RC_RIBBAR
#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79)
-// globale Ressourcen
+// globale Resourcen
#define RC_GLOBALS_BEGIN RC_GLOBALS
#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index f307102..285ff44 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
#include "globals.hrc"
diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src
index c483281..605604f 100644
--- a/sw/source/ui/config/redlopt.src
+++ b/sw/source/ui/config/redlopt.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx
index c9993a2..c84e0a1 100644
--- a/sw/source/ui/inc/srtdlg.hxx
+++ b/sw/source/ui/inc/srtdlg.hxx
@@ -36,7 +36,7 @@
#include <svx/langbox.hxx>
class SwWrtShell;
-class CollatorRessource;
+class CollatorResource;
class SwSortDlg : public SvxStandardDialog
{
@@ -89,7 +89,7 @@ class SwSortDlg : public SvxStandardDialog
String aNumericTxt;
SwWrtShell &rSh;
- CollatorRessource* pColRes;
+ CollatorResource* pColRes;
sal_uInt16 nX;
sal_uInt16 nY;
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index f2f4d22..30f1c5f 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -129,7 +129,7 @@ public:
static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName);
};
-class IndexEntryRessource;
+class IndexEntryResource;
class IndexEntrySupplierWrapper;
class SwTOXSelectTabPage : public SfxTabPage
@@ -204,7 +204,7 @@ class SwTOXSelectTabPage : public SfxTabPage
FixedText aSortAlgorithmFT;
ListBox aSortAlgorithmLB;
- IndexEntryRessource* pIndexRes;
+ IndexEntryResource* pIndexRes;
Point aCBLeftPos1;
Point aCBLeftPos2;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 4be8d2f..058a23f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1508,7 +1508,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
if( !pIndexRes )
- pIndexRes = new IndexEntryRessource();
+ pIndexRes = new IndexEntryResource();
String sOldString;
void* pUserData;
diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src
index 581bc1d..4695fee 100644
--- a/sw/source/ui/lingu/olmenu.src
+++ b/sw/source/ui/lingu/olmenu.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include "olmenu.hrc"
#include "helpid.h"
diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src
index 1404458..14bebe3 100644
--- a/sw/source/ui/misc/autocorr.src
+++ b/sw/source/ui/misc/autocorr.src
@@ -15,4 +15,4 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/* StarView ressource file */
+/* StarView resource file */
diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src
index 0afee9b..4154985 100644
--- a/sw/source/ui/misc/linenum.src
+++ b/sw/source/ui/misc/linenum.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc>
diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src
index c7817f3..d22e4e2 100644
--- a/sw/source/ui/misc/num.src
+++ b/sw/source/ui/misc/num.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include "globals.hrc"
diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/ui/misc/redlndlg.src
index 67dd1ac..fae416e 100644
--- a/sw/source/ui/misc/redlndlg.src
+++ b/sw/source/ui/misc/redlndlg.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include "redlndlg.hrc"
#include "misc.hrc"
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 7841c70..d689fa0 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -462,7 +462,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
GetAppCollator().listCollatorAlgorithms( aLcl ));
if( !pColRes )
- pColRes = new CollatorRessource();
+ pColRes = new CollatorResource();
const sal_uInt16 nLstBoxCnt = 3;
ListBox* aLstArr[ nLstBoxCnt ] = { &aTypDLB1, &aTypDLB2, &aTypDLB3 };
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src
index 0972646..e19c802 100644
--- a/sw/source/ui/ribbar/inputwin.src
+++ b/sw/source/ui/ribbar/inputwin.src
@@ -24,8 +24,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* HelpID ressource file */
-/* HelpID ressource file */
+/* HelpID resource file */
+/* HelpID resource file */
#include "cmdid.h"
#include "helpid.h"
diff --git a/sw/source/ui/smartmenu/stmenu.src b/sw/source/ui/smartmenu/stmenu.src
index 54e3cc8..e0e36a1 100644
--- a/sw/source/ui/smartmenu/stmenu.src
+++ b/sw/source/ui/smartmenu/stmenu.src
@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/* StarView ressource file */
+/* StarView resource file */
#include "stmenu.hrc"
#include "helpid.h"
diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src
index b308784..59eb934 100644
--- a/sw/source/ui/table/chartins.src
+++ b/sw/source/ui/table/chartins.src
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-/* StarView ressource file */
+/* StarView resource file */
#include "chartins.hrc"
#include "helpid.h"
ModelessDialog DLG_INSERT_CHART
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index c92fede..396363e 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.hxx
@@ -138,7 +138,7 @@ public:
~ResMgr();
- // Sprachabhaengige Ressource Library
+ // Sprachabhaengige Resource Library
static const sal_Char* GetLang( LanguageType& eLanguage, sal_uInt16 nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx"
static ResMgr* SearchCreateResMgr( const sal_Char* pPrefixName,
com::sun::star::lang::Locale& rLocale );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index a850dc9..1b11f57 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1251,7 +1251,7 @@ void ResMgr::PopContext( const Resource* pResObj )
// Resource freigeben
if( (pTop->Flags & (RC_GLOBAL | RC_NOTFOUND)) == RC_GLOBAL )
- // kann auch Fremd-Ressource sein
+ // kann auch Fremd-Resource sein
InternalResMgr::FreeGlobalRes( pTop->aResHandle, pTop->pResource );
decStack();
}
@@ -1279,7 +1279,7 @@ RSHEADER_TYPE* ResMgr::CreateBlock( const ResId& rId )
memcpy( pHeader, GetClass(), GetRemainSize() );
Increment( pHeader->GetLocalOff() ); //ans Ende setzen
if ( pHeader->GetLocalOff() != pHeader->GetGlobOff() )
- // Hat Sub-Ressourcen, deshalb extra freigeben
+ // Hat Sub-Resourcen, deshalb extra freigeben
PopContext();
}
diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx
index 70cedde..9437c15 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/unotools/inc/unotools/componentresmodule.hxx
@@ -65,7 +65,7 @@ namespace utl
//=========================================================================
//= ModuleRes
//=========================================================================
- /** specialized ResId, using the ressource manager provided by a given <type>OModule</type>
+ /** specialized ResId, using the resource manager provided by a given <type>OModule</type>
*/
class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId
{
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 0d19d10..933567b 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -38,13 +38,13 @@ namespace utl
class OComponentResModuleImpl
{
private:
- ResMgr* m_pRessources;
+ ResMgr* m_pResources;
bool m_bInitialized;
::rtl::OString m_sResFilePrefix;
public:
OComponentResModuleImpl( const ::rtl::OString& _rResFilePrefix )
- :m_pRessources( NULL )
+ :m_pResources( NULL )
,m_bInitialized( false )
,m_sResFilePrefix( _rResFilePrefix )
{
@@ -72,27 +72,27 @@ namespace utl
//--------------------------------------------------------------------
void OComponentResModuleImpl::freeResManager()
{
- delete m_pRessources, m_pRessources = NULL;
+ delete m_pResources, m_pResources = NULL;
m_bInitialized = false;
}
//--------------------------------------------------------------------
ResMgr* OComponentResModuleImpl::getResManager()
{
- if ( !m_pRessources && !m_bInitialized )
+ if ( !m_pResources && !m_bInitialized )
{
// create a manager with a fixed prefix
rtl::OString aMgrName = m_sResFilePrefix;
- m_pRessources = ResMgr::CreateResMgr( aMgrName.getStr() );
- OSL_ENSURE( m_pRessources,
+ m_pResources = ResMgr::CreateResMgr( aMgrName.getStr() );
+ OSL_ENSURE( m_pResources,
rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " )
.append(aMgrName)
.append(")!").getStr() );
m_bInitialized = sal_True;
}
- return m_pRessources;
+ return m_pResources;
}
//====================================================================
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index c26c1e4..6e549f0 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -52,7 +52,7 @@ namespace uui
@seealso method SetURL()
@param "pParentWindow" , parent window for dialog
- @param "pResMgr" , ressource manager
+ @param "pResMgr" , resource manager
@return -
@onerror -
More information about the Libreoffice-commits
mailing list