summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 19:01:27 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-12 19:01:27 -0600
commit9ddf05522849d28ec15d66c0b2aff4585eb912fe (patch)
treeb136d0e9ca08e314acdf684e3ca1bd7fca062135 /cui
parent3dee56f59f881e247b576287210fb2ff602d0645 (diff)
fix mis-merge
Diffstat (limited to 'cui')
-rw-r--r--cui/source/tabpages/paragrph.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index e0c26d5d42f5..a94e4bd5b196 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 )