summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/editeng/numitem.hxx1
-rw-r--r--editeng/source/items/numitem.cxx10
-rw-r--r--editeng/source/outliner/outlvw.cxx34
3 files changed, 29 insertions, 16 deletions
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 9ce86427743c..99507b8dddab 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -182,6 +182,7 @@ public:
// <--
SvxNumberFormat(const SvxNumberFormat& rFormat);
SvxNumberFormat(SvStream &rStream);
+
virtual ~SvxNumberFormat();
SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 5c6191d320a2..dc1113ada05a 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -1174,6 +1174,11 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
{
}
+SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
+{
+ return SfxPoolItem::Create(s, n );
+}
+
/* -----------------27.10.98 10:41-------------------
*
* --------------------------------------------------*/
@@ -1207,11 +1212,6 @@ SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
/* -----------------08.12.98 10:43-------------------
*
* --------------------------------------------------*/
-SfxPoolItem* SvxNumBulletItem::Create(SvStream &rStream, USHORT) const
-{
- SvxNumRule aRule(rStream);
- return new SvxNumBulletItem(aRule, Which() );
-}
USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
{
return NUMITEM_VERSION_03;
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 4142c2c8040d..6ac4c3e35e1a 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -363,6 +363,18 @@ BOOL __EXPORT OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
aDDStartPosRef=pEditView->GetWindow()->PixelToLogic( aDDStartPosPix,pOwner->GetRefMapMode());
return TRUE;
}
+
+ // special case for outliner view in impress, check if double click hits the page icon for toggle
+ if( (nPara == EE_PARA_NOT_FOUND) && (pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW) && (eTarget == MouseText) && (rMEvt.GetClicks() == 2) )
+ {
+ ESelection aSel( pEditView->GetSelection() );
+ nPara = aSel.nStartPara;
+ Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+ if( (pPara && pOwner->pParaList->HasChilds(pPara)) && pPara->HasFlag(PARAFLAG_ISPAGE) )
+ {
+ ImpToggleExpand( pPara );
+ }
+ }
return pEditView->MouseButtonDown( rMEvt );
}
@@ -1650,14 +1662,14 @@ USHORT OutlinerView::GetSelectedScriptType() const
return pEditView->GetSelectedScriptType();
}
-String OutlinerView::GetSurroundingText() const
-{
- DBG_CHKTHIS(OutlinerView,0);
- return pEditView->GetSurroundingText();
-}
-
-Selection OutlinerView::GetSurroundingTextSelection() const
-{
- DBG_CHKTHIS(OutlinerView,0);
- return pEditView->GetSurroundingTextSelection();
-}
+String OutlinerView::GetSurroundingText() const
+{
+ DBG_CHKTHIS(OutlinerView,0);
+ return pEditView->GetSurroundingText();
+}
+
+Selection OutlinerView::GetSurroundingTextSelection() const
+{
+ DBG_CHKTHIS(OutlinerView,0);
+ return pEditView->GetSurroundingTextSelection();
+}