[Libreoffice-commits] .: Branch 'integration/dev300_m101' - automation/inc automation/source cui/source

[Norbert Thiebaud]

 automation/inc/automation/commtypes.hxx |    1 -
 automation/source/server/statemnt.cxx   |    2 +-
 cui/source/tabpages/paragrph.cxx        |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 64846268e52ce69b5bbf237e450e2e4e3d4bb039
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 19:01:27 2011 -0600

    fix mis-merge

diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx
index d7a861d..6744037 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 ef91a01..02fbc1b 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;
                             }
                         }
                     }
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 25b7f27..e269f07 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -435,7 +435,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
     // Metrik einstellen
     FieldUnit eFUnit = GetModuleFieldUnit( rSet );
 
-    sal_Bool bApplyCharUnit = GetApplyCharUnit( rSet );
+    bool bApplyCharUnit = GetApplyCharUnit( rSet );
 
     SvtCJKOptions aCJKOptions;
     if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit )