summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-30 08:41:34 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-30 09:26:00 +0200
commit889de665ec9d2ac25a9dccd4830cb97ed0c7c56e (patch)
treef98ed6e8215a39287248189841411e0edb0439c3 /sc
parent291dcae246de9e32d9ca5926be463ad910c5bd1e (diff)
Typo ressource -> resource
Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/sc.hrc2
-rw-r--r--sc/source/filter/xml/xmldrani.cxx4
-rw-r--r--sc/source/filter/xml/xmldrani.hxx4
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx6
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx6
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx4
-rw-r--r--sc/source/ui/inc/tpsort.hxx4
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.src2
8 files changed, 16 insertions, 16 deletions
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e92ec8cd162f..b5e6b8a15fd8 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 479e61c8b38c..e8fc14ef1b40 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 ff659f8b0c2f..b035bc50e089 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 c3e3cd7c7b15..55693ef799a6 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 624d7816ae32..65f7a5e59540 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 3dccaa086423..41c6e9fa2ef1 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 a89084b665e3..75315e7163e2 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 3c3236ddf483..fb0ed988a4d2 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" ; \