[Libreoffice-commits] core.git: sd/source vcl/win
Thomas Arnhold
thomas at arnhold.org
Mon Mar 11 14:52:24 PDT 2013
sd/source/core/sdpage.cxx | 4 ++--
sd/source/core/sdpage2.cxx | 6 +++---
sd/source/core/stlpool.cxx | 4 ++--
sd/source/core/stlsheet.cxx | 2 +-
sd/source/filter/eppt/pptx-text.cxx | 2 +-
sd/source/ui/dlg/dlgsnap.cxx | 2 +-
sd/source/ui/dlg/navigatr.cxx | 2 +-
sd/source/ui/docshell/docshel2.cxx | 2 +-
sd/source/ui/func/fuconrec.cxx | 2 +-
sd/source/ui/func/fuconstr.cxx | 4 ++--
sd/source/ui/func/fuinsfil.cxx | 4 ++--
sd/source/ui/func/fuoaprms.cxx | 4 ++--
sd/source/ui/func/fuoutl.cxx | 2 +-
sd/source/ui/func/fuprlout.cxx | 2 +-
sd/source/ui/func/fuprobjs.cxx | 4 ++--
sd/source/ui/func/futempl.cxx | 2 +-
sd/source/ui/func/unprlout.cxx | 2 +-
sd/source/ui/unoidl/unopage.cxx | 4 ++--
sd/source/ui/view/drviews6.cxx | 2 +-
sd/source/ui/view/drviewsc.cxx | 2 +-
sd/source/ui/view/outlview.cxx | 2 +-
sd/source/ui/view/sdruler.cxx | 2 +-
sd/source/ui/view/sdwindow.cxx | 4 ++--
sd/source/ui/view/unmodpg.cxx | 2 +-
vcl/win/source/gdi/salgdi3.cxx | 2 +-
25 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 0af31660ea3c0ae3e9566c88d707e82e93dbb4af
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Mar 11 22:51:42 2013 +0100
sd: translate debug messages
Change-Id: I8a50173babdd441c8247867fce0fdfbedaf0bc02
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index cd7d6c1..5c4337f 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -512,7 +512,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
aName += sal_Unicode( ' ' );
aName += OUString::number( nLevel );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pModel->GetStyleSheetPool()->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSheet, "Vorlage fuer Gliederungsobjekt nicht gefunden");
+ DBG_ASSERT(pSheet, "StyleSheet for outline object not found");
if (pSheet)
pSdrObj->StartListening(*pSheet);
}
@@ -2338,7 +2338,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
{
if ( pObj )
{
- DBG_ASSERT( pObj->ISA(SdrTextObj), "SetObjText: Kein SdrTextObj!" );
+ DBG_ASSERT( pObj->ISA(SdrTextObj), "SetObjText: No SdrTextObj!" );
::Outliner* pOutl = pOutliner;
if (!pOutliner)
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 8fbad2f..d620edb 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -169,11 +169,11 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
aOldFullName += OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
pSheet = pStShPool->Find(aOldFullName, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSheet, "alte Gliederungsvorlage nicht gefunden");
+ DBG_ASSERT(pSheet, "Old outline style sheet not found");
aOldOutlineStyles.push_back(pSheet);
pSheet = pStShPool->Find(aFullName, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSheet, "neue Gliederungsvorlage nicht gefunden");
+ DBG_ASSERT(pSheet, "New outline style sheet not found");
aOutlineStyles.push_back(pSheet);
if (bReplaceStyleSheets && pSheet)
@@ -267,7 +267,7 @@ void SdPage::EndListenOutlineText()
if (pOutlineTextObj)
{
SdStyleSheetPool* pSPool = (SdStyleSheetPool*)pModel->GetStyleSheetPool();
- DBG_ASSERT(pSPool, "StyleSheetPool nicht gefunden");
+ DBG_ASSERT(pSPool, "StyleSheetPool missing");
String aTrueLayoutName(maLayoutName);
aTrueLayoutName.Erase( aTrueLayoutName.SearchAscii( SD_LT_SEPARATOR ));
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 86c6915..14d2977 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -666,7 +666,7 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
if (!pSheet)
{
SfxStyleSheetBase* pSourceSheet = rSourcePool.Find(*it, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSourceSheet, "CopyLayoutSheets: Quellvorlage nicht gefunden");
+ DBG_ASSERT(pSourceSheet, "CopyLayoutSheets: Style sheet missing");
if (pSourceSheet)
{
// In the case one comes with Methusalem-Docs.
@@ -1011,7 +1011,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
{
// Subtitle template
SvxNumRule* pDefaultRule = ((SvxNumBulletItem*) rSet.GetPool()->GetSecondaryPool()->GetPoolDefaultItem(EE_PARA_NUMBULLET))->GetNumRule();
- DBG_ASSERT( pDefaultRule, "Wo ist mein Default? [CL]" );
+ DBG_ASSERT( pDefaultRule, "Where is my default template? [CL]" );
if(pDefaultRule)
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 52a60e5..6796c67 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -538,7 +538,7 @@ SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
}
pPseudoStyle = static_cast<SdStyleSheet*>(pPool->Find(aStyleName, SD_STYLE_FAMILY_PSEUDO));
- DBG_ASSERT(pPseudoStyle, "PseudoStyleSheet nicht gefunden");
+ DBG_ASSERT(pPseudoStyle, "PseudoStyleSheet missing");
return pPseudoStyle;
}
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index b344101..6e5d196 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -843,7 +843,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
( aPropName == "SymbolTextDistance" )
|| ( aPropName == "Graphic" ) ) )
{
- OSL_FAIL( "Unbekanntes Property" );
+ OSL_FAIL( "Unknown Property" );
}
#endif
}
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index b45a160..cec2cd0 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -76,7 +76,7 @@ SdSnapLineDlg::SdSnapLineDlg(
// determine PoolUnit
SfxItemPool* pPool = rInAttrs.GetPool();
- DBG_ASSERT( pPool, "Wo ist der Pool?" );
+ DBG_ASSERT( pPool, "Where's the Pool?" );
SfxMapUnit ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
// #i48497# Consider page origin
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index df0bc91..235dfb4 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -716,7 +716,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool b
return( bImage ? TBI_EMBEDDED : STR_DRAGTYPE_EMBEDDED );
case NAVIGATOR_DRAGTYPE_LINK:
return( bImage ? TBI_LINK : STR_DRAGTYPE_LINK );
- default: OSL_FAIL( "Keine Resource fuer DragType vorhanden!" );
+ default: OSL_FAIL( "No resource for DragType available!" );
}
return( 0 );
}
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index f56c4a4..0295c2b 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -299,7 +299,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe
Bitmap aPreview( aVDev.GetBitmap( aNullPt, aVDev.GetOutputSizePixel() ) );
- DBG_ASSERT(!!aPreview, "Vorschau-Bitmap konnte nicht erzeugt werden");
+ DBG_ASSERT(!!aPreview, "Preview-Bitmap could not be generated");
return aPreview;
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index c4e7afd..333d8f7 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -555,7 +555,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
SfxStyleSheet* pSheet = (SfxStyleSheet*) pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_GRAPHICS);
- DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden");
+ DBG_ASSERT(pSheet, "StyleSheet missing");
if (pSheet)
{
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index e3c9b36..3f925c8 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -389,7 +389,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
SfxStyleSheet* pSheet = (SfxStyleSheet*)pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
- DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden");
+ DBG_ASSERT(pSheet, "StyleSheet missing");
if (pSheet)
{
// applying style sheet for background objects
@@ -419,7 +419,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
SfxStyleSheet* pSheet = (SfxStyleSheet*)pPage->GetModel()->
GetStyleSheetPool()->
Find(aName, SD_STYLE_FAMILY_GRAPHICS);
- DBG_ASSERT(pSheet, "Objektvorlage nicht gefunden");
+ DBG_ASSERT(pSheet, "Stylesheet missing");
if (pSheet)
{
pObj->SetStyleSheet(pSheet, sal_False);
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index be19126..2b1a0f7 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -459,7 +459,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
pOutliner->SetPaperSize(pPage->GetSize());
SvStream* pStream = pMedium->GetInStream();
- DBG_ASSERT( pStream, "Kein InStream!" );
+ DBG_ASSERT( pStream, "No InStream!" );
pStream->Seek( 0 );
sal_uLong nErr = pOutliner->Read( *pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes() );
@@ -608,7 +608,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
pOutliner->SetPaperSize(Size(0x7fffffff, 0x7fffffff));
SvStream* pStream = pMedium->GetInStream();
- DBG_ASSERT( pStream, "Kein InStream!" );
+ DBG_ASSERT( pStream, "No InStream!" );
pStream->Seek( 0 );
sal_uLong nErr = pOutliner->Read(*pStream, pMedium->GetBaseURL(), nFormat, mpDocSh->GetHeaderAttributes());
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index eb750f0..4552f15 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -640,7 +640,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
SdrPathObj* pPath = NULL;
if (eEffect == presentation::AnimationEffect_PATH && nEffectSet == ATTR_SET)
{
- DBG_ASSERT(nCount == 2, "dieser Effekt braucht genau 2 selektierte Objekte");
+ DBG_ASSERT(nCount == 2, "This effect expects two selected objects");
SdrObject* pObject1 = rMarkList.GetMark(0)->GetMarkedSdrObj();
SdrObject* pObject2 = rMarkList.GetMark(1)->GetMarkedSdrObj();
SdrObjKind eKind1 = (SdrObjKind)pObject1->GetObjIdentifier();
@@ -664,7 +664,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pRunningObj = pObject1;
}
- DBG_ASSERT(pPath, "keine Kurve gefunden");
+ DBG_ASSERT(pPath, "no curve found");
// das laufende Objekt auf das Kurvenende schieben
diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx
index a02bf5f..8ff096f 100644
--- a/sd/source/ui/func/fuoutl.cxx
+++ b/sd/source/ui/func/fuoutl.cxx
@@ -58,7 +58,7 @@ sal_Bool FuOutline::Command(const CommandEvent& rCEvt)
OutlinerView* pOlView =
static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow);
- DBG_ASSERT (pOlView, "keine OutlinerView gefunden");
+ DBG_ASSERT (pOlView, "no OutlineView found");
if (pOlView)
{
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 2d94c35..44e0b54 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -106,7 +106,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
}
}
- DBG_ASSERT(nSelectedPage != SDRPAGE_NOTFOUND, "keine selektierte Seite");
+ DBG_ASSERT(nSelectedPage != SDRPAGE_NOTFOUND, "no selected page");
SdPage* pSelectedPage = mpDoc->GetSdPage(nSelectedPage, PK_STANDARD);
String aOldPageLayoutName(pSelectedPage->GetLayoutName());
String aOldLayoutName(aOldPageLayoutName);
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index f38b91f..4bbe51d 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -81,7 +81,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
SfxItemSet aSet(mpDoc->GetItemPool(), SID_STATUS_LAYOUT, SID_STATUS_LAYOUT);
pOutlineViewShell->GetStatusBarState( aSet );
String aLayoutName = (((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue());
- DBG_ASSERT(aLayoutName.Len(), "Layout unbestimmt");
+ DBG_ASSERT(aLayoutName.Len(), "Layout not defined");
sal_Bool bUnique = sal_False;
sal_Int16 nDepth, nTmp;
@@ -143,7 +143,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& )
SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool();
SfxStyleSheetBase* pStyleSheet = pStyleSheetPool->Find( aStyleName, SD_STYLE_FAMILY_MASTERPAGE );
- DBG_ASSERT(pStyleSheet, "StyleSheet nicht gefunden");
+ DBG_ASSERT(pStyleSheet, "StyleSheet missing");
if( pStyleSheet )
{
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 087d20e..2f53d30 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -375,7 +375,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
else
{
- OSL_FAIL("Vorlage aus aelterer anderssprachiger Version");
+ OSL_FAIL("StyleSheet from older version with different language");
bOldDocInOtherLanguage = sal_True;
}
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index cf75562..4cb0840 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -51,7 +51,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction(
eNewAutoLayout = eTheNewAutoLayout;
bSetAutoLayout = bSet;
- DBG_ASSERT(pThePage, "keine Page gesetzt!");
+ DBG_ASSERT(pThePage, "No Page set!");
pPage = pThePage;
aComment = String(SdResId(STR_UNDO_SET_PRESLAYOUT));
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index e769a1b..d1eac4a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1,4 +1,4 @@
- /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -1542,7 +1542,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc
throwIfDisposed();
- DBG_ASSERT(SvxFmDrawPage::mpPage,"SdrPage ist NULL! [CL]");
+ DBG_ASSERT(SvxFmDrawPage::mpPage,"SdrPage is NULL! [CL]");
DBG_ASSERT(mpView, "SdrView ist NULL! [CL]");
Reference< drawing::XShape > xShape;
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 13b0b6a..0ab058b 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -711,7 +711,7 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
default:
{
- DBG_ASSERT( 0, "Slot ohne Funktion" );
+ DBG_ASSERT( 0, "Slot without function" );
Cancel();
rReq.Ignore ();
}
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index e4f1be1..6ccbb96 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -919,7 +919,7 @@ sal_uInt16 DrawViewShell::GetArrayId( sal_uInt16 nSId )
if( mpSlotArray[ i ] == nSId )
return( i );
}
- OSL_FAIL( "Slot im Array nicht gefunden!" );
+ OSL_FAIL( "Slot in array not found!" );
return( USHRT_MAX );
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 50d91c1..8d5f9f3 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -988,7 +988,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner )
else
nPos = 0xffff;
- DBG_ASSERT(nPos != 0xffff, "Absatz nicht gefunden");
+ DBG_ASSERT(nPos != 0xffff, "Paragraph not found");
}
mrDoc.MovePages(nPos);
diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx
index 82aa10c..52331c3 100644
--- a/sd/source/ui/view/sdruler.cxx
+++ b/sd/source/ui/view/sdruler.cxx
@@ -65,7 +65,7 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt
case SID_RULER_NULL_OFFSET:
{
const SfxPointItem* pItem = dynamic_cast< const SfxPointItem* >(pState);
- DBG_ASSERT(pState ? pItem != NULL : sal_True, "SfxPointItem erwartet");
+ DBG_ASSERT(pState ? pItem != NULL : sal_True, "SfxPointItem expected");
if ( pItem )
rRuler.SetNullOffset(pItem->GetValue());
}
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 152f679..3872bb5 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -579,8 +579,8 @@ long Window::SetZoomRect (const Rectangle& rZoomRect)
Size aWinSize = PixelToLogic(GetOutputSizePixel());
// Paranoia! The degenerate case of zero width or height has been
// taken care of above.
- DBG_ASSERT(rZoomRect.GetWidth(), "ZoomRect-Breite = 0!");
- DBG_ASSERT(rZoomRect.GetHeight(), "ZoomRect-Hoehe = 0!");
+ DBG_ASSERT(rZoomRect.GetWidth(), "ZoomRect-Width = 0!");
+ DBG_ASSERT(rZoomRect.GetHeight(), "ZoomRect-Height = 0!");
// Calculate the scale factors which will lead to the given
// rectangle being fully visible (when translated accordingly) as
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 705bc27..81a3f50 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -54,7 +54,7 @@ ModifyPageUndoAction::ModifyPageUndoAction(
sal_Bool bTheNewBckgrndObjsVisible)
: SdUndoAction(pTheDoc)
{
- DBG_ASSERT(pThePage, "Undo ohne Seite ???");
+ DBG_ASSERT(pThePage, "Undo without a page???");
mpPage = pThePage;
maNewName = aTheNewName;
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index f444047..cfcf9d6 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -232,7 +232,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const String& rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const ImplDevFontAttributes& rDFA )
{
DBG_ASSERT( rFontFileName.Len() && rDFA.GetFamilyName().Len(), "ImplFontNameCache::AddFontName - invalid data!" );
- if ( rFontFileName.Len() && rDFA.GetFamilyName().getLength() )
+ if ( rFontFileName.Len() && !rDFA.GetFamilyName().isEmpty() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL( rFontFileName ), rDFA ) );
bModified = TRUE;
More information about the Libreoffice-commits
mailing list