mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo ressource -> resource

Browse Source 
Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831
This commit is contained in:
Stephan Bergmann 2012-07-30 08:41:34 +02:00
parent 291dcae246
commit 889de665ec
87 changed files with 247 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bean/com/sun/star/comp/beans/OOoBean.java
View File

@ -522,7 +522,7 @@ public class OOoBean
if either of the arguments is out of the specified range. if either of the arguments is out of the specified range.
@throws java.io.IOException @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 @throws com.sun.star.lang.NoConnectionException
if no connection can be established. if no connection can be established.
@ -806,7 +806,7 @@ public class OOoBean
if either of the arguments is out of the specified range. if either of the arguments is out of the specified range.
@throws java.io.IOException @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 @throws com.sun.star.lang.NoConnectionException
if no connection is established. if no connection is established.

2
chart2/Library_charttools.mk
View File

@ -105,7 +105,7 @@ $(eval $(call gb_Library_add_exception_objects,charttools,\
chart2/source/tools/RelativePositionHelper \ chart2/source/tools/RelativePositionHelper \
chart2/source/tools/RelativeSizeHelper \ chart2/source/tools/RelativeSizeHelper \
chart2/source/tools/ResId \ chart2/source/tools/ResId \
chart2/source/tools/RessourceManager \ chart2/source/tools/ResourceManager \
chart2/source/tools/Scaling \ chart2/source/tools/Scaling \
chart2/source/tools/SceneProperties \ chart2/source/tools/SceneProperties \
chart2/source/tools/_serviceregistration_tools \ chart2/source/tools/_serviceregistration_tools \

2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
View File

@ -1490,7 +1490,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
} }
else 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 try
{ {
this->dispose(); this->dispose();

2
chart2/source/controller/main/UndoCommandDispatch.cxx
View File

@ -29,7 +29,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <tools/diagnose_ex.h> #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/svtools.hrc>
#include <svtools/svtresid.hxx> #include <svtools/svtresid.hxx>

14
chart2/source/inc/RessourceManager.hxx → chart2/source/inc/ResourceManager.hxx
View File

@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifndef CHART2_RESSOURCEMANAGER_HXX #ifndef CHART2_RESOURCEMANAGER_HXX
#define CHART2_RESSOURCEMANAGER_HXX #define CHART2_RESOURCEMANAGER_HXX
#include "charttoolsdllapi.hxx" #include "charttoolsdllapi.hxx"
@ -27,21 +27,21 @@ class ResMgr;
namespace chart namespace chart
{ {
class RessourceManager class ResourceManager
{ {
public: public:
static ::ResMgr & getRessourceManager(); static ::ResMgr & getResourceManager();
private: private:
// not implemented -- avoid instantiation // not implemented -- avoid instantiation
RessourceManager(); ResourceManager();
static ::ResMgr * m_pRessourceManager; static ::ResMgr * m_pResourceManager;
}; };
} // namespace chart } // namespace chart
// CHART2_RESSOURCEMANAGER_HXX // CHART2_RESOURCEMANAGER_HXX
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
chart2/source/tools/ResId.cxx
View File

@ -19,14 +19,14 @@
#include "ResId.hxx" #include "ResId.hxx"
#include "RessourceManager.hxx" #include "ResourceManager.hxx"
#include <tools/string.hxx> #include <tools/string.hxx>
namespace chart namespace chart
{ {
SchResId::SchResId( sal_Int16 nId ) SchResId::SchResId( sal_Int16 nId )
: ResId( nId, RessourceManager::getRessourceManager() ) : ResId( nId, ResourceManager::getResourceManager() )
{ {
} }

14
chart2/source/tools/RessourceManager.cxx → chart2/source/tools/ResourceManager.cxx
View File

@ -18,22 +18,22 @@
*/ */
#include "RessourceManager.hxx" #include "ResourceManager.hxx"
#include <tools/resmgr.hxx> #include <tools/resmgr.hxx>
namespace chart namespace chart
{ {
ResMgr * RessourceManager::m_pRessourceManager = 0; ResMgr * ResourceManager::m_pResourceManager = 0;
ResMgr & RessourceManager::getRessourceManager() ResMgr & ResourceManager::getResourceManager()
{ {
// not threadsafe // not threadsafe
if( ! m_pRessourceManager ) if( ! m_pResourceManager )
m_pRessourceManager = ResMgr::CreateResMgr("chartcontroller"); m_pResourceManager = ResMgr::CreateResMgr("chartcontroller");
OSL_ASSERT( m_pRessourceManager ); OSL_ASSERT( m_pResourceManager );
return *m_pRessourceManager; return *m_pResourceManager;
} }
} // namespace chart } // namespace chart

2
comphelper/inc/comphelper/componentmodule.hxx
View File

@ -169,7 +169,7 @@ namespace comphelper
//========================================================================= //=========================================================================
//= OModuleClient //= 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 class COMPHELPER_DLLPUBLIC OModuleClient
{ {

2
cui/source/customize/eventdlg.hrc
View File

@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * 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 temp to figure out what's needed from these
//DF #include "sfx.hrc" //DF #include "sfx.hrc"

4
dbaccess/source/core/inc/core_resource.hxx
View File

@ -36,7 +36,7 @@ namespace dbaccess
//================================================================== //==================================================================
//= ResourceManager //= ResourceManager
//= handling ressources within the DBA-Core library //= handling resources within the DBA-Core library
//================================================================== //==================================================================
class ResourceManager class ResourceManager
{ {
@ -101,7 +101,7 @@ namespace dbaccess
//========================================================================= //=========================================================================
//= OModuleClient //= 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 class OModuleClient
{ {

2
dbaccess/source/ui/inc/GeneralUndo.hxx
View File

@ -25,7 +25,7 @@
namespace dbaui 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 // geladenen String liefert
class OCommentUndoAction : public SfxUndoAction class OCommentUndoAction : public SfxUndoAction

4
dbaccess/source/ui/inc/moduledbu.hxx
View File

@ -67,7 +67,7 @@ private:
//========================================================================= //=========================================================================
//= OModuleClient //= 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 class OModuleClient
{ {
@ -79,7 +79,7 @@ public:
//========================================================================= //=========================================================================
//= ModuleRes //= 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 class ModuleRes : public ::ResId
{ {

16
dbaccess/source/ui/misc/moduledbu.cxx
View File

@ -40,21 +40,21 @@ namespace dbaui
*/ */
class OModuleImpl class OModuleImpl
{ {
ResMgr* m_pRessources; ResMgr* m_pResources;
public: public:
/// ctor /// ctor
OModuleImpl(); OModuleImpl();
~OModuleImpl(); ~OModuleImpl();
/// get the manager for the ressources of the module /// get the manager for the resources of the module
ResMgr* getResManager(); ResMgr* getResManager();
}; };
DBG_NAME(OModuleImpl) DBG_NAME(OModuleImpl)
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::OModuleImpl() OModuleImpl::OModuleImpl()
:m_pRessources(NULL) :m_pResources(NULL)
{ {
DBG_CTOR(OModuleImpl,NULL); DBG_CTOR(OModuleImpl,NULL);
@ -63,8 +63,8 @@ OModuleImpl::OModuleImpl()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl() OModuleImpl::~OModuleImpl()
{ {
if (m_pRessources) if (m_pResources)
delete m_pRessources; delete m_pResources;
DBG_DTOR(OModuleImpl,NULL); DBG_DTOR(OModuleImpl,NULL);
} }
@ -74,12 +74,12 @@ ResMgr* OModuleImpl::getResManager()
{ {
// note that this method is not threadsafe, which counts for the whole class ! // 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 // 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;
} }
//========================================================================= //=========================================================================

18
extensions/source/inc/componentmodule.cxx
View File

@ -55,7 +55,7 @@ namespace COMPMOD_NAMESPACE
*/ */
class OModuleImpl class OModuleImpl
{ {
ResMgr* m_pRessources; ResMgr* m_pResources;
sal_Bool m_bInitialized; sal_Bool m_bInitialized;
rtl::OString m_sFilePrefix; rtl::OString m_sFilePrefix;
@ -64,14 +64,14 @@ namespace COMPMOD_NAMESPACE
OModuleImpl(); OModuleImpl();
~OModuleImpl(); ~OModuleImpl();
/// get the manager for the ressources of the module /// get the manager for the resources of the module
ResMgr* getResManager(); ResMgr* getResManager();
void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
}; };
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::OModuleImpl() OModuleImpl::OModuleImpl()
:m_pRessources(NULL) :m_pResources(NULL)
,m_bInitialized(sal_False) ,m_bInitialized(sal_False)
{ {
} }
@ -79,27 +79,27 @@ namespace COMPMOD_NAMESPACE
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl() OModuleImpl::~OModuleImpl()
{ {
if (m_pRessources) if (m_pResources)
delete m_pRessources; delete m_pResources;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
ResMgr* OModuleImpl::getResManager() ResMgr* OModuleImpl::getResManager()
{ {
// note that this method is not threadsafe, which counts for the whole class ! // 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!"); DBG_ASSERT(!m_sFilePrefix.isEmpty(), "OModuleImpl::getResManager: no resource file prefix!");
// create a manager with a fixed prefix // create a manager with a fixed prefix
m_pRessources = ResMgr::CreateResMgr(m_sFilePrefix.getStr()); m_pResources = ResMgr::CreateResMgr(m_sFilePrefix.getStr());
DBG_ASSERT(m_pRessources, DBG_ASSERT(m_pResources,
rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") rtl::OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ")
.append(m_sFilePrefix) .append(m_sFilePrefix)
.append(")!").getStr()); .append(")!").getStr());
m_bInitialized = sal_True; m_bInitialized = sal_True;
} }
return m_pRessources; return m_pResources;
} }
//========================================================================= //=========================================================================

4
extensions/source/inc/componentmodule.hxx
View File

@ -143,7 +143,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//========================================================================= //=========================================================================
//= OModuleResourceClient //= 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 class OModuleResourceClient
{ {
@ -155,7 +155,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//========================================================================= //=========================================================================
//= ModuleRes //= 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 class ModuleRes : public ::ResId
{ {

2
forms/source/inc/frm_resource.hxx
View File

@ -31,7 +31,7 @@ namespace frm
//================================================================== //==================================================================
//= ResourceManager //= ResourceManager
//= handling ressources within the FormLayer library //= handling resources within the FormLayer library
//================================================================== //==================================================================
class ResourceManager class ResourceManager
{ {

2
formula/inc/formula/omoduleclient.hxx
View File

@ -27,7 +27,7 @@
namespace formula { 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 class FORMULA_DLLPUBLIC OModuleClient: private boost::noncopyable
{ {

4
formula/source/core/inc/core_resource.hxx
View File

@ -29,7 +29,7 @@ namespace formula
{ {
//================================================================== //==================================================================
//= ResourceManager //= ResourceManager
//= handling ressources within the FORMULA-Core library //= handling resources within the FORMULA-Core library
//================================================================== //==================================================================
class ResourceManager class ResourceManager
{ {
@ -57,7 +57,7 @@ namespace formula
//========================================================================= //=========================================================================
//= OModuleClient //= 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 class OModuleClient
{ {

2
formula/source/ui/inc/ModuleHelper.hxx
View File

@ -62,7 +62,7 @@ namespace formula
//========================================================================= //=========================================================================
//= ModuleRes //= 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 class ModuleRes : public ::ResId
{ {

16
formula/source/ui/resource/ModuleHelper.cxx
View File

@ -45,21 +45,21 @@ namespace formula
*/ */
class OModuleImpl class OModuleImpl
{ {
ResMgr* m_pRessources; ResMgr* m_pResources;
public: public:
/// ctor /// ctor
OModuleImpl(); OModuleImpl();
~OModuleImpl(); ~OModuleImpl();
/// get the manager for the ressources of the module /// get the manager for the resources of the module
ResMgr* getResManager(); ResMgr* getResManager();
}; };
DBG_NAME( rpt_OModuleImpl ) DBG_NAME( rpt_OModuleImpl )
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::OModuleImpl() OModuleImpl::OModuleImpl()
:m_pRessources(NULL) :m_pResources(NULL)
{ {
DBG_CTOR( rpt_OModuleImpl,NULL); DBG_CTOR( rpt_OModuleImpl,NULL);
@ -68,8 +68,8 @@ OModuleImpl::OModuleImpl()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl() OModuleImpl::~OModuleImpl()
{ {
if (m_pRessources) if (m_pResources)
delete m_pRessources; delete m_pResources;
DBG_DTOR( rpt_OModuleImpl,NULL); 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 ! // 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 // create a manager with a fixed prefix
m_pRessources = ResMgr::CreateResMgr("forui"); m_pResources = ResMgr::CreateResMgr("forui");
} }
return m_pRessources; return m_pResources;
} }
//========================================================================= //=========================================================================

2
framework/inc/dispatch/menudispatcher.hxx
View File

@ -215,7 +215,7 @@ class MenuDispatcher : // interfaces
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short dispose current instance @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 - @seealso -

4
framework/inc/jobs/job.hxx
View File

@ -119,7 +119,7 @@ class Job : public css::lang::XTypeProvider
/** /**
For some special cases we must know the environment, in which For some special cases we must know the environment, in which
this job runs. Means the frame inside which we may was triggered. 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. Please note: If m_xFrame is set - m_xModel should be NULL.
Only one environment can be supported realy. 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 For some special cases we must know the environment, in which
this job runs. Means the document inside which we may was triggered. 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. Please note: If m_xModel is set - m_xFrame should be NULL.
Only one environment can be supported realy. Only one environment can be supported realy.

18
framework/inc/services/logindialog.hxx
View File

@ -226,13 +226,13 @@ class cIMPL_Dialog : public ModalDialog
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short default ctor @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. 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() @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 ... @param "pParent" , parent window handle for dialog! If is it NULL -> no parent exist ...
@return - @return -
@ -243,7 +243,7 @@ class cIMPL_Dialog : public ModalDialog
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short default dtor @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. But you can't get the values of the dialog. Use getValues() to do this.
@seealso method getValues() @seealso method getValues()
@ -314,16 +314,16 @@ class cIMPL_Dialog : public ModalDialog
void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort ); void getProxyHostPort( const ::rtl::OUString& aProxyHostPort, ::rtl::OUString& aHost, ::rtl::OUString& aPort );
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short get a ressource for given id from right ressource file @short get a resource for given id from right resource file
@descr This dialog need his own ressource. We can't use the global ressource manager! @descr This dialog need his own resource. We can't use the global resource manager!
We must use our own. 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! any existing one is used automaticly!
@seealso method setValues() @seealso method setValues()
@param "nId" ; id to convert it in right ressource id @param "nId" ; id to convert it in right resource id
@param "aLanguage" ; type of ressource language @param "aLanguage" ; type of resource language
@return - @return -
@onerror - @onerror -

2
framework/inc/services/pathsettings.hxx
View File

@ -176,7 +176,7 @@ class PathSettings : public css::lang::XTypeProvider ,
during this ctor runs! */ during this ctor runs! */
PathSettings(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); 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(); virtual ~PathSettings();
/** declaration of XInterface, XTypeProvider, XServiceInfo */ /** declaration of XInterface, XTypeProvider, XServiceInfo */

2
framework/source/classes/framecontainer.cxx
View File

@ -84,7 +84,7 @@ FrameContainer::FrameContainer()
/**-*************************************************************************************************************** /**-***************************************************************************************************************
@short deinitialize may a filled container @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 @threadsafe not neccessary - its not a singleton
@modified 01.07.2002 14:43,as96863 @modified 01.07.2002 14:43,as96863

2
framework/source/classes/taskcreator.cxx
View File

@ -88,7 +88,7 @@ TaskCreator::TaskCreator( const css::uno::Reference< css::lang::XMultiServiceFac
/*-****************************************************************************************************//** /*-****************************************************************************************************//**
@short deinitialize instance @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 @modified 16.05.2002 09:33, as96863
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/

2
framework/source/dispatch/mailtodispatcher.cxx
View File

@ -260,7 +260,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
@return <TRUE/> if dispatch could be started successfully @return <TRUE/> if dispatch could be started successfully
Note: Our internal used shell executor doesn't return any state value - so we must Note: Our internal used shell executor doesn't return any state value - so we must
belive that call was successfully. 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 @modified 30.04.2002 14:49, as96863
*/ */

8
framework/source/jobs/job.cxx
View File

@ -555,7 +555,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
connection. connection.
Further we are listener for closing of the (possible valid) 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. if our internal job is still running.
*/ */
void Job::impl_startListening() 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) void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) throw(css::uno::RuntimeException)
{ {
die(); 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) void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno::RuntimeException)
{ {
die(); 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 */ /* } SAFE */
die(); die();
// Do nothing else here. Our internal ressources was released ... // Do nothing else here. Our internal resources was released ...
} }
} // namespace framework } // namespace framework

2
framework/source/jobs/jobdata.cxx
View File

@ -152,7 +152,7 @@ void JobData::operator=( const JobData& rCopy )
/** /**
@short let this instance die @short let this instance die
@descr There is no chance any longer to work. We have to @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() JobData::~JobData()
{ {

4
framework/source/jobs/jobdispatch.cxx
View File

@ -117,11 +117,11 @@ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::lang::XMultiSer
//________________________________ //________________________________
/** /**
@short let this instance die @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() JobDispatch::~JobDispatch()
{ {
// release all used ressources // release all used resources
m_xSMGR = css::uno::Reference< css::lang::XMultiServiceFactory >(); m_xSMGR = css::uno::Reference< css::lang::XMultiServiceFactory >();
m_xFrame = css::uno::Reference< css::frame::XFrame >(); m_xFrame = css::uno::Reference< css::frame::XFrame >();
} }

2
framework/source/jobs/jobresult.cxx
View File

@ -172,7 +172,7 @@ JobResult::JobResult( const JobResult& rCopy )
//________________________________ //________________________________
/** /**
@short standard dtor @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() JobResult::~JobResult()
{ {

4
framework/source/services/backingcomp.cxx
View File

@ -667,7 +667,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
/** kill this instance. /** kill this instance.
It can be called from our owner frame only. But there is no possibility to check the calli. 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 ... 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 currently not used
@throw com::sun::star::uno::RuntimeException @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. Means if may be attachedFrame() wasn't called before.
*/ */

2
framework/source/unotypes/fwl.xml
View File

@ -9,7 +9,7 @@
<author> Andreas Schluens </author> <author> Andreas Schluens </author>
<name> com.sun.star.comp.framework.TypeDetection </name> <name> com.sun.star.comp.framework.TypeDetection </name>
<description> <description>
Supports a type detection of a specified ressource (document). Supports a type detection of a specified resource (document).
</description> </description>
<loader-name> com.sun.star.loader.SharedLibrary </loader-name> <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
<language> c++ </language> <language> c++ </language>

2
idl/source/prj/command.cxx
View File

@ -110,7 +110,7 @@ char CommandLineSyntax[] =
"-fs<slotmap file> -fl<listing file>\n" "-fs<slotmap file> -fl<listing file>\n"
"-fo<odl file> -fd<data base file>\n" "-fo<odl file> -fd<data base file>\n"
"-fi<item implementation> -ft<type library file> (not OLE)\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"
"-fc<c source file> -fh<c header file>\n" "-fc<c source file> -fh<c header file>\n"
"-rsc <*.srs header line>\n" "-rsc <*.srs header line>\n"

6
l10ntools/inc/cfgmerge.hxx
View File

@ -122,7 +122,7 @@ protected:
rtl::OString &rText, rtl::OString &rText,
const rtl::OString &rLangIndex )=0; const rtl::OString &rLangIndex )=0;
virtual void WorkOnRessourceEnd()=0; virtual void WorkOnResourceEnd()=0;
virtual void Output(const rtl::OString & rOutput)=0; virtual void Output(const rtl::OString & rOutput)=0;
@ -174,7 +174,7 @@ protected:
const rtl::OString &rIsoLang const rtl::OString &rIsoLang
); );
void WorkOnRessourceEnd(); void WorkOnResourceEnd();
void Output(const rtl::OString& rOutput); void Output(const rtl::OString& rOutput);
public: public:
CfgExport( CfgExport(
@ -202,7 +202,7 @@ private:
protected: protected:
virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex); virtual void WorkOnText(rtl::OString &rText, const rtl::OString &rLangIndex);
void WorkOnRessourceEnd(); void WorkOnResourceEnd();
void Output(const rtl::OString& rOutput); void Output(const rtl::OString& rOutput);
public: public:

2
l10ntools/inc/export.hxx
View File

@ -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; class MergeDataFile;

6
l10ntools/inc/tokens.h
View File

@ -39,9 +39,9 @@
/*------------------------------------------------------ */ /*------------------------------------------------------ */
#define CONDITION 501 /* #if... | #endif ... | ... */ #define CONDITION 501 /* #if... | #endif ... | ... */
#define EMPTYLINE 502 /* */ #define EMPTYLINE 502 /* */
#define RESSOURCE 503 /* Menu MID_TEST */ #define RESOURCE 503 /* Menu MID_TEST */
#define RESSOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */ #define RESOURCEEXPR 504 /* Menu ( MID_TEST + .. ) */
#define SMALRESSOURCE 505 /* PageItem { */ #define SMALRESOURCE 505 /* PageItem { */
#define TEXTLINE 506 /* TEXT = "hhh" */ #define TEXTLINE 506 /* TEXT = "hhh" */
#define LONGTEXTLINE 507 /* TEXT = "hhh" TEST "HHH" ... */ #define LONGTEXTLINE 507 /* TEXT = "hhh" TEST "HHH" ... */
#define TEXT 508 /* "Something like this" */ #define TEXT 508 /* "Something like this" */

10
l10ntools/source/cfgmerge.cxx
View File

@ -294,7 +294,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
break; break;
case CFG_TEXT_START: { case CFG_TEXT_START: {
if ( sCurrentResTyp != sTokenName ) { if ( sCurrentResTyp != sTokenName ) {
WorkOnRessourceEnd(); WorkOnResourceEnd();
rtl::OString sCur; rtl::OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){ for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ]; sCur = aLanguages[ i ];
@ -330,7 +330,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
} }
else if ( sTokenName == "label" ) { else if ( sTokenName == "label" ) {
if ( sCurrentResTyp != sTokenName ) { if ( sCurrentResTyp != sTokenName ) {
WorkOnRessourceEnd(); WorkOnResourceEnd();
rtl::OString sCur; rtl::OString sCur;
for( unsigned int i = 0; i < aLanguages.size(); ++i ){ for( unsigned int i = 0; i < aLanguages.size(); ++i ){
sCur = aLanguages[ i ]; sCur = aLanguages[ i ];
@ -348,7 +348,7 @@ int CfgParser::ExecuteAnalyzedToken( int nToken, char *pToken )
if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName )) if ( aStack.GetStackData() && ( aStack.GetStackData()->GetTagType() == sTokenName ))
{ {
if (sCurrentText.isEmpty()) if (sCurrentText.isEmpty())
WorkOnRessourceEnd(); WorkOnResourceEnd();
aStack.Pop(); aStack.Pop();
pStackData = aStack.GetStackData(); pStackData = aStack.GetStackData();
} }
@ -476,7 +476,7 @@ CfgExport::~CfgExport()
} }
/*****************************************************************************/ /*****************************************************************************/
void CfgExport::WorkOnRessourceEnd() void CfgExport::WorkOnResourceEnd()
/*****************************************************************************/ /*****************************************************************************/
{ {
if ( bLocalize ) { if ( bLocalize ) {
@ -612,7 +612,7 @@ void CfgMerge::Output(const rtl::OString& rOutput)
} }
/*****************************************************************************/ /*****************************************************************************/
void CfgMerge::WorkOnRessourceEnd() void CfgMerge::WorkOnResourceEnd()
/*****************************************************************************/ /*****************************************************************************/
{ {

12
l10ntools/source/export.cxx
View File

@ -359,9 +359,9 @@ int Export::Execute( int nToken, const char * pToken )
// res. exists at cur. level // res. exists at cur. level
pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL; pResData = ( (nLevel-1) < aResStack.size() ) ? aResStack[ nLevel-1 ] : NULL;
} }
else if (( nToken != RESSOURCE ) && else if (( nToken != RESOURCE ) &&
( nToken != RESSOURCEEXPR ) && ( nToken != RESOURCEEXPR ) &&
( nToken != SMALRESSOURCE ) && ( nToken != SMALRESOURCE ) &&
( nToken != LEVELUP ) && ( nToken != LEVELUP ) &&
( nToken != NORMDEFINE ) && ( nToken != NORMDEFINE ) &&
( nToken != RSCDEFINE ) && ( nToken != RSCDEFINE ) &&
@ -454,8 +454,8 @@ int Export::Execute( int nToken, const char * pToken )
case RSCDEFINE: case RSCDEFINE:
bDefine = sal_True; // res. defined in macro bDefine = sal_True; // res. defined in macro
case RESSOURCE: case RESOURCE:
case RESSOURCEEXPR: { case RESOURCEEXPR: {
bDontWriteOutput = sal_False; bDontWriteOutput = sal_False;
if ( nToken != RSCDEFINE ) if ( nToken != RSCDEFINE )
bNextMustBeDefineEOL = sal_False; bNextMustBeDefineEOL = sal_False;
@ -495,7 +495,7 @@ int Export::Execute( int nToken, const char * pToken )
} }
} }
break; break;
case SMALRESSOURCE: { case SMALRESOURCE: {
bDontWriteOutput = sal_False; bDontWriteOutput = sal_False;
// this is the beginning of a new res. // this is the beginning of a new res.
bNextMustBeDefineEOL = sal_False; bNextMustBeDefineEOL = sal_False;

10
l10ntools/source/srclex.l
View File

@ -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]*"{" |
[a-zA-Z]+[ \t]+[^={;\n]+\n?([ \t]*"//".*\n)*[ \t]*"{" { [a-zA-Z]+[ \t]+[^={;\n]+\n?([ \t]*"//".*\n)*[ \t]*"{" {
/* RESSOURCE // String TTT_XX ... */ /* RESOURCE // String TTT_XX ... */
WorkOnTokenSet( RESSOURCE, yytext ); WorkOnTokenSet( RESOURCE, yytext );
} }
^[\t ]*[a-zA-Z_]+[\t ]*"\\"?[\t ]*\n?[ \t]*"{"[\t ]*"\\"? { ^[\t ]*[a-zA-Z_]+[\t ]*"\\"?[\t ]*\n?[ \t]*"{"[\t ]*"\\"? {
/* SMALRESSOURCE // String ... */ /* SMALRESOURCE // String ... */
WorkOnTokenSet( SMALRESSOURCE, yytext ); WorkOnTokenSet( SMALRESOURCE, yytext );
} }
[\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[ \t]*L?\".*\".*\n? { [\t ]*[a-zA-Z0-9_]+[ \t]*("["[ \t]*[a-zA-Z0-9_\-]+[ \t]*"]"[ \t]*)?=[ \t]*L?\".*\".*\n? {

2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
View File

@ -224,7 +224,7 @@ public class CustomizeView extends JPanel
* @param aEvent * @param aEvent
* describes the check box and his state * describes the check box and his state
* we can use to toogle the requested office * we can use to toogle the requested office
* ressource. * resource.
*/ */
public void actionPerformed(ActionEvent aEvent) public void actionPerformed(ActionEvent aEvent)
{ {

4
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
View File

@ -310,7 +310,7 @@ public class FunctionHelper
// This exception is thrown by the native JNI code if it try to get // 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 // the systemw window handle. A possible reason can be an invisible
// java window. In this case it should be enough to set return // 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. // 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()?"); System.out.println("May be the NativeView object wasn't realy visible at calling time of getNativeWindow()?");
xPeer = null; xPeer = null;
@ -393,7 +393,7 @@ public class FunctionHelper
if(xFrame!=null) if(xFrame!=null)
{ {
// Try to dispose the frame. He should deregister himself at the desktop object // 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. // It's possible to do that here - because frame has no component inside yet.
// So nobody can disagree with that. // So nobody can disagree with that.
// After the dispose() call forget all references to this frame and let him die. // After the dispose() call forget all references to this frame and let him die.

2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
View File

@ -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 * We forget the reference to the frame only here. Deregistration
* isn't neccessary here - because this frame dies and wish to forgoten. * isn't neccessary here - because this frame dies and wish to forgoten.
* *

4
reportdesign/inc/ModuleHelper.hxx
View File

@ -72,7 +72,7 @@ namespace rptui
//========================================================================= //=========================================================================
//= OModuleClient //= 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 class REPORTDESIGN_DLLPUBLIC OModuleClient
{ {
@ -84,7 +84,7 @@ namespace rptui
//========================================================================= //=========================================================================
//= ModuleRes //= 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 class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
{ {

2
reportdesign/source/core/inc/core_resource.hxx
View File

@ -32,7 +32,7 @@ namespace reportdesign
//================================================================== //==================================================================
//= ResourceManager //= ResourceManager
//= handling ressources within the DBA-Core library //= handling resources within the DBA-Core library
//================================================================== //==================================================================
class ResourceManager class ResourceManager
{ {

16
reportdesign/source/core/sdr/ModuleHelper.cxx
View File

@ -54,21 +54,21 @@ namespace rptui
*/ */
class OModuleImpl class OModuleImpl
{ {
ResMgr* m_pRessources; ResMgr* m_pResources;
public: public:
/// ctor /// ctor
OModuleImpl(); OModuleImpl();
~OModuleImpl(); ~OModuleImpl();
/// get the manager for the ressources of the module /// get the manager for the resources of the module
ResMgr* getResManager(); ResMgr* getResManager();
}; };
DBG_NAME( rpt_OModuleImpl ) DBG_NAME( rpt_OModuleImpl )
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::OModuleImpl() OModuleImpl::OModuleImpl()
:m_pRessources(NULL) :m_pResources(NULL)
{ {
DBG_CTOR( rpt_OModuleImpl,NULL); DBG_CTOR( rpt_OModuleImpl,NULL);
@ -77,8 +77,8 @@ OModuleImpl::OModuleImpl()
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
OModuleImpl::~OModuleImpl() OModuleImpl::~OModuleImpl()
{ {
if (m_pRessources) if (m_pResources)
delete m_pRessources; delete m_pResources;
DBG_DTOR( rpt_OModuleImpl,NULL); 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 ! // 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 // create a manager with a fixed prefix
m_pRessources = ResMgr::CreateResMgr("rptui"); m_pResources = ResMgr::CreateResMgr("rptui");
} }
return m_pRessources; return m_pResources;
} }
//========================================================================= //=========================================================================

2
rsc/inc/rscall.h
View File

@ -64,7 +64,7 @@ extern AtomContainer* pHS;
#define INCLUDE_FLAG 0x0040 // der Include-Pfad wurde erweitert #define INCLUDE_FLAG 0x0040 // der Include-Pfad wurde erweitert
#define MSCPREPRO_FLAG 0x0080 // spezial Preprozessor #define MSCPREPRO_FLAG 0x0080 // spezial Preprozessor
#define PRINTSYNTAX_FLAG 0x0100 // Syntax ausgeben #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 SMART_FLAG 0x0400 // abgekuertze Name
#define SRSDEFAULT_FLAG 0x1000 // immer der Default geschrieben #define SRSDEFAULT_FLAG 0x1000 // immer der Default geschrieben
#define NOSYSRESTEST_FLAG 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur) #define NOSYSRESTEST_FLAG 0x2000 // ueberprueft nicht die Richtigkeit von (bmp, ico, cur)

2
rsc/source/parser/erscerr.cxx
View File

@ -192,7 +192,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage )
StdLstOut( "-fh=<filename> Header file.\n" ); StdLstOut( "-fh=<filename> Header file.\n" );
StdLstOut( "-fc=<filename> Code file.\n" ); StdLstOut( "-fc=<filename> Code file.\n" );
StdLstOut( "-ft=<filename> Touch a file when done in rsc2 (for dependencies)\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( "-fx=<filename> Name of .src-file.\n" );
StdLstOut( "-oil=<dir> Output directory for image list files\n" ); StdLstOut( "-oil=<dir> Output directory for image list files\n" );
StdLstOut( "-r<ENV>=<path> replace <path> by <ENV> in image list files\n" ); StdLstOut( "-r<ENV>=<path> replace <path> by <ENV> in image list files\n" );

6
rsc/source/rsc/rsc.cxx
View File

@ -176,7 +176,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
} }
} }
else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) ) else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
{ // Alle Ressourcen mit Preload { // Alle Resourcen mit Preload
nCommands |= PRELOAD_FLAG; nCommands |= PRELOAD_FLAG;
} }
else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) ) else if( !rsc_stricmp( (*ppStr) + 1, "LITTLEENDIAN" ) )
@ -249,7 +249,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
aOutputCxx = (*ppStr) + 4; aOutputCxx = (*ppStr) + 4;
} }
else if( !rsc_strnicmp( (*ppStr) + 1, "fr=", 3 ) ) 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; aOutputRcCtor = (*ppStr) + 4;
} }
else if( !rsc_strnicmp( (*ppStr) + 1, "fx=", 3 ) ) else if( !rsc_strnicmp( (*ppStr) + 1, "fx=", 3 ) )
@ -992,7 +992,7 @@ ERRTYPE RscCompiler::Link()
if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) ) if ( NULL == (fExitFile = foutput = fopen( aTmpOutputRcCtor.getStr(), "w" )) )
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aTmpOutputRcCtor.getStr() ); 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 // Schreibe Datei
pTC->WriteRcCtor( foutput ); pTC->WriteRcCtor( foutput );

2
sc/inc/sc.hrc
View File

@ -647,7 +647,7 @@
#define SID_SORT_USERDEF (SC_PARAM_START+4) #define SID_SORT_USERDEF (SC_PARAM_START+4)
#define SID_SORT_NATURALSORT (SC_PARAM_START+5) #define SID_SORT_NATURALSORT (SC_PARAM_START+5)
// ressources // resources
#define RID_OBJECTBAR_APP (SC_RESOURCE_START) #define RID_OBJECTBAR_APP (SC_RESOURCE_START)
#define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1) #define RID_OBJECTBAR_FORMAT (SC_RESOURCE_START+1)

4
sc/source/filter/xml/xmldrani.cxx
View File

@ -320,7 +320,7 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
{ {
ScImportParam aParam; ScImportParam aParam;
aParam.bNative = bNative; aParam.bNative = bNative;
aParam.aDBName = sDatabaseName.isEmpty() ? sConnectionRessource : sDatabaseName; aParam.aDBName = sDatabaseName.isEmpty() ? sConnectionResource : sDatabaseName;
aParam.aStatement = sSourceObject; aParam.aStatement = sSourceObject;
sheet::DataImportMode eMode = static_cast<sheet::DataImportMode>(nSourceType); sheet::DataImportMode eMode = static_cast<sheet::DataImportMode>(nSourceType);
switch (eMode) switch (eMode)
@ -741,7 +741,7 @@ ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
} }
} }
if (!sConRes.isEmpty()) if (!sConRes.isEmpty())
pDatabaseRangeContext->SetConnectionRessource(sConRes); pDatabaseRangeContext->SetConnectionResource(sConRes);
} }
ScXMLConResContext::~ScXMLConResContext() ScXMLConResContext::~ScXMLConResContext()

4
sc/source/filter/xml/xmldrani.hxx
View File

@ -80,7 +80,7 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
boost::scoped_ptr<ScQueryParam> mpQueryParam; boost::scoped_ptr<ScQueryParam> mpQueryParam;
ScRange maRange; ScRange maRange;
rtl::OUString sDatabaseRangeName; rtl::OUString sDatabaseRangeName;
rtl::OUString sConnectionRessource; rtl::OUString sConnectionResource;
rtl::OUString sDatabaseName; rtl::OUString sDatabaseName;
rtl::OUString sSourceObject; rtl::OUString sSourceObject;
com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence;
@ -132,7 +132,7 @@ public:
virtual void EndElement(); virtual void EndElement();
void SetDatabaseName(const rtl::OUString sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } 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 SetSourceObject(const rtl::OUString sTempSourceObject) { sSourceObject = sTempSourceObject; }
void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; } void SetSourceType(const com::sun::star::sheet::DataImportMode nTempSourceType) { nSourceType = nTempSourceType; }
void SetNative(const bool bTempNative) { bNative = bTempNative; } void SetNative(const bool bTempNative) { bNative = bTempNative; }

6
sc/source/filter/xml/xmlimprt.cxx
View File

@ -1214,7 +1214,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap()
{ {
{ XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, { 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_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_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_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT },
XML_TOKEN_MAP_END 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_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, { 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_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME },
XML_TOKEN_MAP_END 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_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME },
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF }, { 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_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME },
XML_TOKEN_MAP_END XML_TOKEN_MAP_END
}; };

6
sc/source/filter/xml/xmlimprt.hxx
View File

@ -433,7 +433,7 @@ enum ScXMLDatabaseRangeSourceSQLAttrTokens
{ {
XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME,
XML_TOK_SOURCE_SQL_ATTR_HREF, 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_SQL_STATEMENT,
XML_TOK_SOURCE_SQL_ATTR_PARSE_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_DATABASE_NAME,
XML_TOK_SOURCE_TABLE_ATTR_HREF, 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 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_DATABASE_NAME,
XML_TOK_SOURCE_QUERY_ATTR_HREF, 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 XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME
}; };

4
sc/source/ui/dbgui/tpsort.cxx
View File

@ -548,8 +548,8 @@ ScTabPageSortOptions::~ScTabPageSortOptions()
void ScTabPageSortOptions::Init() void ScTabPageSortOptions::Init()
{ {
// CollatorRessource has user-visible names for sort algorithms // CollatorResource has user-visible names for sort algorithms
pColRes = new CollatorRessource(); pColRes = new CollatorResource();
//! use CollatorWrapper from document? //! use CollatorWrapper from document?
pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() ); pColWrap = new CollatorWrapper( comphelper::getProcessServiceFactory() );

4
sc/source/ui/inc/tpsort.hxx
View File

@ -113,7 +113,7 @@ private:
// Sort Options // Sort Options
class ScDocument; class ScDocument;
class CollatorRessource; class CollatorResource;
class CollatorWrapper; class CollatorWrapper;
class ScTabPageSortOptions : public SfxTabPage class ScTabPageSortOptions : public SfxTabPage
@ -173,7 +173,7 @@ private:
ScSortDlg* pDlg; ScSortDlg* pDlg;
ScAddress theOutPos; ScAddress theOutPos;
CollatorRessource* pColRes; CollatorResource* pColRes;
CollatorWrapper* pColWrap; CollatorWrapper* pColWrap;
#ifdef _TPSORT_CXX #ifdef _TPSORT_CXX

2
sc/source/ui/pagedlg/hfedtdlg.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include "hfedtdlg.hrc" #include "hfedtdlg.hrc"
#define HFEDIT_DLGTITLE \ #define HFEDIT_DLGTITLE \
Text [ en-US ] = "Headers/Footers" ; \ Text [ en-US ] = "Headers/Footers" ; \

2
sd/source/core/glob.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#define __RSC #define __RSC

4
sfx2/source/doc/printhelper.cxx
View File

@ -487,7 +487,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
/* waits for finishing of the print job and moves the temp file afterwards /* waits for finishing of the print job and moves the temp file afterwards
Note: Starting of the job is done outside this thread! 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() void SAL_CALL run()
{ {
@ -777,7 +777,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
// b) // b)
else 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. // They will be delected by the thread automaticly if he finish his run() method.
ImplUCBPrintWatcher* pWatcher = new ImplUCBPrintWatcher( pPrinter, pUCBPrintTempFile, sUcbUrl ); ImplUCBPrintWatcher* pWatcher = new ImplUCBPrintWatcher( pPrinter, pUCBPrintTempFile, sUcbUrl );
pWatcher->create(); pWatcher->create();

2
solenv/bin/deliver.pl
View File

@ -522,7 +522,7 @@ sub parse_dlst
next; next;
} }
push(@action_data, ['copy', $_]); 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/ ) { if ( /\.res\s/ ) {
my $imagelist = $_; my $imagelist = $_;
$imagelist =~ s/\.res/\.$ilst_ext/g; $imagelist =~ s/\.res/\.$ilst_ext/g;

16
svtools/inc/svtools/collatorres.hxx
View File

@ -1,25 +1,25 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef SVTOOLS_COLLATORRESSOURCE_HXX #ifndef SVTOOLS_COLLATORRESOURCE_HXX
#define SVTOOLS_COLLATORRESSOURCE_HXX #define SVTOOLS_COLLATORRESOURCE_HXX
#include "svtools/svtdllapi.h" #include "svtools/svtdllapi.h"
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
class CollatorRessourceData; class CollatorResourceData;
class SVT_DLLPUBLIC CollatorRessource class SVT_DLLPUBLIC CollatorResource
{ {
private: private:
CollatorRessourceData *mp_Data; CollatorResourceData *mp_Data;
public: public:
CollatorRessource(); CollatorResource();
~CollatorRessource(); ~CollatorResource();
const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm); const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
}; };
#endif /* SVTOOLS_COLLATORRESSOURCE_HXX */ #endif /* SVTOOLS_COLLATORRESOURCE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

16
svtools/inc/svtools/indexentryres.hxx
View File

@ -1,25 +1,25 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
#ifndef SVTOOLS_INDEXENTRYRESSOURCE_HXX #ifndef SVTOOLS_INDEXENTRYRESOURCE_HXX
#define SVTOOLS_INDEXENTRYRESSOURCE_HXX #define SVTOOLS_INDEXENTRYRESOURCE_HXX
#include "svtools/svtdllapi.h" #include "svtools/svtdllapi.h"
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
class IndexEntryRessourceData; class IndexEntryResourceData;
class SVT_DLLPUBLIC IndexEntryRessource class SVT_DLLPUBLIC IndexEntryResource
{ {
private: private:
IndexEntryRessourceData *mp_Data; IndexEntryResourceData *mp_Data;
public: public:
IndexEntryRessource (); IndexEntryResource ();
~IndexEntryRessource (); ~IndexEntryResource ();
const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm); const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
}; };
#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ #endif /* SVTOOLS_INDEXENTRYRESOURCE_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

48
svtools/source/control/collatorres.cxx
View File

@ -37,25 +37,25 @@
// //
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
class CollatorRessourceData class CollatorResourceData
{ {
friend class CollatorRessource; friend class CollatorResource;
private: /* data */ private: /* data */
rtl::OUString ma_Name; rtl::OUString ma_Name;
rtl::OUString ma_Translation; rtl::OUString ma_Translation;
private: /* member functions */ private: /* member functions */
CollatorRessourceData () {} CollatorResourceData () {}
public: 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) {} : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
const rtl::OUString& GetAlgorithm () const { return ma_Name; } const rtl::OUString& GetAlgorithm () const { return ma_Name; }
const rtl::OUString& GetTranslation () const { return ma_Translation; } 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_Name = r_From.GetAlgorithm();
ma_Translation = r_From.GetTranslation(); 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 ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
#define RESSTR(rid) SvtResId(rid).toString() #define RESSTR(rid) SvtResId(rid).toString()
mp_Data[0] = CollatorRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_COLLATE_ALPHANUMERIC)); mp_Data[0] = CollatorResourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_COLLATE_ALPHANUMERIC));
mp_Data[1] = CollatorRessourceData (ASCSTR("charset"), RESSTR(STR_SVT_COLLATE_CHARSET)); mp_Data[1] = CollatorResourceData (ASCSTR("charset"), RESSTR(STR_SVT_COLLATE_CHARSET));
mp_Data[2] = CollatorRessourceData (ASCSTR("dict"), RESSTR(STR_SVT_COLLATE_DICTIONARY)); mp_Data[2] = CollatorResourceData (ASCSTR("dict"), RESSTR(STR_SVT_COLLATE_DICTIONARY));
mp_Data[3] = CollatorRessourceData (ASCSTR("normal"), RESSTR(STR_SVT_COLLATE_NORMAL)); mp_Data[3] = CollatorResourceData (ASCSTR("normal"), RESSTR(STR_SVT_COLLATE_NORMAL));
mp_Data[4] = CollatorRessourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_COLLATE_PINYIN)); mp_Data[4] = CollatorResourceData (ASCSTR("pinyin"), RESSTR(STR_SVT_COLLATE_PINYIN));
mp_Data[5] = CollatorRessourceData (ASCSTR("radical"), RESSTR(STR_SVT_COLLATE_RADICAL)); mp_Data[5] = CollatorResourceData (ASCSTR("radical"), RESSTR(STR_SVT_COLLATE_RADICAL));
mp_Data[6] = CollatorRessourceData (ASCSTR("stroke"), RESSTR(STR_SVT_COLLATE_STROKE)); mp_Data[6] = CollatorResourceData (ASCSTR("stroke"), RESSTR(STR_SVT_COLLATE_STROKE));
mp_Data[7] = CollatorRessourceData (ASCSTR("unicode"), RESSTR(STR_SVT_COLLATE_UNICODE)); mp_Data[7] = CollatorResourceData (ASCSTR("unicode"), RESSTR(STR_SVT_COLLATE_UNICODE));
mp_Data[8] = CollatorRessourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_COLLATE_ZHUYIN)); mp_Data[8] = CollatorResourceData (ASCSTR("zhuyin"), RESSTR(STR_SVT_COLLATE_ZHUYIN));
mp_Data[9] = CollatorRessourceData (ASCSTR("phonebook"), RESSTR(STR_SVT_COLLATE_PHONEBOOK)); mp_Data[9] = CollatorResourceData (ASCSTR("phonebook"), RESSTR(STR_SVT_COLLATE_PHONEBOOK));
mp_Data[10] = CollatorRessourceData (ASCSTR("phonetic (alphanumeric first)"), RESSTR(STR_SVT_COLLATE_PHONETIC_F)); mp_Data[10] = CollatorResourceData (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[11] = CollatorResourceData (ASCSTR("phonetic (alphanumeric last)"), RESSTR(STR_SVT_COLLATE_PHONETIC_L));
} }
CollatorRessource::~CollatorRessource() CollatorResource::~CollatorResource()
{ {
delete[] mp_Data; delete[] mp_Data;
} }
const rtl::OUString& const rtl::OUString&
CollatorRessource::GetTranslation(const rtl::OUString &r_Algorithm) CollatorResource::GetTranslation(const rtl::OUString &r_Algorithm)
{ {
sal_Int32 nIndex = r_Algorithm.indexOf('.'); sal_Int32 nIndex = r_Algorithm.indexOf('.');
rtl::OUString aLocaleFreeAlgorithm; rtl::OUString aLocaleFreeAlgorithm;
@ -113,7 +113,7 @@ CollatorRessource::GetTranslation(const rtl::OUString &r_Algorithm)
aLocaleFreeAlgorithm = r_Algorithm.copy(nIndex, r_Algorithm.getLength() - nIndex); 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()) if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm())
return mp_Data[i].GetTranslation(); return mp_Data[i].GetTranslation();

2
svtools/source/control/ctrlbox.src
View File

@ -55,7 +55,7 @@ String STR_SVT_AUTOMATIC_COLOR
}; };
/* /*
* resources for CollatorRessource / CollatorRessourceData resp. * resources for CollatorResource / CollatorResourceData resp.
*/ */
String STR_SVT_COLLATE_ALPHANUMERIC String STR_SVT_COLLATE_ALPHANUMERIC

44
svtools/source/control/indexentryres.cxx
View File

@ -37,25 +37,25 @@
// //
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
class IndexEntryRessourceData class IndexEntryResourceData
{ {
friend class IndexEntryRessource; friend class IndexEntryResource;
private: /* data */ private: /* data */
rtl::OUString ma_Name; rtl::OUString ma_Name;
rtl::OUString ma_Translation; rtl::OUString ma_Translation;
private: /* member functions */ private: /* member functions */
IndexEntryRessourceData () {} IndexEntryResourceData () {}
public: 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) {} : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
const rtl::OUString& GetAlgorithm () const { return ma_Name; } const rtl::OUString& GetAlgorithm () const { return ma_Name; }
const rtl::OUString& GetTranslation () const { return ma_Translation; } 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_Name = r_From.GetAlgorithm();
ma_Translation = r_From.GetTranslation(); 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 ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
#define RESSTR(rid) SvtResId(rid).toString() #define RESSTR(rid) SvtResId(rid).toString()
mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] = 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] = 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] = 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] = 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] = 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] = 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] = 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)); RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FS));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_FS - STR_SVT_INDEXENTRY_START] = 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)); RESSTR(STR_SVT_INDEXENTRY_PHONETIC_FC));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_FC - STR_SVT_INDEXENTRY_START] = 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)); RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LS));
mp_Data[STR_SVT_INDEXENTRY_PHONETIC_LS - STR_SVT_INDEXENTRY_START] = 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)); RESSTR(STR_SVT_INDEXENTRY_PHONETIC_LC));
} }
IndexEntryRessource::~IndexEntryRessource() IndexEntryResource::~IndexEntryResource()
{ {
delete[] mp_Data; 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('.'); sal_Int32 nIndex = r_Algorithm.indexOf('.');
rtl::OUString aLocaleFreeAlgorithm; 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); 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()) if (aLocaleFreeAlgorithm == mp_Data[i].GetAlgorithm())
return mp_Data[i].GetTranslation(); return mp_Data[i].GetTranslation();
return r_Algorithm; return r_Algorithm;

4
svx/inc/svx/fmresids.hrc
View File

@ -21,8 +21,8 @@
// include ----------------------------------------------------------- // include -----------------------------------------------------------
#include <svl/solar.hrc> #include <svl/solar.hrc>
// unnamed ressources ------------------------------------------------------- // unnamed resources -------------------------------------------------------
// sub ressources ..................... // sub resources .....................
// ImageList-Id's ----------------------------------------------------------- // ImageList-Id's -----------------------------------------------------------
#define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0) #define RID_SVXIMGLIST_FMEXPL (RID_FORMS_START + 0)

2
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
View File

@ -63,7 +63,7 @@ namespace drawinglayer
if(GRAPHIC_NONE == aGraphic.GetType()) 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()); const Bitmap aEmptyOLEBitmap(SdrOle2Obj::GetEmtyOLEReplacementBitmap());
aGraphic = Graphic(aEmptyOLEBitmap); aGraphic = Graphic(aEmptyOLEBitmap);
bScaleContent = true; bScaleContent = true;

2
sw/inc/rcid.hrc
View File

@ -121,7 +121,7 @@
#define RC_RIBBAR_BEGIN RC_RIBBAR #define RC_RIBBAR_BEGIN RC_RIBBAR
#define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79) #define RC_RIBBAR_END (RC_RIBBAR_BEGIN + 79)
// globale Ressourcen // globale Resourcen
#define RC_GLOBALS_BEGIN RC_GLOBALS #define RC_GLOBALS_BEGIN RC_GLOBALS
#define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120) #define RC_GLOBALS_END (RC_GLOBALS_BEGIN + 120)

2
sw/source/ui/config/optdlg.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include "globals.hrc" #include "globals.hrc"

2
sw/source/ui/config/redlopt.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>

4
sw/source/ui/inc/srtdlg.hxx
View File

@ -36,7 +36,7 @@
#include <svx/langbox.hxx> #include <svx/langbox.hxx>
class SwWrtShell; class SwWrtShell;
class CollatorRessource; class CollatorResource;
class SwSortDlg : public SvxStandardDialog class SwSortDlg : public SvxStandardDialog
{ {
@ -89,7 +89,7 @@ class SwSortDlg : public SvxStandardDialog
String aNumericTxt; String aNumericTxt;
SwWrtShell &rSh; SwWrtShell &rSh;
CollatorRessource* pColRes; CollatorResource* pColRes;
sal_uInt16 nX; sal_uInt16 nX;
sal_uInt16 nY; sal_uInt16 nY;

4
sw/source/ui/inc/swuicnttab.hxx
View File

@ -129,7 +129,7 @@ public:
static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName); static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName);
}; };
class IndexEntryRessource; class IndexEntryResource;
class IndexEntrySupplierWrapper; class IndexEntrySupplierWrapper;
class SwTOXSelectTabPage : public SfxTabPage class SwTOXSelectTabPage : public SfxTabPage
@ -204,7 +204,7 @@ class SwTOXSelectTabPage : public SfxTabPage
FixedText aSortAlgorithmFT; FixedText aSortAlgorithmFT;
ListBox aSortAlgorithmLB; ListBox aSortAlgorithmLB;
IndexEntryRessource* pIndexRes; IndexEntryResource* pIndexRes;
Point aCBLeftPos1; Point aCBLeftPos1;
Point aCBLeftPos2; Point aCBLeftPos2;

2
sw/source/ui/index/cnttab.cxx
View File

@ -1508,7 +1508,7 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl ); Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
if( !pIndexRes ) if( !pIndexRes )
pIndexRes = new IndexEntryRessource(); pIndexRes = new IndexEntryResource();
String sOldString; String sOldString;
void* pUserData; void* pUserData;

2
sw/source/ui/lingu/olmenu.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include "olmenu.hrc" #include "olmenu.hrc"
#include "helpid.h" #include "helpid.h"

2
sw/source/ui/misc/autocorr.src
View File

@ -15,4 +15,4 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
/* StarView ressource file */ /* StarView resource file */

2
sw/source/ui/misc/linenum.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include <sfx2/sfx.hrc> #include <sfx2/sfx.hrc>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>

2
sw/source/ui/misc/num.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include "globals.hrc" #include "globals.hrc"

2
sw/source/ui/misc/redlndlg.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include "redlndlg.hrc" #include "redlndlg.hrc"
#include "misc.hrc" #include "misc.hrc"

2
sw/source/ui/misc/srtdlg.cxx
View File

@ -462,7 +462,7 @@ IMPL_LINK( SwSortDlg, LanguageHdl, ListBox*, pLBox )
GetAppCollator().listCollatorAlgorithms( aLcl )); GetAppCollator().listCollatorAlgorithms( aLcl ));
if( !pColRes ) if( !pColRes )
pColRes = new CollatorRessource(); pColRes = new CollatorResource();
const sal_uInt16 nLstBoxCnt = 3; const sal_uInt16 nLstBoxCnt = 3;
ListBox* aLstArr[ nLstBoxCnt ] = { &aTypDLB1, &aTypDLB2, &aTypDLB3 }; ListBox* aLstArr[ nLstBoxCnt ] = { &aTypDLB1, &aTypDLB2, &aTypDLB3 };

4
sw/source/ui/ribbar/inputwin.src
View File

@ -24,8 +24,8 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* HelpID ressource file */ /* HelpID resource file */
/* HelpID ressource file */ /* HelpID resource file */
#include "cmdid.h" #include "cmdid.h"
#include "helpid.h" #include "helpid.h"

2
sw/source/ui/smartmenu/stmenu.src
View File

@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
/* StarView ressource file */ /* StarView resource file */
#include "stmenu.hrc" #include "stmenu.hrc"
#include "helpid.h" #include "helpid.h"

2
sw/source/ui/table/chartins.src
View File

@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
/* StarView ressource file */ /* StarView resource file */
#include "chartins.hrc" #include "chartins.hrc"
#include "helpid.h" #include "helpid.h"
ModelessDialog DLG_INSERT_CHART ModelessDialog DLG_INSERT_CHART

2
tools/inc/tools/resmgr.hxx
View File

@ -138,7 +138,7 @@ public:
~ResMgr(); ~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 const sal_Char* GetLang( LanguageType& eLanguage, sal_uInt16 nPrio = 0 ); //depricated! see "tools/source/rc/resmgr.cxx"
static ResMgr* SearchCreateResMgr( const sal_Char* pPrefixName, static ResMgr* SearchCreateResMgr( const sal_Char* pPrefixName,
com::sun::star::lang::Locale& rLocale ); com::sun::star::lang::Locale& rLocale );

4
tools/source/rc/resmgr.cxx
View File

@ -1251,7 +1251,7 @@ void ResMgr::PopContext( const Resource* pResObj )
// Resource freigeben // Resource freigeben
if( (pTop->Flags & (RC_GLOBAL | RC_NOTFOUND)) == RC_GLOBAL ) 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 ); InternalResMgr::FreeGlobalRes( pTop->aResHandle, pTop->pResource );
decStack(); decStack();
} }
@ -1279,7 +1279,7 @@ RSHEADER_TYPE* ResMgr::CreateBlock( const ResId& rId )
memcpy( pHeader, GetClass(), GetRemainSize() ); memcpy( pHeader, GetClass(), GetRemainSize() );
Increment( pHeader->GetLocalOff() ); //ans Ende setzen Increment( pHeader->GetLocalOff() ); //ans Ende setzen
if ( pHeader->GetLocalOff() != pHeader->GetGlobOff() ) if ( pHeader->GetLocalOff() != pHeader->GetGlobOff() )
// Hat Sub-Ressourcen, deshalb extra freigeben // Hat Sub-Resourcen, deshalb extra freigeben
PopContext(); PopContext();
} }

2
unotools/inc/unotools/componentresmodule.hxx
View File

@ -65,7 +65,7 @@ namespace utl
//========================================================================= //=========================================================================
//= ModuleRes //= 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 class UNOTOOLS_DLLPUBLIC ModuleRes : public ::ResId
{ {

14
unotools/source/misc/componentresmodule.cxx
View File

@ -38,13 +38,13 @@ namespace utl
class OComponentResModuleImpl class OComponentResModuleImpl
{ {
private: private:
ResMgr* m_pRessources; ResMgr* m_pResources;
bool m_bInitialized; bool m_bInitialized;
::rtl::OString m_sResFilePrefix; ::rtl::OString m_sResFilePrefix;
public: public:
OComponentResModuleImpl( const ::rtl::OString& _rResFilePrefix ) OComponentResModuleImpl( const ::rtl::OString& _rResFilePrefix )
:m_pRessources( NULL ) :m_pResources( NULL )
,m_bInitialized( false ) ,m_bInitialized( false )
,m_sResFilePrefix( _rResFilePrefix ) ,m_sResFilePrefix( _rResFilePrefix )
{ {
@ -72,27 +72,27 @@ namespace utl
//-------------------------------------------------------------------- //--------------------------------------------------------------------
void OComponentResModuleImpl::freeResManager() void OComponentResModuleImpl::freeResManager()
{ {
delete m_pRessources, m_pRessources = NULL; delete m_pResources, m_pResources = NULL;
m_bInitialized = false; m_bInitialized = false;
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
ResMgr* OComponentResModuleImpl::getResManager() ResMgr* OComponentResModuleImpl::getResManager()
{ {
if ( !m_pRessources && !m_bInitialized ) if ( !m_pResources && !m_bInitialized )
{ {
// create a manager with a fixed prefix // create a manager with a fixed prefix
rtl::OString aMgrName = m_sResFilePrefix; rtl::OString aMgrName = m_sResFilePrefix;
m_pRessources = ResMgr::CreateResMgr( aMgrName.getStr() ); m_pResources = ResMgr::CreateResMgr( aMgrName.getStr() );
OSL_ENSURE( m_pRessources, OSL_ENSURE( m_pResources,
rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " )
.append(aMgrName) .append(aMgrName)
.append(")!").getStr() ); .append(")!").getStr() );
m_bInitialized = sal_True; m_bInitialized = sal_True;
} }
return m_pRessources; return m_pResources;
} }
//==================================================================== //====================================================================

2
uui/source/fltdlg.cxx
View File

@ -52,7 +52,7 @@ namespace uui
@seealso method SetURL() @seealso method SetURL()
@param "pParentWindow" , parent window for dialog @param "pParentWindow" , parent window for dialog
@param "pResMgr" , ressource manager @param "pResMgr" , resource manager
@return - @return -
@onerror - @onerror -