[Libreoffice-commits] core.git: 2 commits - starmath/source svx/source sw/source
Caolán McNamara
caolanm at redhat.com
Wed Sep 4 03:06:32 PDT 2013
starmath/source/ElementsDockingWindow.cxx | 6 +++---
starmath/source/document.cxx | 8 ++++----
starmath/source/node.cxx | 2 +-
starmath/source/parse.cxx | 2 +-
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 2 +-
sw/source/core/layout/paintfrm.cxx | 14 +++++++-------
6 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 77eeece2e744df7f2290ba2738cee95ef367133a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 4 11:04:51 2013 +0100
c++11 and c++03 have different enum namespacing behaviour
Change-Id: I899d1ad9e26feb7fcf83c137e4e68628cfdceec8
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index afba1d64..9209f7f 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2018,18 +2018,18 @@ void DrawGraphic( const SvxBrushItem *pBrush,
Default,
Transparent,
Gradient
- } eDrawStyle = DrawStyle::Default;
+ } eDrawStyle = Default;
// Gradient and transparency are mutually exclusive (need to check gradient first)
if (pFillStyleItem && pFillStyleItem->GetValue() == XFILL_GRADIENT && pFillGradientItem)
{
- eDrawStyle = DrawStyle::Gradient;
+ eDrawStyle = Gradient;
}
else if (bConsiderBackgroundTransparency &&
( ( aColor.GetTransparency() != 0) ||
bTransparentGrfWithNoFillBackgrd ) )
{
- eDrawStyle = DrawStyle::Transparent;
+ eDrawStyle = Transparent;
}
// #i75614# reset draw mode in high contrast mode in order to get fill color set
@@ -2045,7 +2045,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// the fill color for the output device.
switch (eDrawStyle)
{
- case DrawStyle::Transparent:
+ case Transparent:
{
if( pOutDev->GetFillColor() != aColor.GetRGBColor() )
pOutDev->SetFillColor( aColor.GetRGBColor() );
@@ -2066,7 +2066,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
/// OD 02.09.2002 #99657#
switch (eDrawStyle)
{
- case DrawStyle::Transparent:
+ case Transparent:
{
/// background region have to be drawn transparent.
/// Thus, create a poly-polygon from the region and draw it with
@@ -2103,12 +2103,12 @@ void DrawGraphic( const SvxBrushItem *pBrush,
break;
}
- case DrawStyle::Gradient:
+ case Gradient:
{
pOutDev->DrawGradient(rOut.SVRect(), pFillGradientItem->GetGradientValue().VclGradient());
break;
}
- case DrawStyle::Default:
+ case Default:
default:
{
SwRegionRects aRegion( rOut, 4 );
commit e4b2e9fa7822b5ccc25435101059d0f3ddae08d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 4 10:41:41 2013 +0100
remove intermediate Strings on res loading
Change-Id: I5ae2f445bb2c0e3fa3dd42f972dae54dfee42cc8
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index 2d01c2d..b90f4fa 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -509,7 +509,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
for (sal_uInt16 i = 0; i < sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
{
- maElementListBox.InsertEntry(OUString(SmResId(aCategories[i])));
+ maElementListBox.InsertEntry(SM_RESSTR(aCategories[i]));
}
maElementListBox.SetSelectHdl(LINK(this, SmElementsDockingWindow, ElementSelectedHandle));
@@ -520,7 +520,7 @@ SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, Sf
maElementsControl.SetTextColor( Color( COL_BLACK ) );
maElementsControl.SetSelectHdl(LINK(this, SmElementsDockingWindow, SelectClickHdl));
- maElementListBox.SelectEntry(OUString(SmResId(RID_CATEGORY_UNARY_BINARY_OPERATORS)));
+ maElementListBox.SelectEntry(SM_RESSTR(RID_CATEGORY_UNARY_BINARY_OPERATORS));
maElementsControl.setElementSetId(RID_CATEGORY_UNARY_BINARY_OPERATORS);
FreeResource();
@@ -555,7 +555,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox*, pList)
for (sal_uInt16 i = 0; i < sizeof(aCategories) / sizeof(sal_uInt16) ; i++)
{
sal_uInt16 aCurrentCategory = aCategories[i];
- OUString aCurrentCategoryString = OUString(SmResId(aCurrentCategory));
+ OUString aCurrentCategoryString = SM_RESSTR(aCurrentCategory);
if (aCurrentCategoryString == pList->GetSelectEntry())
{
maElementsControl.setElementSetId(aCurrentCategory);
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index c33c0d5..5d1fde8 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1406,15 +1406,15 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
{
*pClassName = SvGlobalName(SO3_SM_CLASSID_60);
*pFormat = SOT_FORMATSTR_ID_STARMATH_60;
- *pFullTypeName = OUString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
- *pShortTypeName = OUString(SmResId(RID_DOCUMENTSTR));
+ *pFullTypeName = SM_RESSTR(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
+ *pShortTypeName = SM_RESSTR(RID_DOCUMENTSTR);
}
else if (nFileFormat == SOFFICE_FILEFORMAT_8 )
{
*pClassName = SvGlobalName(SO3_SM_CLASSID_60);
*pFormat = bTemplate ? SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE : SOT_FORMATSTR_ID_STARMATH_8;
- *pFullTypeName = OUString(SmResId(STR_MATH_DOCUMENT_FULLTYPE_CURRENT));
- *pShortTypeName = OUString(SmResId(RID_DOCUMENTSTR));
+ *pFullTypeName = SM_RESSTR(STR_MATH_DOCUMENT_FULLTYPE_CURRENT);
+ *pShortTypeName = SM_RESSTR(RID_DOCUMENTSTR);
}
}
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index edf32af..87ad75d 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2873,7 +2873,7 @@ static bool lcl_IsFromGreekSymbolSet( const OUString &rTokenText )
bool bRes = false;
// valid symbol name needs to have a '%' at pos 0 and at least an additonal char
- if (rTokenText.getLength() > 2 && rTokenText.getStr()[0] == (sal_Unicode)'%')
+ if (rTokenText.getLength() > 2 && rTokenText[0] == (sal_Unicode)'%')
{
OUString aName( rTokenText.copy(1) );
SmSym *pSymbol = SM_MOD()->GetSymbolManager().GetSymbolByName( aName );
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 8cdd5d7..bbc6377 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2531,7 +2531,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode)
pErrDesc->Type = Type;
pErrDesc->pNode = pNode;
- pErrDesc->Text = String(SmResId(RID_ERR_IDENT));
+ pErrDesc->Text = SM_RESSTR(RID_ERR_IDENT);
sal_uInt16 nRID;
switch (Type)
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 88d79be..a108cc7 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -97,7 +97,7 @@ namespace accessibility
// SvxTextForwarder
sal_Int32 GetParagraphCount() const { return 1; }
sal_uInt16 GetTextLen( sal_Int32 /*nParagraph*/ ) const { return 0; }
- OUString GetText( const ESelection& /*rSel*/ ) const { return String(); }
+ OUString GetText( const ESelection& /*rSel*/ ) const { return OUString(); }
SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
{
// AW: Very dangerous: The former implementation used a SfxItemPool created on the
More information about the Libreoffice-commits
mailing list