diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-22 21:52:55 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-22 21:52:55 +0200 |
| commit | 7df82673c5c0df83c9d1131ff4727e91ec7af36b (patch) | |
| tree | 054a2658b3b22bd82d40d7015f56d590ebaca421 /svtools | |
| parent | 69560c178f3e3f39b38b8f0b3cc39f30753aeb75 (diff) | |
Remove PM2 macro usage
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/edit/textdoc.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/filter/sgvspln.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/filter.vcl/filter/sgvtext.cxx | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index b4eeb76d8a06..b30e8a90d25b 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -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 diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx index 5077e91f44ea..864ff3ee5c8b 100644 --- a/svtools/source/filter.vcl/filter/sgvspln.cxx +++ b/svtools/source/filter.vcl/filter/sgvspln.cxx @@ -34,10 +34,6 @@ #include <tools/poly.hxx> -#if defined( PM2 ) && defined( __BORLANDC__ ) -#pragma option -Od -#endif - extern "C" { /*.pn 277 */ diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index c46d180d042e..ddda27f2efa2 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -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 |