diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:07:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:07:55 +0000 |
| commit | 98667b9e2603eb8987ff1e916096d03cf977bca1 (patch) | |
| tree | 6df06c1afa318aa609048152ed754289c112c250 /configmgr/source | |
| parent | 337856da104aba7d76f6803418aa450040a2516f (diff) | |
INTEGRATION: CWS sb88 (1.16.10); FILE MERGED
2008/06/03 15:29:54 sb 1.16.10.1: #i89553 applied patch by cmc
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/treemgr/templateimpl.hxx | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/configmgr/source/treemgr/templateimpl.hxx b/configmgr/source/treemgr/templateimpl.hxx index d37242104355..ec28b8da0488 100644 --- a/configmgr/source/treemgr/templateimpl.hxx +++ b/configmgr/source/treemgr/templateimpl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: templateimpl.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -74,11 +74,6 @@ namespace configmgr , aModule() {} - TemplateName(UnoType const& aType, bool bLocalized) - : aName(makeSimpleTypeName(aType)) - , aModule(makeSimpleTypeModuleName(bLocalized)) - {} - TemplateName(Name const& aName_) : aName(aName_) , aModule() @@ -126,16 +121,11 @@ namespace configmgr //----------------------------------------------------------------- static UnoType resolveSimpleTypeName(Name const& aName); //----------------------------------------------------------------- - static Name makeSimpleTypeName(UnoType const& aType); - //----------------------------------------------------------------- +#if OSL_DEBUG_LEVEL > 0 static Name makeNativeTypeModuleName(); //----------------------------------------------------------------- static Name makeLocalizedTypeModuleName(); - //----------------------------------------------------------------- - static Name makeSimpleTypeModuleName(bool bLocalized) - { - return bLocalized ? makeLocalizedTypeModuleName() : makeNativeTypeModuleName(); - } +#endif //----------------------------------------------------------------- }; //------------------------------------------------------------------------- @@ -158,8 +148,6 @@ namespace configmgr static void assignActualType (Template& aTemplate,UnoType const& aType); //----------------------------------------------------------------- - static TemplateHolder makeSpecialTemplate (TemplateName const& _aNames, SpecialTemplateProvider const& aProvider, UnoType const& aType); - static TemplateHolder makeElementTemplateWithType(TemplateName const& aNames, TemplateProvider const& _aProvider, data::SetNodeAccess const& _aSet); //----------------------------------------------------------------- @@ -172,20 +160,6 @@ namespace configmgr //------------------------------------------------------------------------- //--------------------------------------------------------------------- - // class SpecialTemplateProvider_Impl - //--------------------------------------------------------------------- - - struct SpecialTemplateProvider_Impl : configmgr::SimpleReferenceObject - { - SpecialTemplateProvider_Impl(); - - TemplateHolder makeTemplate (TemplateName const& aNames, UnoType const& aType); - - private: - TemplateRepository m_aRepository; - }; - - //--------------------------------------------------------------------- // class TemplateProvider_Impl //--------------------------------------------------------------------- |