From d72d2047834e4f52e256d52772a540a13049db23 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 1 Aug 2011 12:26:20 +0100 Subject: rename SttResId to IttResId to avoid conflict with basic/ --- automation/source/inc/ittresid.hxx | 45 ++++++++++++++++++++++++++++++++++ automation/source/inc/sttresid.hxx | 45 ---------------------------------- automation/source/testtool/cmdstrm.cxx | 6 ++--- automation/source/testtool/objtest.cxx | 14 +++++------ 4 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 automation/source/inc/ittresid.hxx delete mode 100644 automation/source/inc/sttresid.hxx diff --git a/automation/source/inc/ittresid.hxx b/automation/source/inc/ittresid.hxx new file mode 100644 index 000000000..088826160 --- /dev/null +++ b/automation/source/inc/ittresid.hxx @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _ITTRESID_HXX_ +#define _ITTRESID_HXX_ + +#include +#include + +class IttResId : public ResId +{ + static ResMgr* getIttResMgr(); + public: + IttResId( sal_uInt32 nId ) : ResId( nId, *getIttResMgr() ) {} +}; + + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/inc/sttresid.hxx b/automation/source/inc/sttresid.hxx deleted file mode 100644 index 7a416a866..000000000 --- a/automation/source/inc/sttresid.hxx +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _STTRESID_HXX_ -#define _STTRESID_HXX_ - -#include -#include - -class SttResId : public ResId -{ - static ResMgr* getSttResMgr(); - public: - SttResId( sal_uInt32 nId ) : ResId( nId, *getSttResMgr() ) {} -}; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index 00cb14b7b..f76e12a75 100644 --- a/automation/source/testtool/cmdstrm.cxx +++ b/automation/source/testtool/cmdstrm.cxx @@ -35,7 +35,7 @@ #include "cmdstrm.hxx" #include "rcontrol.hxx" #include "objtest.hxx" -#include "sttresid.hxx" +#include "ittresid.hxx" #include "svcommstream.hxx" #include @@ -43,7 +43,7 @@ ControlDefLoad const CmdStream::arKeyCodes [] = #include CNames *CmdStream::pKeyCodes = NULL; -ResMgr* SttResId::getSttResMgr() +ResMgr* IttResId::getIttResMgr() { static ResMgr* pMgr = NULL; if( ! pMgr ) @@ -153,7 +153,7 @@ String CmdStream::WandleKeyEventString( String aKeys ) Result += '<'; Result += Token; Result += ' '; - Result += String( SttResId( S_INVALID_KEYCODE ) ); + Result += String( IttResId( S_INVALID_KEYCODE ) ); Result += '>'; } } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index d1ae1bf6c..57c9455d0 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -31,7 +31,7 @@ #include "sysdir_win.hxx" #include "registry_win.hxx" -#include "sttresid.hxx" +#include "ittresid.hxx" #include #include #include @@ -787,7 +787,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, s { String aFileName = (pImpl->aHIDDir + DirEntry(CUniString("hid.lst"))).GetFull(); { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aFileName ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_LONGNAMES)), aFileName ); GetTTBroadcaster().Broadcast( aHint ); } ReadFlat( aFileName ,pUIds, sal_True ); @@ -814,12 +814,12 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, s if ( bIsFlat && !pNames ) { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_SLOT_IDS)), Filename ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_SLOT_IDS)), Filename ); GetTTBroadcaster().Broadcast( aHint ); } else { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_CONTROLS)), Filename ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_CONTROLS)), Filename ); GetTTBroadcaster().Broadcast( aHint ); } @@ -1590,7 +1590,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, aTmpStr += ' '; aTmpStr += pImpl->ProgParam; { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_STARTING_APPLICATION)), aTmpStr ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_STARTING_APPLICATION)), aTmpStr ); GetTTBroadcaster().Broadcast( aHint ); } @@ -1787,7 +1787,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, else if ( Ext.CompareIgnoreCaseToAscii("Inc") == COMPARE_EQUAL ) { { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_BASIC_MODULE)), FilePath.GetFull() ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_BASIC_MODULE)), FilePath.GetFull() ); GetTTBroadcaster().Broadcast( aHint ); } String aFullPathname = FilePath.GetFull(); @@ -3085,7 +3085,7 @@ void TestToolObj::ReadHidLstByNumber() String aName = (pImpl->aHIDDir + DirEntry(CUniString("hid.lst"))).GetFull(); { - TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(SttResId(S_READING_LONGNAMES)), aName ); + TTExecutionStatusHint aHint( TT_EXECUTION_SHOW_ACTION, String(IttResId(S_READING_LONGNAMES)), aName ); GetTTBroadcaster().Broadcast( aHint ); } -- cgit v1.2.3