include/svx/svdotable.hxx | 2 +-
include/svx/svdotext.hxx | 2 +-
sd/source/ui/animations/CustomAnimationDialog.cxx | 1 +
svx/source/svdraw/svdotext.cxx | 3 +--
svx/source/table/svdotable.cxx | 14 ++------------
svx/source/unodraw/unoshtxt.cxx | 2 +-
6 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit 98d311c651347a49f73e8e316be30887e5a99751
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 13 20:54:50 2014 +0000
limit width of list whose text can grow to silly widths
Change-Id: I982602e829bbf3f2efccfcafae67d22df8daa2e9
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1da5de8..2e0272f 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1595,6 +1595,7 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar
get(mpRBClickSequence, "rb_click_sequence" );
get(mpRBInteractive, "rb_interactive" );
get(mpLBTrigger, "trigger_list");
+ mpLBTrigger->set_width_request(approximate_char_width() * 40);
fillRepeatComboBox( mpCBRepeat );
fillDurationComboBox( mpCBDuration );
commit c376ecbc9614ccaa4f4392c287d0d1c731c3aa77
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Nov 13 14:12:00 2014 +0000
Realy->Really
that's really bugging me
Change-Id: Id15bd4dc42748b3cb24eb891741195499c5df9c3
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 2594a35..df738c2 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -178,7 +178,7 @@ public:
bool IsTextEditActive( const sdr::table::CellPos& rPos );
/** returns true only if we are in edit mode and the user actually changed
anything */
- virtual bool IsRealyEdited() const SAL_OVERRIDE;
+ virtual bool IsReallyEdited() const SAL_OVERRIDE;
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index c7a5850..ef8e0f1 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -363,7 +363,7 @@ public:
virtual sal_Int32 getTextCount() const SAL_OVERRIDE;
/** returns true only if we are in edit mode and the user actually changed
anything */
- virtual bool IsRealyEdited() const;
+ virtual bool IsReallyEdited() const;
/** changes the current active text */
virtual void setActiveText( sal_Int32 nIndex );
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4ef80f6..d15e642 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1759,12 +1759,11 @@ void SdrTextObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix& rMatrix, const b
}
}
-bool SdrTextObj::IsRealyEdited() const
+bool SdrTextObj::IsReallyEdited() const
{
return pEdtOutl && pEdtOutl->IsModified();
}
-
// moved inlines here form hxx
long SdrTextObj::GetEckenradius() const
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 9617904..ce05325 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -693,7 +693,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool
bFitWidth, bool bFitHe
// Optimization: SdrTableObj::SetChanged() can call this very often,
repeatedly
// with the same settings, noticeably increasing load time. Skip if
already done.
bool bInteractiveMightGrowBecauseTextChanged =
- mpTableObj->IsRealyEdited() && (mpTableObj->IsAutoGrowHeight() ||
mpTableObj->IsAutoGrowHeight());
+ mpTableObj->IsReallyEdited() && (mpTableObj->IsAutoGrowHeight() ||
mpTableObj->IsAutoGrowHeight());
WritingMode writingMode = mpTableObj->GetWritingMode();
if( bInteractiveMightGrowBecauseTextChanged
|| lastLayoutTable != this || lastLayoutInputRectangle != rArea
@@ -2097,8 +2097,6 @@ bool
SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2D
return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon );
}
-
-
// sets the base geometry of the object using infos contained in the homogen
3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The
Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the
matrix.
@@ -2107,22 +2105,16 @@ void SdrTableObj::TRSetBaseGeometry(const
basegfx::B2DHomMatrix& rMatrix, const
SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon );
}
-
-
-bool SdrTableObj::IsRealyEdited() const
+bool SdrTableObj::IsReallyEdited() const
{
return pEdtOutl && pEdtOutl->IsModified();
}
-
-
bool SdrTableObj::IsFontwork() const
{
return false;
}
-
-
sal_uInt32 SdrTableObj::GetHdlCount() const
{
sal_uInt32 nCount = SdrTextObj::GetHdlCount();
@@ -2135,8 +2127,6 @@ sal_uInt32 SdrTableObj::GetHdlCount() const
return nCount;
}
-
-
void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
{
const sal_Int32 nRowCount = mpImpl->getRowCount();
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 0c164ab..07e5168 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -643,7 +643,7 @@ SvxTextForwarder*
SvxTextEditSourceImpl::GetBackgroundTextForwarder()
mpOutliner->SetText( *pOutlinerParaObject );
// #91254# put text to object and set EmptyPresObj to FALSE
- if( mpText && bOwnParaObj && pOutlinerParaObject &&
mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
+ if( mpText && bOwnParaObj && pOutlinerParaObject &&
mpObject->IsEmptyPresObj() && pTextObj->IsReallyEdited() )
{
mpObject->SetEmptyPresObj( false );
static_cast< SdrTextObj* >(
mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
