4b61839a47
2008/06/19 10:50:49 od 1.16.88.2: RESYNC: (1.16-1.18); FILE MERGED 2008/06/09 07:30:23 od 1.16.88.1: #i89178# usage of <numfunc::GetDefaultPositionAndSpaceMode()> on creation of list style
254 lines
9.5 KiB
C++
254 lines
9.5 KiB
C++
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2008 by Sun Microsystems, Inc.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* $RCSfile: txtnum.cxx,v $
|
|
* $Revision: 1.19 $
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_sw.hxx"
|
|
|
|
|
|
#include <hintids.hxx>
|
|
#ifndef _MSGBOX_HXX //autogen
|
|
#include <vcl/msgbox.hxx>
|
|
#endif
|
|
#include <sfx2/request.hxx>
|
|
#include <svtools/eitem.hxx>
|
|
#include <svtools/stritem.hxx>
|
|
#include <svx/numitem.hxx>
|
|
#include <svx/brshitem.hxx>
|
|
#include <numrule.hxx>
|
|
|
|
#include "cmdid.h"
|
|
#include "wrtsh.hxx"
|
|
#include "view.hxx"
|
|
#include "viewopt.hxx"
|
|
#include "wdocsh.hxx"
|
|
#include "textsh.hxx"
|
|
#include "uiitems.hxx"
|
|
#include "swabstdlg.hxx"
|
|
#include <globals.hrc>
|
|
#include <sfx2/tabdlg.hxx>
|
|
|
|
void SwTextShell::ExecEnterNum(SfxRequest &rReq)
|
|
{
|
|
//wg. Aufzeichnung schon vor dem evtl. Shellwechsel
|
|
switch(rReq.GetSlot())
|
|
{
|
|
case FN_NUM_NUMBERING_ON:
|
|
{
|
|
SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False );
|
|
BOOL bMode = !GetShell().HasNumber(); // #i29560#
|
|
if ( pItem )
|
|
bMode = pItem->GetValue();
|
|
else
|
|
rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
|
|
|
|
if ( bMode != (GetShell().HasNumber()) ) // #i29560#
|
|
{
|
|
rReq.Done();
|
|
if( bMode )
|
|
GetShell().NumOn();
|
|
else
|
|
GetShell().NumOrBulletOff(); // #i29560#
|
|
}
|
|
}
|
|
break;
|
|
case FN_NUM_BULLET_ON:
|
|
{
|
|
SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False );
|
|
BOOL bMode = !GetShell().HasBullet(); // #i29560#
|
|
if ( pItem )
|
|
bMode = pItem->GetValue();
|
|
else
|
|
rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
|
|
|
|
if ( bMode != (GetShell().HasBullet()) ) // #i29560#
|
|
{
|
|
rReq.Done();
|
|
if( bMode )
|
|
GetShell().BulletOn();
|
|
else
|
|
GetShell().NumOrBulletOff(); // #i29560#
|
|
}
|
|
}
|
|
break;
|
|
case FN_NUMBER_BULLETS:
|
|
{
|
|
// --> OD 2008-02-29 #refactorlists#
|
|
// // per default TRUE, damit die Schleife im Dialog richtig arbeitet!
|
|
// BOOL bHasChild = TRUE;
|
|
// <--
|
|
SfxItemSet aSet(GetPool(),
|
|
SID_HTML_MODE, SID_HTML_MODE,
|
|
SID_ATTR_NUMBERING_RULE, SID_PARAM_CUR_NUM_LEVEL,
|
|
0 );
|
|
SwDocShell* pDocSh = GetView().GetDocShell();
|
|
BOOL bHtml = 0 != PTR_CAST(SwWebDocShell, pDocSh);
|
|
const SwNumRule* pCurRule = GetShell().GetCurNumRule();
|
|
if( pCurRule )
|
|
{
|
|
SvxNumRule aRule = pCurRule->MakeSvxNumRule();
|
|
|
|
//convert type of linked bitmaps from SVX_NUM_BITMAP to (SVX_NUM_BITMAP|LINK_TOKEN)
|
|
for(USHORT i = 0; i < aRule.GetLevelCount(); i++)
|
|
{
|
|
SvxNumberFormat aFmt(aRule.GetLevel(i));
|
|
if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
|
|
{
|
|
const SvxBrushItem* pBrush = aFmt.GetBrush();
|
|
const String* pLinkStr;
|
|
if(pBrush &&
|
|
0 != (pLinkStr = pBrush->GetGraphicLink()) &&
|
|
pLinkStr->Len())
|
|
aFmt.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
|
|
aRule.SetLevel(i, aFmt, aRule.Get(i) != 0);
|
|
}
|
|
}
|
|
if(bHtml)
|
|
aRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, FALSE);
|
|
|
|
aSet.Put(SvxNumBulletItem(aRule));
|
|
// --> OD 2008-02-29 #refactorlists# - removed <bHasChild>
|
|
ASSERT( GetShell().GetNumLevel() < MAXLEVEL,
|
|
"<SwTextShell::ExecEnterNum()> - numbered node without valid list level. Serious defect -> please inform OD." );
|
|
USHORT nLevel = GetShell().GetNumLevel();
|
|
// <--
|
|
if( nLevel < MAXLEVEL )
|
|
{
|
|
nLevel = 1<<nLevel;
|
|
aSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, nLevel ));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// --> OD 2008-02-11 #newlistlevelattrs#
|
|
SwNumRule aRule( GetShell().GetUniqueNumRuleName(),
|
|
// --> OD 2008-06-06 #i89178#
|
|
numfunc::GetDefaultPositionAndSpaceMode() );
|
|
// <--
|
|
// <--
|
|
SvxNumRule aSvxRule = aRule.MakeSvxNumRule();
|
|
const bool bRightToLeft = GetShell().IsInRightToLeftText( 0 );
|
|
|
|
if( bHtml || bRightToLeft )
|
|
{
|
|
for( BYTE n = 0; n < MAXLEVEL; ++n )
|
|
{
|
|
SvxNumberFormat aFmt( aSvxRule.GetLevel( n ) );
|
|
if ( n && bHtml )
|
|
{
|
|
// 1/2" fuer HTML
|
|
aFmt.SetLSpace(720);
|
|
aFmt.SetAbsLSpace(n * 720);
|
|
}
|
|
// --> FME 2005-01-21 #i38904# Default alignment for
|
|
// numbering/bullet should be rtl in rtl paragraph:
|
|
if ( bRightToLeft )
|
|
{
|
|
aFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
|
|
}
|
|
// <--
|
|
aSvxRule.SetLevel( n, aFmt, FALSE );
|
|
}
|
|
aSvxRule.SetFeatureFlag(NUM_ENABLE_EMBEDDED_BMP, FALSE);
|
|
}
|
|
aSet.Put(SvxNumBulletItem(aSvxRule));
|
|
}
|
|
|
|
aSet.Put( SfxBoolItem( SID_PARAM_NUM_PRESET,FALSE ));
|
|
|
|
// vor dem Dialog wird der HtmlMode an der DocShell versenkt
|
|
pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh)));
|
|
|
|
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
|
|
DBG_ASSERT(pFact, "Dialogdiet fail!");
|
|
SfxAbstractTabDialog* pDlg = pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET,
|
|
GetView().GetWindow(), &aSet, GetShell());
|
|
DBG_ASSERT(pDlg, "Dialogdiet fail!");
|
|
USHORT nRet = pDlg->Execute();
|
|
const SfxPoolItem* pItem;
|
|
if( RET_OK == nRet )
|
|
{
|
|
if( SFX_ITEM_SET == pDlg->GetOutputItemSet()->GetItemState( SID_ATTR_NUMBERING_RULE, FALSE, &pItem ))
|
|
{
|
|
rReq.AppendItem(*pItem);
|
|
rReq.Done();
|
|
SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule();
|
|
pSetRule->UnLinkGraphics();
|
|
// --> OD 2008-02-11 #newlistlevelattrs#
|
|
SwNumRule aSetRule( pCurRule
|
|
? pCurRule->GetName()
|
|
: GetShell().GetUniqueNumRuleName(),
|
|
// --> OD 2008-06-06 #i89178#
|
|
numfunc::GetDefaultPositionAndSpaceMode() );
|
|
// <--
|
|
// <--
|
|
aSetRule.SetSvxRule( *pSetRule, GetShell().GetDoc());
|
|
aSetRule.SetAutoRule( TRUE );
|
|
// --> OD 2008-03-17 #refactorlists#
|
|
// No start of new list, if an existing list style is edited.
|
|
// Otherwise start a new list.
|
|
const bool bCreateList = (pCurRule == 0);
|
|
GetShell().SetCurNumRule( aSetRule, bCreateList );
|
|
// <--
|
|
}
|
|
// wenn der Dialog mit OK verlassen wurde, aber nichts ausgewaehlt
|
|
// wurde dann muss die Numerierung zumindest eingeschaltet werden,
|
|
// wenn sie das noch nicht ist
|
|
else if( !pCurRule && SFX_ITEM_SET == aSet.GetItemState( SID_ATTR_NUMBERING_RULE, FALSE, &pItem ))
|
|
{
|
|
rReq.AppendItem( *pItem );
|
|
rReq.Done();
|
|
SvxNumRule* pSetRule = ((SvxNumBulletItem*)pItem)->GetNumRule();
|
|
// --> OD 2008-02-11 #newlistlevelattrs#
|
|
SwNumRule aSetRule( GetShell().GetUniqueNumRuleName(),
|
|
// --> OD 2008-06-06 #i89178#
|
|
numfunc::GetDefaultPositionAndSpaceMode() );
|
|
// <--
|
|
// <--
|
|
aSetRule.SetSvxRule(*pSetRule, GetShell().GetDoc());
|
|
aSetRule.SetAutoRule( TRUE );
|
|
// --> OD 2008-03-17 #refactorlists#
|
|
// start new list
|
|
GetShell().SetCurNumRule( aSetRule, true );
|
|
// <--
|
|
}
|
|
}
|
|
else if(RET_USER == nRet)
|
|
GetShell().DelNumRules();
|
|
|
|
delete pDlg;
|
|
}
|
|
break;
|
|
default:
|
|
ASSERT(FALSE, falscher Dispatcher);
|
|
return;
|
|
}
|
|
}
|
|
|
|
|