[Libreoffice-commits] .: automation/source
Michael Meeks
michael at kemper.freedesktop.org
Mon Aug 1 04:29:09 PDT 2011
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(-)
New commits:
commit d72d2047834e4f52e256d52772a540a13049db23
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Aug 1 12:26:20 2011 +0100
rename SttResId to IttResId to avoid conflict with basic/
diff --git a/automation/source/inc/ittresid.hxx b/automation/source/inc/ittresid.hxx
new file mode 100644
index 0000000..0888261
--- /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
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _ITTRESID_HXX_
+#define _ITTRESID_HXX_
+
+#include <tools/resmgr.hxx>
+#include <tools/resid.hxx>
+
+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 7a416a8..0000000
--- 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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _STTRESID_HXX_
-#define _STTRESID_HXX_
-
-#include <tools/resmgr.hxx>
-#include <tools/resid.hxx>
-
-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 00cb14b..f76e12a 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 <basic/testtool.hrc>
@@ -43,7 +43,7 @@ ControlDefLoad const CmdStream::arKeyCodes [] =
#include <keycodes.hxx>
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 d1ae1bf..57c9455 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 <osl/file.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/sound.hxx>
@@ -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 );
}
More information about the Libreoffice-commits
mailing list