From 9ddf05522849d28ec15d66c0b2aff4585eb912fe Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 12 Mar 2011 19:01:27 -0600 Subject: fix mis-merge --- automation/inc/automation/commtypes.hxx | 1 - automation/source/server/statemnt.cxx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'automation') diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index adfe4561b132..51b3601be94a 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -70,7 +70,6 @@ typedef sal_uInt32 comm_UINT32; typedef sal_uInt16 comm_WORD; typedef sal_uInt32 comm_DWORD; -class rtl::OString; class String; #define comm_String String diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 7036ee8b1051..85a69ccdf82c 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -2452,7 +2452,7 @@ sal_Bool StatementCommand::Execute() nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en nLNr1 = (sal_uLong)pControl; - return FALSE; + return sal_False; } } } -- cgit