From 889de665ec9d2ac25a9dccd4830cb97ed0c7c56e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 30 Jul 2012 08:41:34 +0200 Subject: Typo ressource -> resource Change-Id: Id13e7acfbe34eca5e124c9032d36d6f158bfb831 --- .../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +- .../source/controller/main/UndoCommandDispatch.cxx | 2 +- chart2/source/inc/ResourceManager.hxx | 47 ++++++++++++++++++++++ chart2/source/inc/RessourceManager.hxx | 47 ---------------------- chart2/source/tools/ResId.cxx | 4 +- chart2/source/tools/ResourceManager.cxx | 41 +++++++++++++++++++ chart2/source/tools/RessourceManager.cxx | 41 ------------------- 7 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 chart2/source/inc/ResourceManager.hxx delete mode 100644 chart2/source/inc/RessourceManager.hxx create mode 100644 chart2/source/tools/ResourceManager.cxx delete mode 100644 chart2/source/tools/RessourceManager.cxx (limited to 'chart2/source') diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index e54339cbf880..e3c44018d4bb 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -1490,7 +1490,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } else { - // this is a sort of dispose() from the new model,so release ressources here + // this is a sort of dispose() from the new model,so release resources here try { this->dispose(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 6f0728ffd45e..24cfb507e9c2 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -29,7 +29,7 @@ #include #include -// for ressource strings STR_UNDO and STR_REDO +// for resource strings STR_UNDO and STR_REDO #include #include diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx new file mode 100644 index 000000000000..165946148c04 --- /dev/null +++ b/chart2/source/inc/ResourceManager.hxx @@ -0,0 +1,47 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef CHART2_RESOURCEMANAGER_HXX +#define CHART2_RESOURCEMANAGER_HXX + +#include "charttoolsdllapi.hxx" + +// defined in +class ResMgr; + +namespace chart +{ + +class ResourceManager +{ +public: + static ::ResMgr & getResourceManager(); + +private: + // not implemented -- avoid instantiation + ResourceManager(); + + static ::ResMgr * m_pResourceManager; +}; + +} // namespace chart + +// CHART2_RESOURCEMANAGER_HXX +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/RessourceManager.hxx b/chart2/source/inc/RessourceManager.hxx deleted file mode 100644 index 07a3bdfa8642..000000000000 --- a/chart2/source/inc/RessourceManager.hxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef CHART2_RESSOURCEMANAGER_HXX -#define CHART2_RESSOURCEMANAGER_HXX - -#include "charttoolsdllapi.hxx" - -// defined in -class ResMgr; - -namespace chart -{ - -class RessourceManager -{ -public: - static ::ResMgr & getRessourceManager(); - -private: - // not implemented -- avoid instantiation - RessourceManager(); - - static ::ResMgr * m_pRessourceManager; -}; - -} // namespace chart - -// CHART2_RESSOURCEMANAGER_HXX -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/ResId.cxx b/chart2/source/tools/ResId.cxx index be273d6a0f07..ed4c80e41c8f 100644 --- a/chart2/source/tools/ResId.cxx +++ b/chart2/source/tools/ResId.cxx @@ -19,14 +19,14 @@ #include "ResId.hxx" -#include "RessourceManager.hxx" +#include "ResourceManager.hxx" #include namespace chart { SchResId::SchResId( sal_Int16 nId ) - : ResId( nId, RessourceManager::getRessourceManager() ) + : ResId( nId, ResourceManager::getResourceManager() ) { } diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx new file mode 100644 index 000000000000..db7ea9d18dda --- /dev/null +++ b/chart2/source/tools/ResourceManager.cxx @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + + +#include "ResourceManager.hxx" + +#include + +namespace chart +{ + +ResMgr * ResourceManager::m_pResourceManager = 0; + +ResMgr & ResourceManager::getResourceManager() +{ + // not threadsafe + if( ! m_pResourceManager ) + m_pResourceManager = ResMgr::CreateResMgr("chartcontroller"); + OSL_ASSERT( m_pResourceManager ); + return *m_pResourceManager; +} + +} // namespace chart + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/tools/RessourceManager.cxx b/chart2/source/tools/RessourceManager.cxx deleted file mode 100644 index 29a68ee96ccd..000000000000 --- a/chart2/source/tools/RessourceManager.cxx +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "RessourceManager.hxx" - -#include - -namespace chart -{ - -ResMgr * RessourceManager::m_pRessourceManager = 0; - -ResMgr & RessourceManager::getRessourceManager() -{ - // not threadsafe - if( ! m_pRessourceManager ) - m_pRessourceManager = ResMgr::CreateResMgr("chartcontroller"); - OSL_ASSERT( m_pRessourceManager ); - return *m_pRessourceManager; -} - -} // namespace chart - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit