Modified: openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx?rev=1714834=1714833=1714834=diff
==
--- openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx (original)
+++ openoffice/trunk/main/sw/source/core/doc/poolfmt.cxx Tue Nov 17 17:22:59
2015
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -98,17 +98,17 @@ static const sal_Char __FAR_DATA sKomma[
static const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = {
// PT_16, PT_14, PT_14, PT_12, PT_12, // normal
//JP 10.12.96: jetzt soll alles prozentual sein:
- 115, 100, 100, 85, 85,
- 75, 75, 75, 75, 75, // normal
+115, 100, 100, 85, 85,
+75, 75, 75, 75, 75, // normal
// PT_22, PT_16, PT_12, PT_11, PT_9// HTML-Mode
- PT_24, PT_18, PT_14, PT_12, PT_10,
- PT_7, PT_7, PT_7, PT_7, PT_7// HTML-Mode
+PT_24, PT_18, PT_14, PT_12, PT_10,
+PT_7, PT_7, PT_7, PT_7, PT_7 // HTML-Mode
};
long lcl_GetRightMargin( SwDoc& rDoc )
{
- // sorge dafuer, dass die Druckereinstellungen in die Standard-
- // Seitenvorlage uebernommen wurden.
+// sorge dafuer, dass die Druckereinstellungen in die Standard-
+// Seitenvorlage uebernommen wurden.
const SwFrmFmt& rPgDscFmt =
const_cast()->GetPageDesc( 0 ).GetMaster();
const SvxLRSpaceItem& rLR = rPgDscFmt.GetLRSpace();
@@ -120,128 +120,128 @@ long lcl_GetRightMargin( SwDoc& rDoc )
void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem )
{
- rSet.Put( rItem );
- sal_uInt16 nWhCJK = 0, nWhCTL = 0;
- switch( rItem.Which() )
- {
- case RES_CHRATR_FONTSIZE:
- nWhCJK = RES_CHRATR_CJK_FONTSIZE, nWhCTL =
RES_CHRATR_CTL_FONTSIZE;
- break;
- case RES_CHRATR_FONT:
- nWhCJK = RES_CHRATR_CJK_FONT, nWhCTL = RES_CHRATR_CTL_FONT;
- break;
- case RES_CHRATR_LANGUAGE:
- nWhCJK = RES_CHRATR_CJK_LANGUAGE, nWhCTL =
RES_CHRATR_CTL_LANGUAGE;
- break;
- case RES_CHRATR_POSTURE:
- nWhCJK = RES_CHRATR_CJK_POSTURE, nWhCTL =
RES_CHRATR_CTL_POSTURE;
- break;
- case RES_CHRATR_WEIGHT:
- nWhCJK = RES_CHRATR_CJK_WEIGHT, nWhCTL = RES_CHRATR_CTL_WEIGHT;
- break;
- }
-
- if( nWhCJK )
- rSet.Put( rItem, nWhCJK );
- if( nWhCTL )
- rSet.Put( rItem, nWhCTL );
+rSet.Put( rItem );
+sal_uInt16 nWhCJK = 0, nWhCTL = 0;
+switch( rItem.Which() )
+{
+case RES_CHRATR_FONTSIZE:
+nWhCJK = RES_CHRATR_CJK_FONTSIZE, nWhCTL = RES_CHRATR_CTL_FONTSIZE;
+break;
+case RES_CHRATR_FONT:
+nWhCJK = RES_CHRATR_CJK_FONT, nWhCTL = RES_CHRATR_CTL_FONT;
+break;
+case RES_CHRATR_LANGUAGE:
+nWhCJK = RES_CHRATR_CJK_LANGUAGE, nWhCTL = RES_CHRATR_CTL_LANGUAGE;
+break;
+case RES_CHRATR_POSTURE:
+nWhCJK = RES_CHRATR_CJK_POSTURE, nWhCTL = RES_CHRATR_CTL_POSTURE;
+break;
+case RES_CHRATR_WEIGHT:
+nWhCJK = RES_CHRATR_CJK_WEIGHT, nWhCTL = RES_CHRATR_CTL_WEIGHT;
+break;
+}
+
+if( nWhCJK )
+rSet.Put( rItem, nWhCJK );
+if( nWhCTL )
+rSet.Put( rItem, nWhCTL );
}
void lcl_SetDfltFont( sal_uInt16 nFntType, SfxItemSet& rSet )
{
- static struct {
- sal_uInt16 nResLngId;
- sal_uInt16 nResFntId;
- } aArr[ 3 ] = {
- { RES_CHRATR_LANGUAGE, RES_CHRATR_FONT },
- { RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_FONT },
- { RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_FONT }
- };
- for( sal_uInt16 n = 0; n < 3; ++n )
- {
- sal_uInt16 nLng =
((SvxLanguageItem&)rSet.GetPool()->GetDefaultItem(
- aArr[n].nResLngId
)).GetLanguage();
-
