[Libreoffice-commits] core.git: 4 commits - basic/source cui/source editeng/source framework/source include/editeng include/svl include/tools offapi/com sc/source svl/source svtools/source sw/inc sw/source
Thomas Arnhold
thomas at arnhold.org
Mon May 5 22:19:42 PDT 2014
basic/source/classes/sbunoobj.cxx | 2 +-
basic/source/runtime/runtime.cxx | 2 +-
cui/source/inc/numpages.hxx | 3 ---
cui/source/tabpages/numpages.cxx | 1 -
editeng/source/misc/swafopt.cxx | 2 +-
framework/source/helper/vclstatusindicator.cxx | 2 +-
include/editeng/svxrtf.hxx | 2 +-
include/svl/itempool.hxx | 2 +-
include/tools/color.hxx | 4 ++--
offapi/com/sun/star/drawing/GraphicObjectShape.idl | 2 +-
sc/source/ui/docshell/docsh.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 4 ++--
sc/source/ui/view/printfun.cxx | 4 ++--
svl/source/items/itempool.cxx | 2 +-
svl/source/items/poolio.cxx | 4 ++--
svl/source/items/style.cxx | 2 +-
svl/source/numbers/zforfind.cxx | 2 +-
svtools/source/contnr/imivctl1.cxx | 2 +-
sw/inc/tblafmt.hxx | 2 +-
sw/inc/tox.hxx | 2 +-
sw/source/core/doc/docfmt.cxx | 10 +++++-----
sw/source/core/text/porlay.cxx | 4 ++--
sw/source/core/uibase/frmdlg/colmgr.cxx | 2 +-
23 files changed, 30 insertions(+), 34 deletions(-)
New commits:
commit 65f61d1bf7e59fd643ca3da4a25c8ace8e5507e6
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue May 6 07:08:01 2014 +0200
fdo#78321 Bullets and Numbering: SvxNumberingPreview looks ugly
Just remove the inner rectangle. Now it looks nice.
Change-Id: Icd3d3971292f958d1ffdd3dc6a7697005b5f9047
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b4714a5..b4e46aa 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -464,7 +464,4 @@ public:
#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0ab58a6..a1265f9 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2302,7 +2302,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
aLineColor.Invert();
pVDev->SetLineColor(aLineColor);
pVDev->SetFillColor( aBackColor );
- pVDev->DrawRect(aRect);
if(pActNum)
{
commit 9e436082af14b2202229589325cee0518fd6107d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 22:41:17 2014 +0200
dflt -> default
Change-Id: I89f1f5771eb7d96da233a8c7386b906b2a3a9c3e
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b0eca56..296e706 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 af50e09..8bfdb52 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 deee6fc..74645ed 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 cc0f2b8..33a8339 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 0f7e08d..72bd11d 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 f8ec993..457b946 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 4b7b15e..68c93ef 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 8bdf073..175f7ce 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 83040cb..23975d5 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 fe22c1d..701cf8b 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 f8faae1..8f1f976 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 );
}
commit 5d0272772a174644e63fd46664887a2cb0362ba5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 22:27:38 2014 +0200
consistent percent sign in comments
Change-Id: I9906b4e58fd8672e51f6aa2e56ec68bb28772500
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index fd81eff..deee6fc 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; // dflt. 50%
nAutoCmpltExpandKey = KEY_RETURN;
aBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 3745beb..a2b0625 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -118,7 +118,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
sal_Int32 nRange = m_nRange;
nValue = m_nValue;
- // normalize value to fit the range of 0-100 %
+ // normalize value to fit the range of 0-100%
sal_uInt16 nPercent = sal::static_int_cast< sal_uInt16 >(
::std::min(
((nValue*100) / ::std::max(nRange,(sal_Int32)1)), (sal_Int32)100));
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 6a3c096..0a55132 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -146,8 +146,8 @@ public:
// color space conversion tools
// the range for h/s/b is:
// Hue: 0-360 degree
- // Saturation: 0-100 %
- // Brightness: 0-100 %
+ // Saturation: 0-100%
+ // Brightness: 0-100%
static ColorData HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri );
void RGBtoHSB( sal_uInt16& nHue, sal_uInt16& nSat, sal_uInt16& nBri ) const;
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 939e590..0a5dc23 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -94,7 +94,7 @@ published service GraphicObjectShape
/** If this property is set, the transparency value of this graphic shape is
adjusted by the given unsigned percent value.
- 100% is fully transparent, 0 % is fully opaque.
+ 100% is fully transparent, 0% is fully opaque.
*/
[property] short Transparency;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 87011f0..7958920 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1457,7 +1457,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
InitItems();
CalcOutputFactor();
if ( bRet && (bSetColWidths || bSetRowHeights) )
- { // Adjust column width/row height; base 100 % zoom
+ { // Adjust column width/row height; base 100% zoom
Fraction aZoom( 1, 1 );
double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom / GetOutputFactor(); // Factor is printer display ratio
double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index a2030da..2f76e43 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2810,7 +2810,7 @@ void ScPrintFunc::CalcZoom( sal_uInt16 nRangeNo ) // calcu
if (bFitsPage)
{
if (nZoom == 100)
- // If it fits at 100 %, it's good enough for me.
+ // If it fits at 100%, it's good enough for me.
break;
nLastFitZoom = nZoom;
@@ -2869,7 +2869,7 @@ void ScPrintFunc::CalcZoom( sal_uInt16 nRangeNo ) // calcu
if (bFitsPage)
{
if (nZoom == 100)
- // If it fits at 100 %, it's good enough for me.
+ // If it fits at 100%, it's good enough for me.
break;
nLastFitZoom = nZoom;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 44463bc..a022d2d 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2505,7 +2505,7 @@ bool ImpSvNumberInputScan::ScanEndString( const OUString& rString,
}
}
- if ( SkipChar('%', rString, nPos) ) // 1 %
+ if ( SkipChar('%', rString, nPos) ) // 1%
{
if (eScannedType != NUMBERFORMAT_UNDEFINED) // already another type
{
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 00e87f5..347c79c 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2680,7 +2680,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcFocusRect( SvxIconChoiceCtrlEntry* pEntry
aTextRect.Bottom() + 1);
}
-// the hot spot is the inner 50 % of the rectangle
+// the hot spot is the inner 50% of the rectangle
static Rectangle GetHotSpot( const Rectangle& rRect )
{
Rectangle aResult( rRect );
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 92bc234..40e3a58 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1521,8 +1521,8 @@ long SwScriptInfo::Compress( sal_Int32* pKernArray, sal_Int32 nIdx, sal_Int32 nL
sal_uInt16 nCompCount = CountCompChg();
// In asian typography, there are full width and half width characters.
- // Full width punctuation characters can be compressed by 50 %
- // to determine this, we compare the font width with 75 % of its height
+ // Full width punctuation characters can be compressed by 50%
+ // to determine this, we compare the font width with 75% of its height
sal_uInt16 nMinWidth = ( 3 * nFontHeight ) / 4;
sal_uInt16 nCompIdx = HasKana( nIdx, nLen );
diff --git a/sw/source/core/uibase/frmdlg/colmgr.cxx b/sw/source/core/uibase/frmdlg/colmgr.cxx
index 8ea5563..be10043 100644
--- a/sw/source/core/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/core/uibase/frmdlg/colmgr.cxx
@@ -88,7 +88,7 @@ short SwColMgr::GetLineHeightPercent() const
void SwColMgr::SetLineHeightPercent(short nPercent)
{
- OSL_ENSURE(nPercent <= 100, "line height may be at most 100 %");
+ OSL_ENSURE(nPercent <= 100, "line height may be at most 100%");
aFmtCol.SetLineHeight((sal_uInt8)nPercent);
}
commit e8288b8857928cb54077608ca5907c966bfd490f
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon May 5 22:15:19 2014 +0200
Related: #i56998# english doesn't put a space between numbers and percent
Also put a missing space before MAX
Change-Id: Ie2def48ec66d4de91bd16c39ed821c4028b6d1c6
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 4fa92d8..0e6dfb7 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -6060,7 +6060,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The type of the quartile (1 = 25%, 2 = 50 %, 3 = 75 %)." ;
+ Text [ en-US ] = "The type of the quartile (1 = 25%, 2 = 50%, 3 = 75%)." ;
};
};
// -=*# Resource for function QUARTILE.INC #*=-
@@ -6092,7 +6092,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 5 // Description of Parameter 2
{
- Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50 %, 3 = 75 %, 4 =MAX)." ;
+ Text [ en-US ] = "The type of the quartile (0 = MIN, 1 = 25%, 2 = 50%, 3 = 75%, 4 = MAX)." ;
};
};
// -=*# Resource for function KGRÖSSTE #*=-
More information about the Libreoffice-commits
mailing list