diff options
-rw-r--r-- | basic/source/classes/sbunoobj.cxx | 2 | ||||
-rw-r--r-- | basic/source/runtime/runtime.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/swafopt.cxx | 2 | ||||
-rw-r--r-- | include/editeng/svxrtf.hxx | 2 | ||||
-rw-r--r-- | include/svl/itempool.hxx | 2 | ||||
-rw-r--r-- | svl/source/items/itempool.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/poolio.cxx | 4 | ||||
-rw-r--r-- | svl/source/items/style.cxx | 2 | ||||
-rw-r--r-- | sw/inc/tblafmt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/tox.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 10 |
11 files changed, 16 insertions, 16 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index b0eca563c9f8..296e70683b27 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -162,7 +162,7 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj ) if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) ) { - OSL_TRACE("SetSbUnoObjectDfltPropName setting dflt prop for %s", OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_TRACE("SetSbUnoObjectDfltPropName setting default prop for %s", OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() ); pUnoObj->SetDfltProperty( sDfltPropName ); } } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index af50e0902921..8bfdb5295940 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -3314,7 +3314,7 @@ void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt ) bool bOk = checkClass_Impl( refVal, aClass, true ); if( bOk ) { - StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt prop for a "proper" set + StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle default prop for a "proper" set } } diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx index deee6fce0b10..74645ed982c2 100644 --- a/editeng/source/misc/swafopt.cxx +++ b/editeng/source/misc/swafopt.cxx @@ -61,7 +61,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags() bDummy6 = bDummy7 = bDummy8 = false; - nRightMargin = 50; // dflt. 50% + nRightMargin = 50; // default 50% nAutoCmpltExpandKey = KEY_RETURN; aBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index cc0f2b8218a6..33a8339c0423 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -326,7 +326,7 @@ public: virtual SvParserState CallParser() SAL_OVERRIDE; inline const Color& GetColor( size_t nId ) const; - const Font& GetFont( sal_uInt16 nId ); // Changes the dflt Font + const Font& GetFont( sal_uInt16 nId ); // Changes the default Font virtual bool IsEndPara( SvxNodeIdx* pNd, sal_Int32 nCnt ) const = 0; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 0f7e08da3d8e..72bd11de4d1d 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -87,7 +87,7 @@ private: SVL_DLLPRIVATE bool IsItemFlag_Impl( sal_uInt16 nWhich, sal_uInt16 nFlag ) const; public: - // fuer dflt. SfxItemSet::CTOR, setze dflt. WhichRanges + // for default SfxItemSet::CTOR, set default WhichRanges void FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const; const sal_uInt16* GetFrozenIdRanges() const; #endif diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index f8ec9939f7fd..457b946fca19 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -955,7 +955,7 @@ const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) co return 0; } - // dflt-Attribut? + // default attribute? if ( nOfst == SFX_ITEMS_DEFAULT ) return *(pImp->ppStaticDefaults + GetIndex_Impl(nWhich)); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 4b7b15e2a85a..68c93ef062d7 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -1069,7 +1069,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate // richtigen (Folge-) Pool gefunden? if ( pTarget->IsInRange(rWhich) ) { - // dflt-Attribut? + // default attribute? if ( SFX_ITEMS_DEFAULT == nSurrogat ) return *(pTarget->pImp->ppStaticDefaults + pTarget->GetIndex_Impl(rWhich)); @@ -1162,7 +1162,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const SFX_ASSERT( false, pItem->Which(), "unknown Which-Id - dont ask me for surrogates" ); } - // Pointer auf static- oder pool-dflt-Attribut? + // pointer on static or pool-default attribute? if( IsStaticDefaultItem(pItem) || IsPoolDefaultItem(pItem) ) return SFX_ITEMS_DEFAULT; diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 8bdf0735e472..175f7ceee101 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -266,7 +266,7 @@ bool SfxStyleSheetBase::SetFollow( const OUString& rName ) return true; } -// Set Itemset. The dflt-implementation creates a new set +// Set Itemset. The default implementation creates a new set SfxItemSet& SfxStyleSheetBase::GetItemSet() { diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 83040cb03006..23975d5990e4 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -230,7 +230,7 @@ properties are stored per-table, and are lossless. */ class SW_DLLPUBLIC SwTableAutoFmt { - friend void _FinitCore(); // To destroy dflt. pointer. + friend void _FinitCore(); // To destroy default pointer. static SwBoxAutoFmt* pDfltBoxAutoFmt; OUString m_aName; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index fe22c1dcaa22..701cf8b2f811 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwTOXMark ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark; - SwTOXMark(); // to create the dflt. atr. in _InitCore + SwTOXMark(); // to create the default attribute in _InitCore protected: // SwClient diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index f8faae126699..8f1f9762ab3c 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1807,7 +1807,7 @@ SwFmt* SwDoc::CopyFmt( const SwFmt& rFmt, pNewFmt->SetPoolFmtId( rFmt.GetPoolFmtId() ); pNewFmt->SetPoolHelpId( rFmt.GetPoolHelpId() ); - // Always set the HelpFile Id to dflt! + // Always set the HelpFile Id to default! pNewFmt->SetPoolHlpFileId( UCHAR_MAX ); return pNewFmt; @@ -1866,7 +1866,7 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl& rColl ) pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() ); pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() ); - // Always set the HelpFile Id to dflt! + // Always set the HelpFile Id to default! pNewColl->SetPoolHlpFileId( UCHAR_MAX ); if( &rColl.GetNextTxtFmtColl() != &rColl ) @@ -1917,7 +1917,7 @@ SwGrfFmtColl* SwDoc::CopyGrfColl( const SwGrfFmtColl& rColl ) pNewColl->SetPoolFmtId( rColl.GetPoolFmtId() ); pNewColl->SetPoolHelpId( rColl.GetPoolHelpId() ); - // Always set the HelpFile Id to dflt! + // Always set the HelpFile Id to default! pNewColl->SetPoolHlpFileId( UCHAR_MAX ); return pNewColl; @@ -1997,7 +1997,7 @@ void SwDoc::CopyFmtArr( const SwFmtsBase& rSourceArr, pDest->SetPoolFmtId( pSrc->GetPoolFmtId() ); pDest->SetPoolHelpId( pSrc->GetPoolHelpId() ); - // Always set the HelpFile Id to dflt! + // Always set the HelpFile Id to default! pDest->SetPoolHlpFileId( UCHAR_MAX ); if( pSrc->DerivedFrom() ) @@ -2100,7 +2100,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, { rDstDesc.SetPoolFmtId( rSrcDesc.GetPoolFmtId() ); rDstDesc.SetPoolHelpId( rSrcDesc.GetPoolHelpId() ); - // Always set the HelpFile Id to dflt! + // Always set the HelpFile Id to default! rDstDesc.SetPoolHlpFileId( UCHAR_MAX ); } |