Skip to content

C
core
Kaydet (Commit) 9ddf0552 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

fix mis-merge

üst 3dee56f5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
automation/inc/automation/commtypes.hxx
Dosyayı görüntüle @ 9ddf0552
...@@ -70,7 +70,6 @@ typedef sal_uInt32 comm_UINT32; ...@@ -70,7 +70,6 @@ typedef sal_uInt32 comm_UINT32;
typedef sal_uInt16 comm_WORD; typedef sal_uInt16 comm_WORD;
typedef sal_uInt32 comm_DWORD; typedef sal_uInt32 comm_DWORD;
class rtl::OString;
class String; class String;
#define comm_String String #define comm_String String
......
automation/source/server/statemnt.cxx
Dosyayı görüntüle @ 9ddf0552
...@@ -2452,7 +2452,7 @@ sal_Bool StatementCommand::Execute() ...@@ -2452,7 +2452,7 @@ sal_Bool StatementCommand::Execute()
nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en nNr1 = 1; // Zum durchprobieren der Buttons beim Schlie�en
nLNr1 = (sal_uLong)pControl; nLNr1 = (sal_uLong)pControl;
return FALSE; return sal_False;
} }
} }
} }
......
cui/source/tabpages/paragrph.cxx
Dosyayı görüntüle @ 9ddf0552
...@@ -435,7 +435,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) ...@@ -435,7 +435,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet )
// Metrik einstellen // Metrik einstellen
FieldUnit eFUnit = GetModuleFieldUnit( rSet ); FieldUnit eFUnit = GetModuleFieldUnit( rSet );
sal_Bool bApplyCharUnit = GetApplyCharUnit( rSet ); bool bApplyCharUnit = GetApplyCharUnit( rSet );
SvtCJKOptions aCJKOptions; SvtCJKOptions aCJKOptions;
if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit ) if(aCJKOptions.IsAsianTypographyEnabled() && bApplyCharUnit )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment