strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove PM2 macro usage

Browse source
This commit is contained in:
Francois Tigeot 2011-04-22 21:52:55 +02:00
parent 69560c178f
commit 7df82673c5
4 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
svl/source/svdde/ddedata.cxx
View file

@ -161,22 +161,10 @@ sal_uLong DdeData::GetExternalFormat( sal_uLong nFmt )
default:
{
#if defined(WNT) || defined( PM2 )
String aName( SotExchange::GetFormatName( nFmt ) );
#if defined(WNT)
String aName( SotExchange::GetFormatName( nFmt ) );
if( aName.Len() )
nFmt = RegisterClipboardFormat( reinterpret_cast<LPCWSTR>(aName.GetBuffer()) );
#endif
#if defined( PM2 )
if( aName.Len() )
{
HATOMTBL hSysTable = WinQuerySystemAtomTable();
nFmt = (sal_uLong)WinAddAtom( hSysTable, (PSZ)aName.GetBuffer() );
}
#endif
#endif
}
}
@ -208,17 +196,6 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt )
if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )
nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast<const sal_Unicode*>(szName)) );
}
#endif
#if defined(PM2)
if( nFmt > CF_PALETTE )
{
char szName[ 256 ];
HATOMTBL hSysTable = WinQuerySystemAtomTable();
WinQueryAtomName( hSysTable, (ATOM)nFmt, (PSZ)szName,
sizeof( szName ) );
nFmt = SotExchange::RegisterFormatName( String( szName ) );
}
#endif
break;
}

3
svtools/source/edit/textdoc.cxx
View file

@ -39,9 +39,6 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr );
// Vergleichmethode wird von QuickSort gerufen...
EXTERN_C
#if defined( PM2 )
int _stdcall
#else
#ifdef WNT
#if _MSC_VER >= 1200
int __cdecl

4
svtools/source/filter.vcl/filter/sgvspln.cxx
View file

@ -34,10 +34,6 @@
#include <tools/poly.hxx>
#if defined( PM2 ) && defined( __BORLANDC__ )
#pragma option -Od
#endif
extern "C" {
/*.pn 277 */

4
svtools/source/filter.vcl/filter/sgvtext.cxx
View file

@ -617,8 +617,8 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s
switch (Atr.GetFont()) {
case 92500: case 92501: case 92504: case 92505:
{
#if defined(WNT) || defined(PM2)
FNam=String::CreateFromAscii( "Times New Roman" ); // CG Times ist unter Windows und OS/2 Times New Roman
#if defined(WNT)
FNam=String::CreateFromAscii( "Times New Roman" ); // CG Times ist unter Windows Times New Roman
#else
FNam=String::CreateFromAscii( "Times" ); // ansonsten ist das einfach Times
#endif