2010-10-14 08:30:41 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2011-03-31 10:05:04 +02:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
|
|
|
*
|
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
*
|
|
|
|
* This file incorporates work covered by the following license notice:
|
|
|
|
*
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
*/
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2012-01-27 15:03:39 +01:00
|
|
|
#include "sal/config.h"
|
2006-09-16 22:11:41 +00:00
|
|
|
|
2012-06-11 13:15:18 +01:00
|
|
|
#include <comphelper/string.hxx>
|
2012-01-27 15:03:39 +01:00
|
|
|
#include <officecfg/Office/Common.hxx>
|
2000-09-18 16:15:01 +00:00
|
|
|
#include <tools/gen.hxx>
|
|
|
|
#include <sfx2/imgmgr.hxx>
|
|
|
|
#include <sfx2/viewfrm.hxx>
|
|
|
|
#include <sfx2/dispatch.hxx>
|
|
|
|
#include <svx/ruler.hxx>
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/zforlist.hxx>
|
|
|
|
#include <svl/stritem.hxx>
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
#include "swtypes.hxx"
|
|
|
|
#include "cmdid.h"
|
|
|
|
#include "swmodule.hxx"
|
|
|
|
#include "wrtsh.hxx"
|
|
|
|
#include "view.hxx"
|
|
|
|
#include "calc.hxx"
|
|
|
|
#include "inputwin.hxx"
|
|
|
|
#include "fldbas.hxx"
|
|
|
|
#include "fldmgr.hxx"
|
|
|
|
#include "frmfmt.hxx"
|
|
|
|
#include "cellatr.hxx"
|
|
|
|
#include "edtwin.hxx"
|
|
|
|
#include "helpid.h"
|
|
|
|
|
|
|
|
// nur fuers UpdateRange - Box in dem der gestackte Cursor sthet loeschen
|
|
|
|
#include "pam.hxx"
|
|
|
|
|
|
|
|
#include "swundo.hxx"
|
|
|
|
#include "ribbar.hrc"
|
|
|
|
#include "inputwin.hrc"
|
|
|
|
|
2006-08-14 16:52:31 +00:00
|
|
|
#include <IDocumentContentOperations.hxx>
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2012-06-16 14:12:33 +01:00
|
|
|
SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2001-06-11 08:18:10 +00:00
|
|
|
SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
|
2000-09-18 16:15:01 +00:00
|
|
|
: ToolBox( pParent , SW_RES( RID_TBX_FORMULA )),
|
|
|
|
aPos( this, SW_RES(ED_POS)),
|
2007-09-27 11:25:28 +00:00
|
|
|
aEdit( this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION),
|
2000-09-18 16:15:01 +00:00
|
|
|
aPopMenu( SW_RES(MN_CALC_POPUP)),
|
|
|
|
pMgr(0),
|
|
|
|
pWrtShell(0),
|
2007-09-27 11:25:28 +00:00
|
|
|
pView(0),
|
2001-06-11 08:18:10 +00:00
|
|
|
pBindings(pBind),
|
2000-09-18 16:15:01 +00:00
|
|
|
aAktTableName(aEmptyStr)
|
2010-11-25 14:31:11 +01:00
|
|
|
, m_bDoesUndo(true)
|
|
|
|
, m_bResetUndo(false)
|
|
|
|
, m_bCallUndo(false)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2011-02-07 13:06:08 +01:00
|
|
|
bFirst = sal_True;
|
|
|
|
bActive = bIsTable = bDelSel = sal_False;
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
FreeResource();
|
2001-06-11 08:18:10 +00:00
|
|
|
|
2010-07-08 19:03:59 +02:00
|
|
|
aEdit.SetSizePixel( aEdit.CalcMinimumSize() );
|
|
|
|
|
2004-11-19 14:29:53 +00:00
|
|
|
SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
|
2001-06-11 08:18:10 +00:00
|
|
|
pManager->RegisterToolBox(this);
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
pView = ::GetActiveView();
|
|
|
|
pWrtShell = pView ? pView->GetWrtShellPtr() : 0;
|
|
|
|
|
|
|
|
InsertWindow( ED_POS, &aPos, 0, 0);
|
|
|
|
InsertSeparator ( 1 );
|
|
|
|
InsertSeparator ();
|
|
|
|
InsertWindow( ED_FORMULA, &aEdit);
|
|
|
|
SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
|
|
|
|
|
2010-11-22 19:10:21 -08:00
|
|
|
SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC ));
|
|
|
|
SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL ));
|
|
|
|
SetItemImage( FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY ));
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2005-03-15 08:22:38 +00:00
|
|
|
SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY );
|
|
|
|
SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
|
|
|
|
|
2000-09-18 16:15:01 +00:00
|
|
|
Size aSizeTbx = CalcWindowSizePixel();
|
2010-08-31 18:59:45 +02:00
|
|
|
Size aEditSize = aEdit.GetSizePixel();
|
|
|
|
Rectangle aItemRect( GetItemRect(FN_FORMULA_CALC) );
|
|
|
|
long nMaxHeight = (aEditSize.Height() > aItemRect.GetHeight()) ? aEditSize.Height() : aItemRect.GetHeight();
|
|
|
|
if( nMaxHeight+2 > aSizeTbx.Height() )
|
|
|
|
aSizeTbx.Height() = nMaxHeight+2;
|
2000-09-18 16:15:01 +00:00
|
|
|
Size aSize = GetSizePixel();
|
|
|
|
aSize.Height() = aSizeTbx.Height();
|
|
|
|
SetSizePixel( aSize );
|
|
|
|
|
2010-08-31 18:59:45 +02:00
|
|
|
// align edit and item vcentered
|
|
|
|
Size aPosSize = aPos.GetSizePixel();
|
|
|
|
aPosSize.Height() = nMaxHeight;
|
|
|
|
aEditSize.Height() = nMaxHeight;
|
|
|
|
Point aPosPos = aPos.GetPosPixel();
|
|
|
|
Point aEditPos = aEdit.GetPosPixel();
|
|
|
|
aPosPos.Y() = (aSize.Height() - nMaxHeight)/2 + 1;
|
|
|
|
aEditPos.Y() = (aSize.Height() - nMaxHeight)/2 + 1;
|
2000-09-18 16:15:01 +00:00
|
|
|
aPos.SetPosSizePixel( aPosPos, aPosSize );
|
|
|
|
aEdit.SetPosSizePixel( aEditPos, aEditSize );
|
|
|
|
|
|
|
|
aPopMenu.SetSelectHdl(LINK( this, SwInputWindow, MenuHdl ));
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2010-12-12 00:08:03 +01:00
|
|
|
SwInputWindow::~SwInputWindow()
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2004-11-19 14:29:53 +00:00
|
|
|
SfxImageManager::GetImageManager( SW_MOD() )->ReleaseToolBox(this);
|
2001-06-11 08:18:10 +00:00
|
|
|
|
2000-09-18 16:15:01 +00:00
|
|
|
//Lineale aufwecken
|
|
|
|
if(pView)
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
pView->GetHLineal().SetActive( sal_True );
|
|
|
|
pView->GetVLineal().SetActive( sal_True );
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
2011-11-17 22:13:42 +04:00
|
|
|
delete pMgr;
|
2000-09-18 16:15:01 +00:00
|
|
|
if(pWrtShell)
|
|
|
|
pWrtShell->EndSelTblCells();
|
|
|
|
|
2010-11-25 14:31:11 +01:00
|
|
|
CleanupUglyHackWithUndo();
|
|
|
|
}
|
|
|
|
|
|
|
|
void SwInputWindow::CleanupUglyHackWithUndo()
|
|
|
|
{
|
|
|
|
if (m_bResetUndo)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
DelBoxCntnt();
|
2010-11-25 14:31:11 +01:00
|
|
|
pWrtShell->DoUndo(m_bDoesUndo);
|
|
|
|
if (m_bCallUndo)
|
|
|
|
{
|
2000-09-18 16:15:01 +00:00
|
|
|
pWrtShell->Undo();
|
2010-11-25 14:31:11 +01:00
|
|
|
}
|
2011-03-03 15:08:48 +01:00
|
|
|
m_bResetUndo = false; // #i117122# once is enough :)
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-25 14:31:11 +01:00
|
|
|
|
2000-09-18 16:15:01 +00:00
|
|
|
//==================================================================
|
|
|
|
|
2006-08-04 12:07:04 +00:00
|
|
|
void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
|
|
|
|
{
|
|
|
|
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
|
|
|
|
{
|
|
|
|
// update item images
|
|
|
|
SwModule *pMod = SW_MOD();
|
|
|
|
SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
|
2010-11-22 19:10:21 -08:00
|
|
|
SetItemImage( FN_FORMULA_CALC, pImgMgr->GetImage(FN_FORMULA_CALC ));
|
|
|
|
SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
|
|
|
|
SetItemImage( FN_FORMULA_APPLY, pImgMgr->GetImage(FN_FORMULA_APPLY ));
|
2006-08-04 12:07:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ToolBox::DataChanged( rDCEvt );
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2010-12-11 15:42:15 +01:00
|
|
|
void SwInputWindow::Resize()
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
ToolBox::Resize();
|
|
|
|
|
|
|
|
long nWidth = GetSizePixel().Width();
|
|
|
|
long nLeft = aEdit.GetPosPixel().X();
|
|
|
|
Size aEditSize = aEdit.GetSizePixel();
|
|
|
|
|
|
|
|
aEditSize.Width() = Max( ((long)(nWidth - nLeft - 5)), (long)0 );
|
|
|
|
aEdit.SetSizePixel( aEditSize );
|
|
|
|
aEdit.Invalidate();
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2007-09-27 11:25:28 +00:00
|
|
|
void SwInputWindow::ShowWin()
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
bIsTable = sal_False;
|
2000-09-18 16:15:01 +00:00
|
|
|
//Lineale anhalten
|
|
|
|
if(pView)
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
pView->GetHLineal().SetActive( sal_False );
|
|
|
|
pView->GetVLineal().SetActive( sal_False );
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2010-10-24 23:48:32 +02:00
|
|
|
OSL_ENSURE(pWrtShell, "no WrtShell!");
|
2000-09-18 16:15:01 +00:00
|
|
|
// Cursor in Tabelle
|
2011-01-17 15:06:54 +01:00
|
|
|
bIsTable = pWrtShell->IsCrsrInTbl() ? sal_True : sal_False;
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
if( bFirst )
|
|
|
|
pWrtShell->SelTblCells( LINK( this, SwInputWindow,
|
|
|
|
SelTblCellsNotify) );
|
|
|
|
if( bIsTable )
|
|
|
|
{
|
|
|
|
const String& rPos = pWrtShell->GetBoxNms();
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nPos = 0;
|
2000-09-18 16:15:01 +00:00
|
|
|
short nSrch = -1;
|
|
|
|
while( (nPos = rPos.Search( ':',nPos + 1 ) ) != STRING_NOTFOUND )
|
|
|
|
nSrch = (short) nPos;
|
|
|
|
aPos.SetText( rPos.Copy( ++nSrch ) );
|
|
|
|
aAktTableName = pWrtShell->GetTableFmt()->GetName();
|
|
|
|
}
|
|
|
|
else
|
2007-09-27 11:25:28 +00:00
|
|
|
aPos.SetText(SW_RESSTR(STR_TBL_FORMULA));
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
// Aktuelles Feld bearbeiten
|
2010-10-24 23:48:32 +02:00
|
|
|
OSL_ENSURE(pMgr == 0, "FieldManager not deleted");
|
2000-09-18 16:15:01 +00:00
|
|
|
pMgr = new SwFldMgr;
|
|
|
|
|
2010-11-04 01:06:10 +02:00
|
|
|
// Formel soll immer mit einem "=" beginnen, hier
|
|
|
|
// also setzen
|
2012-07-04 23:58:05 +01:00
|
|
|
String sEdit = rtl::OUString('=');
|
2000-09-18 16:15:01 +00:00
|
|
|
if( pMgr->GetCurFld() && TYP_FORMELFLD == pMgr->GetCurTypeId() )
|
|
|
|
{
|
|
|
|
sEdit += pMgr->GetCurFldPar2();
|
|
|
|
}
|
|
|
|
else if( bFirst )
|
|
|
|
{
|
|
|
|
if( bIsTable )
|
|
|
|
{
|
2010-11-25 14:31:11 +01:00
|
|
|
m_bResetUndo = true;
|
2012-01-27 15:03:39 +01:00
|
|
|
SAL_WARN_IF(
|
2012-01-31 17:25:42 +01:00
|
|
|
officecfg::Office::Common::Undo::Steps::get() <= 0,
|
2012-01-27 15:03:39 +01:00
|
|
|
"sw", "/org.openoffice.Office.Common/Undo/Steps <= 0");
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2011-02-08 11:05:35 +01:00
|
|
|
m_bDoesUndo = pWrtShell->DoesUndo();
|
|
|
|
if( !m_bDoesUndo )
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
pWrtShell->DoUndo( sal_True );
|
2011-02-08 11:05:35 +01:00
|
|
|
}
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
if( !pWrtShell->SwCrsrShell::HasSelection() )
|
|
|
|
{
|
|
|
|
pWrtShell->MoveSection( fnSectionCurr, fnSectionStart );
|
|
|
|
pWrtShell->SetMark();
|
|
|
|
pWrtShell->MoveSection( fnSectionCurr, fnSectionEnd );
|
|
|
|
}
|
|
|
|
if( pWrtShell->SwCrsrShell::HasSelection() )
|
|
|
|
{
|
|
|
|
pWrtShell->StartUndo( UNDO_DELETE );
|
|
|
|
pWrtShell->Delete();
|
|
|
|
if( 0 != pWrtShell->EndUndo( UNDO_DELETE ))
|
2010-11-25 14:31:11 +01:00
|
|
|
{
|
|
|
|
m_bCallUndo = true;
|
|
|
|
}
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
2010-11-25 14:31:11 +01:00
|
|
|
pWrtShell->DoUndo(false);
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
SfxItemSet aSet( pWrtShell->GetAttrPool(), RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
|
|
|
|
if( pWrtShell->GetTblBoxFormulaAttrs( aSet ))
|
|
|
|
sEdit += ((SwTblBoxFormula&)aSet.Get( RES_BOXATR_FORMULA )).GetFormula();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( bFirst )
|
|
|
|
{
|
|
|
|
// WrtShell Flags richtig setzen
|
|
|
|
pWrtShell->SttSelect();
|
|
|
|
pWrtShell->EndSelect();
|
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
bFirst = sal_False;
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
aEdit.SetModifyHdl( LINK( this, SwInputWindow, ModifyHdl ));
|
|
|
|
|
|
|
|
aEdit.SetText( sEdit );
|
|
|
|
aEdit.SetSelection( Selection( sEdit.Len(), sEdit.Len() ) );
|
|
|
|
sOldFml = sEdit;
|
|
|
|
|
|
|
|
aEdit.Invalidate();
|
|
|
|
aEdit.Update();
|
|
|
|
aEdit.GrabFocus();
|
|
|
|
// UserInterface fuer die Eingabe abklemmen
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
pView->GetEditWin().LockKeyInput(sal_True);
|
|
|
|
pView->GetViewFrame()->GetDispatcher()->Lock(sal_True);
|
2000-09-18 16:15:01 +00:00
|
|
|
pWrtShell->Push();
|
|
|
|
}
|
|
|
|
ToolBox::Show();
|
|
|
|
}
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
IMPL_LINK( SwInputWindow, MenuHdl, Menu *, pMenu )
|
|
|
|
{
|
2010-12-12 10:15:19 +01:00
|
|
|
static const char * const aStrArr[] = {
|
2000-09-18 16:15:01 +00:00
|
|
|
sCalc_Phd,
|
|
|
|
sCalc_Sqrt,
|
|
|
|
sCalc_Or,
|
|
|
|
sCalc_Xor,
|
|
|
|
sCalc_And,
|
|
|
|
sCalc_Not,
|
|
|
|
sCalc_Eq,
|
|
|
|
sCalc_Neq,
|
|
|
|
sCalc_Leq,
|
|
|
|
sCalc_Geq,
|
|
|
|
sCalc_L,
|
|
|
|
sCalc_G,
|
|
|
|
sCalc_Sum,
|
|
|
|
sCalc_Mean,
|
|
|
|
sCalc_Min,
|
|
|
|
sCalc_Max,
|
|
|
|
sCalc_Sin,
|
|
|
|
sCalc_Cos,
|
|
|
|
sCalc_Tan,
|
|
|
|
sCalc_Asin,
|
|
|
|
sCalc_Acos,
|
|
|
|
sCalc_Atan,
|
|
|
|
sCalc_Pow,
|
|
|
|
"|",
|
|
|
|
sCalc_Round
|
|
|
|
};
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nId = pMenu->GetCurItemId();
|
2000-09-18 16:15:01 +00:00
|
|
|
if ( nId <= MN_CALC_ROUND )
|
|
|
|
{
|
2012-07-02 16:02:38 +01:00
|
|
|
String aTmp( rtl::OUString::createFromAscii(aStrArr[nId - 1]) );
|
2000-09-18 16:15:01 +00:00
|
|
|
aTmp += ' ';
|
|
|
|
aEdit.ReplaceSelected( aTmp );
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-03-01 18:00:32 +01:00
|
|
|
IMPL_LINK_NOARG(SwInputWindow, DropdownClickHdl)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nCurID = GetCurItemId();
|
2000-09-18 16:15:01 +00:00
|
|
|
EndSelection(); // setzt CurItemId zurueck !
|
|
|
|
switch ( nCurID )
|
|
|
|
{
|
|
|
|
case FN_FORMULA_CALC :
|
|
|
|
{
|
2006-12-04 14:10:44 +00:00
|
|
|
aPopMenu.Execute( this, GetItemRect( FN_FORMULA_CALC ), POPUPMENU_NOMOUSEUPCLOSE );
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
2005-03-15 08:22:38 +00:00
|
|
|
}
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
return sal_True;
|
2005-03-15 08:22:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
|
2010-12-11 15:42:15 +01:00
|
|
|
void SwInputWindow::Click( )
|
2005-03-15 08:22:38 +00:00
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nCurID = GetCurItemId();
|
2005-03-15 08:22:38 +00:00
|
|
|
EndSelection(); // setzt CurItemId zurueck !
|
|
|
|
switch ( nCurID )
|
|
|
|
{
|
2000-09-18 16:15:01 +00:00
|
|
|
case FN_FORMULA_CANCEL:
|
|
|
|
{
|
|
|
|
CancelFormula();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FN_FORMULA_APPLY:
|
|
|
|
{
|
|
|
|
ApplyFormula();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
void SwInputWindow::ApplyFormula()
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
pView->GetViewFrame()->GetDispatcher()->Lock(sal_False);
|
|
|
|
pView->GetEditWin().LockKeyInput(sal_False);
|
2010-11-25 14:31:11 +01:00
|
|
|
CleanupUglyHackWithUndo();
|
2011-01-17 15:06:54 +01:00
|
|
|
pWrtShell->Pop( sal_False );
|
2000-09-18 16:15:01 +00:00
|
|
|
|
2010-11-04 01:06:10 +02:00
|
|
|
// Formel soll immer mit einem "=" beginnen, hier
|
|
|
|
// also wieder entfernen
|
2012-06-11 13:15:18 +01:00
|
|
|
String sEdit(comphelper::string::strip(aEdit.GetText(), ' '));
|
2000-09-18 16:15:01 +00:00
|
|
|
if( sEdit.Len() && '=' == sEdit.GetChar( 0 ) )
|
|
|
|
sEdit.Erase( 0, 1 );
|
2002-08-15 06:53:06 +00:00
|
|
|
SfxStringItem aParam(FN_EDIT_FORMULA, sEdit);
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
pWrtShell->EndSelTblCells();
|
|
|
|
pView->GetEditWin().GrabFocus();
|
2002-08-15 06:53:06 +00:00
|
|
|
const SfxPoolItem* aArgs[2];
|
|
|
|
aArgs[0] = &aParam;
|
|
|
|
aArgs[1] = 0;
|
2002-08-30 10:46:43 +00:00
|
|
|
pView->GetViewFrame()->GetBindings().Execute( FN_EDIT_FORMULA, aArgs, 0, SFX_CALLMODE_ASYNCHRON );
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
|
|
|
void SwInputWindow::CancelFormula()
|
|
|
|
{
|
|
|
|
if(pView)
|
|
|
|
{
|
2011-01-17 15:06:54 +01:00
|
|
|
pView->GetViewFrame()->GetDispatcher()->Lock( sal_False );
|
|
|
|
pView->GetEditWin().LockKeyInput(sal_False);
|
2010-11-25 14:31:11 +01:00
|
|
|
CleanupUglyHackWithUndo();
|
2011-01-17 15:06:54 +01:00
|
|
|
pWrtShell->Pop( sal_False );
|
2000-09-18 16:15:01 +00:00
|
|
|
|
|
|
|
if( bDelSel )
|
|
|
|
pWrtShell->EnterStdMode();
|
|
|
|
|
|
|
|
pWrtShell->EndSelTblCells();
|
|
|
|
|
|
|
|
pView->GetEditWin().GrabFocus();
|
|
|
|
}
|
|
|
|
pView->GetViewFrame()->GetDispatcher()->Execute( FN_EDIT_FORMULA, SFX_CALLMODE_ASYNCHRON);
|
|
|
|
}
|
|
|
|
//==================================================================
|
|
|
|
|
2012-10-19 05:34:48 -05:00
|
|
|
const sal_Unicode CH_LRE = 0x202a;
|
|
|
|
const sal_Unicode CH_PDF = 0x202c;
|
2003-04-17 09:16:06 +00:00
|
|
|
|
2000-09-18 16:15:01 +00:00
|
|
|
IMPL_LINK( SwInputWindow, SelTblCellsNotify, SwWrtShell *, pCaller )
|
|
|
|
{
|
|
|
|
if(bIsTable)
|
|
|
|
{
|
|
|
|
SwFrmFmt* pTblFmt = pCaller->GetTableFmt();
|
|
|
|
String sBoxNms( pCaller->GetBoxNms() );
|
|
|
|
String sTblNm;
|
|
|
|
if( pTblFmt && aAktTableName != pTblFmt->GetName() )
|
|
|
|
sTblNm = pTblFmt->GetName();
|
|
|
|
|
|
|
|
aEdit.UpdateRange( sBoxNms, sTblNm );
|
|
|
|
|
2003-04-17 09:16:06 +00:00
|
|
|
String sNew;
|
|
|
|
sNew += CH_LRE;
|
|
|
|
sNew += aEdit.GetText();
|
|
|
|
sNew += CH_PDF;
|
|
|
|
|
2000-09-18 16:15:01 +00:00
|
|
|
if( sNew != sOldFml )
|
|
|
|
{
|
|
|
|
// Die WrtShell ist in der Tabellen Selektion
|
|
|
|
// dann die Tabellen Selektion wieder aufheben, sonst steht der
|
|
|
|
// Cursor "im Wald" und das LiveUpdate funktioniert nicht!
|
|
|
|
pWrtShell->StartAllAction();
|
|
|
|
|
|
|
|
SwPaM aPam( *pWrtShell->GetStkCrsr()->GetPoint() );
|
|
|
|
aPam.Move( fnMoveBackward, fnGoSection );
|
|
|
|
aPam.SetMark();
|
|
|
|
aPam.Move( fnMoveForward, fnGoSection );
|
|
|
|
|
2006-08-14 16:52:31 +00:00
|
|
|
IDocumentContentOperations* pIDCO = pWrtShell->getIDocumentContentOperations();
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
pIDCO->DeleteRange( aPam );
|
|
|
|
pIDCO->InsertString( aPam, sNew );
|
2000-09-18 16:15:01 +00:00
|
|
|
pWrtShell->EndAllAction();
|
|
|
|
sOldFml = sNew;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
aEdit.GrabFocus();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-17 15:06:54 +01:00
|
|
|
void SwInputWindow::SetFormula( const String& rFormula, sal_Bool bDelFlag )
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2012-07-04 23:58:05 +01:00
|
|
|
String sEdit = rtl::OUString('=');
|
2000-09-18 16:15:01 +00:00
|
|
|
if( rFormula.Len() )
|
|
|
|
{
|
|
|
|
if( '=' == rFormula.GetChar( 0 ) )
|
|
|
|
sEdit = rFormula;
|
|
|
|
else
|
|
|
|
sEdit += rFormula;
|
|
|
|
}
|
|
|
|
aEdit.SetText( sEdit );
|
|
|
|
aEdit.SetSelection( Selection( sEdit.Len(), sEdit.Len() ) );
|
|
|
|
aEdit.Invalidate();
|
|
|
|
bDelSel = bDelFlag;
|
|
|
|
}
|
|
|
|
|
2012-03-01 18:00:32 +01:00
|
|
|
IMPL_LINK_NOARG(SwInputWindow, ModifyHdl)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2010-11-25 14:31:11 +01:00
|
|
|
if (bIsTable && m_bResetUndo)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
pWrtShell->StartAllAction();
|
|
|
|
DelBoxCntnt();
|
2003-04-17 09:16:06 +00:00
|
|
|
String sNew;
|
|
|
|
sNew += CH_LRE;
|
|
|
|
sNew += aEdit.GetText();
|
|
|
|
sNew += CH_PDF;
|
CWS-TOOLING: integrate CWS odfmetadata3
2009-09-11 Michael Stahl merge DEV300_m58
2009-09-07 Michael Stahl SwFmtFld::Modify(): do nothing on RES_OBJECTDYING
2009-08-27 Michael Stahl #i91565#, #i91566#: TextPortionEnumerationTest.java: add test document
2009-08-27 Michael Stahl #i91565#, #i91566#: add complex test: TextPortionEnumerationTest.java
2009-08-27 Michael Stahl CLiteral::initialize(): zero-length literals probably not an error
2009-08-27 Michael Stahl #i91565#, #i91566#: offapi: new InContentMetadata and MetadataField services
adapt TextPortion for InContentMetadata
2009-08-27 Michael Stahl #i91564#: xmloff: load/store xml:id and RDFa for text:bookmark(-start).
2009-08-27 Michael Stahl #i91564#: sw core: add support for xml:id at bookmarks:
sw::mark::Bookmark: derive from Metadatable.
SwHistoryBookmark, SaveBookmark: store a MetadatableUndo.
ndcopy.cxx: lcl_CopyBookmarks(): copy the xml:id.
SwXBookmark: derive from MetadatableMixin.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: refactor ruby import so nested meta(-field) works:
remove XMLRubyHint_Impl.
XMLImpRubyContext_Impl::~XMLImpRubyContext_Impl(): insert ruby directly.
2009-08-27 Michael Stahl #i91565#, #i91566#: xmloff: fix text:meta(-field) import/export:
new XMLTextParagraphExport::exportTextField() overload for XTextField.
CreateAndInsertMark(): set xml:id after insertion.
fix meta(-field) service names, bugs etc.
2009-08-27 Michael Stahl #i91565#, #i91566#: sw text formatting: paint background of meta(-field) body:
SwFont: add member m_nMetaCount.
txttypes.hxx: add POR_META.
atrstck.cxx: handle RES_TXTATR_META(FIELD).
itrform2.cxx: SwTxtFormatter::WhichTxtPor(): create new class SwMetaPortion.
2009-08-27 Michael Stahl #i91566#: sw text formatting: display meta-field prefix and suffix:
SwAttrIter::GetAttr(): replace with call to GetTxtAttrForCharAt().
SwTxtFormatter::NewExtraPortion(): handle meta-field prefix.
SwTxtFormatter: new member m_nHintEndIndex.
SwTxtFormatter::WhichFirstPortion(): call TryNewNoLengthPortion().
SwTxtFormatter::TryNewNoLengthPortion(): new; handle suffix of meta-field.
SwTxtFormatter::UnderFlow(): UGLY HACK: decrement m_nHintEndIndex.
SwFldPortion: add flag m_bNoLength: portion has zero length (for suffix).
2009-08-27 Michael Stahl #i91565#, #i91566#: extend text:meta(-field) uno wrapper with XText interface:
unoobj.hxx: new CursorType CURSOR_META.
unoobj2.cxx: refactor SwXText implementation to ensure that when the SwXText
belongs to a SwXMeta, content is always inserted inside the meta(-field).
unoobj.cxx: new SwXTextCursor::ForceIntoMeta(): cursor stays in meta(-field).
unometa.hxx: SwXMeta implements XText, forwarding to a member SwXMetaText.
DocInsertStringSplitCR(), SwX*::attachToRange(), SwX*::DeleteAndInsert():
use FORCEHINTEXPAND hack to ensure insert into the meta(-field) at the end.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) uno wrapper to sw:
fmtmeta.hxx, fmtatr2.cxx: new class sw::MetaField, new sw::MetaFieldManager.
doc.hxx, docnew.cxx: new SwDoc::GetMetaFieldManager().
unocoll.hxx,.cxx: new SW_SERVICE_FIELDTYPE_METAFIELD, SW_SERVICE_TYPE_META.
unomap.hxx,.cxx: new PROPERTY_MAP_METAFIELD.
unoprnms.hxx: new UNO_NAME_META.
unoport.hxx: new PORTION_META; add "InContentMetadata" prop to SwXTextPortion.
new unometa.hxx: new class SwXMeta and SwXMetaField.
unofield.cxx: SwXFieldEnumeration: include meta-fields.
unoportenum.cxx: handle RES_TXTATR_META(FIELD) by using a portion list stack.
unotext.cxx: SwXText::insertTextContent(): handle meta(-field) as attribute.
2009-08-27 Michael Stahl #i91565#, #i91566#: ndhints.cxx: remove sort number from SwTxtAttrNesting
2009-08-27 Michael Stahl #i91565#, #i91566#: add support for hints with end and CH_TXTATR to sw core:
doc.hxx, docedt.cxx: replace SwDoc::Delete(), DeleteAndJoin(), ReplaceRange()
with wrappers that split at left-overlapped end+CH_TXTATR hints.
txatbase.hxx: new member SwTxtAttr::m_bHasDummyChar.
ndtxt.hxx: rename SwTxtNode::GetTxtAttr() to GetTxtAttrForCharAt().
ndtxt.cxx: SwTxtNode::CopyText(): copy end+CH_TXTATR hints iff copy CH_TXTATR.
txtatr2.cxx, thints.cxx: SwTxtMeta gets a CH_TXTATR.
2009-08-27 Michael Stahl #i91565#, #i91566#: add text:meta(-field) to sw core:
txatbase.hxx: new member SwTxtAttr::m_bNesting.
hintids.hxx: new ids RES_TXTATR_META, RES_TXTATR_METAFIELD.
txtatr.hxx: new base class SwTxtAttrNesting.
new hint SwTxtMeta.
SwTxtRuby derives from SwTxtAttrNesting.
txtinet.hxx: SwTxtINetFmt derives from SwTxtAttrNesting.
new header fmtmeta.hxx: new pool item SwFmtMeta. new class sw::Meta.
ndhints.hxx, thints.cxx: new method SwpHints::TryInsertNesting().
thints.cxx: refactoring: BuildPortions() no longer handles Ruby/Hyperlink,
but TryInsertNesting(), which also handles meta(-field).
SwTxtNode::InsertItem(): check if the hint is actually inserted.
ndhints.cxx: sort nesting hints based on sort number.
ndtxt.cxx: lcl_CopyHint(): handle copy of meta/meta-field.
2009-08-27 Michael Stahl enable expanding hints with m_bLockExpandFlag set:
add new InsertFlag: INS_FORCEHINTEXPAND.
add new SetAttrMode: SETATTR_FORCEHINTEXPAND.
rename SwEditShell::Insert() to Insert2() because changed signature fails
to compile when SwWrtShell tries to overwrite these non-virtual members...
SwWrtShell::Insert() sets FOCEHINTEXPAND if range was selected/deleted.
adapt SwUndoInsert to store flags.
2009-08-27 Michael Stahl change formal parameters of item insertion methods to type SetAttrMode
2009-08-27 Michael Stahl fix incorrect resetting of text attributes in SwUndoInsSection, SwUndoInserts
2009-08-27 Michael Stahl clean up SwTxtNode::CutImpl() and lcl_CopyHint()
2009-08-27 Michael Stahl rename SwDoc::Copy() to CopyRange(), and _Copy() to CopyImpl()
2009-08-27 Michael Stahl rename SwNodes::Move() to MoveRange(), and remove unused parameter
2009-08-27 Michael Stahl rename SwDoc::Move() to MoveRange()/MoveNodeRange()
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertString(), and remove sal_Unicode variant
2009-08-27 Michael Stahl rename SwDoc::Insert() to InsertPoolItem()/InsertItemSet()/InsertSwSection()
2009-08-27 Michael Stahl rename SwDoc::Replace() to ReplaceRange()
2009-08-27 Michael Stahl remove SwDoc::Overwrite() sal_Unicode variant
2009-08-27 Michael Stahl split up SwDoc::DeleteAndJoin(): factor out DeleteAndJoinWithRedline()
2009-08-27 Michael Stahl rename overloaded SwDoc::Delete() to DeleteRange()/DeleteTOXMark()
2009-08-27 Michael Stahl rename SwTxtNode::Copy() to CopyText()
2009-08-27 Michael Stahl rename SwTxtNode::Cut() to CutText(), and _Cut() to CutImpl()
2009-08-27 Michael Stahl rename SwTxtNode::Delete() to DeleteAttribute()/DeleteAttributes()
2009-08-27 Michael Stahl rename SwTxtNode::Replace() to ReplaceText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl rename SwTxtNode::Erase() to EraseText()
2009-08-27 Michael Stahl rename SwTxtNode::Insert() to InsertText(), and remove the xub_Unicode variant
2009-08-27 Michael Stahl clean up SwTxtNode::Update()
2009-08-27 Michael Stahl remove SwTxtAttr::RemoveFromPool() and make destructor non-public,
to be invoked by new method SwTxtAttr::Destroy()
2009-08-27 Michael Stahl ensure that SwDoc::Insert() for item (set) returns success indicator:
replace SwRegHistory constructor with method InsertItems(), returning bool.
refactor InsAttr() so that it checks if InsertItems() succeeds.
2009-08-27 Michael Stahl move SwXTextPortionEnumeration from unoobj.hxx to unoport.hxx
2009-08-27 Michael Stahl add missing SolarMutex in SwXTextPortion methods
2009-08-27 Michael Stahl SwXTextPortion: new member m_xTextField (so the TextField property need not
be returned indirectly via SwUnoCursorHelper).
factor out function CreateSwXTextField().
2009-08-27 Michael Stahl SwXTextPortion: remove PORTION_CONTROL_CHAR and implementation of XTextField
2009-08-27 Michael Stahl remove obsolete hint SwTxtHardBlank and formats SwFmtHardBlank/SwFmtSoftHyph
2009-08-27 Michael Stahl clean up SwTxtAttr and friends:
remove many accessor methods for obsolete (due to autofmt) char format items.
remove unused flag SwTxtAttr::m_bDontMergeAttr.
MakeRedlineTxtAttr() now dedicated function, no longer calls MakeTxtAttr().
2009-08-27 Michael Stahl remove obsolete attribute SwTxt2Lines
2009-08-27 Michael Stahl SwXTextPortionEnumeration: finish refactoring CreatePortions
change ExportHints so it always returns a text portion for hint w/ CH_TXTATR.
remove special case for handling end of paragraph.
unfortunately had to refactor the fieldmarks export as well (got in the way).
2009-08-27 Michael Stahl SwXTextPortionEnumeration: refactor CreatePortions: frames export
extract function ExportFrames() from CreatePortions().
remove (un)dead code that calls evil MovePara(fnParaCurr, fnParaEnd)
2009-08-27 Michael Stahl clean up SwXParaFrameEnumeration
2009-08-27 Michael Stahl CollectFrameAtNode: replace SwDependArr with STL based FrameDependList_t
2009-08-27 Michael Stahl SwXTextPortionEnumeration: tweak refmark/toxmark export
so ExportHints returns the portion for point marks
2009-08-27 Michael Stahl clean up SwXTextPortionEnumeration:
prefix members, remove casts, replace SvWeirdArray with STL, etc.
make CreatePortions() method a function, and remove lots of members.
extract fieldmarks function from CreatePortions.
2009-08-27 Michael Stahl remove FOREACHUNOPAM_START/END macros
2009-08-27 Michael Stahl clean up SwXTextPortion:
prefix members, remove casts, etc.
remove SwXRubyPortion: replace it with another SwXTextPortion constructor
2009-08-27 Michael Stahl #i102541# SwXReferenceMark::InsertRefMark(): use flag SETATTR_DONTEXPAND
2009-08-27 Michael Stahl rename SwTxtNode::Insert to SwTxtNode::InsertHint, and
fix constness in SwTxtNode::InsertItem
2009-08-27 Michael Stahl turn SwTxtNode::MakeTxtAttr() methods into global functions in ndhints.hxx
2009-08-27 Michael Stahl remove obsolete sw/inc/bookmrk.hxx
2009-08-27 Michael Stahl pam.cxx: fix ComparePosition functions (returned wrong result in one case)
2009-08-27 Michael Stahl #i103613# only import RDF metadata on normal open of a document
2009-09-11 kz CWS-TOOLING: integrate CWS impress176
2009-09-08 20:18:24 +0200 sj r275957 : fixed warning (shadowed variable)
2009-09-08 18:02:05 +0200 cl r275948 : #i104315# added missing tab pages
2009-09-08 17:35:18 +0200 cl r275947 : #i104866# fixed angle import
2009-09-08 17:32:53 +0200 cl r275946 : #i104841# fixed angle import
2009-09-08 17:01:25 +0200 cl r275943 : #i103935# fixed the SID_EVENTCONFIG mess
2009-09-08 14:32:57 +0200 sj r275928 : #i104685# only comments
2009-09-07 12:37:36 +0200 sj r275886 : #i104683# fixed import of bold/italic attributes for normal text shapes
2009-09-04 15:07:46 +0200 sj r275808 : #104689# fixed bullet color problem
2009-09-03 15:25:07 +0200 sj r275753 : #160200# added vertical alignment of table cells
2009-09-11 kz CWS-TOOLING: integrate CWS dv14
2009-09-10 15:16:32 +0200 sg r276035 : #160513# updated wfs scheme to accept ports
2009-09-10 07:41:47 +0200 dv r276019 : #i104942# Better renaming algorithmen
2009-08-31 13:41:11 +0200 dv r275604 : #160505# Setting APP1PRODUCTNAME must not overwrite APP1PRODUCTDEF
2009-09-11 kz CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
2009-09-11 kz CWS-TOOLING: integrate CWS changehc
2009-08-31 19:38:50 +0200 pl r275633 : remove dbug printf
2009-08-31 17:41:50 +0200 pl r275623 : CWS-TOOLING: rebase CWS changehc to trunk@275331 (milestone: DEV300:m56)
2009-07-15 19:45:46 +0200 pl r274028 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:40:52 +0200 pl r274020 : #i35482# use HC flag to decide high contrast mode
2009-07-15 17:39:50 +0200 pl r274019 : #i35482# update autohc correctly in MergeSystemSettings
2009-07-15 17:38:57 +0200 pl r274018 : #i35482# update autohc correctly in MergeSystemSettings
2009-09-11 kz CWS-TOOLING: integrate CWS notes10
2009-08-24 07:25:57 +0200 mod r275287 : 2009-07-26 02:38:32 +0200 mod r274343 : #i#i103645#
2009-07-26 02:01:53 +0200 mod r274342 : #i103645#
2009-07-26 01:52:42 +0200 mod r274341 : #i103490#
2009-07-22 08:31:48 +0200 mod r274215 : #i103373#
2009-07-15 00:55:11 +0200 mod r273987 : #i101419#
2009-07-14 07:07:55 +0200 mod r273956 : #i101419#
2009-07-14 07:07:43 +0200 mod r273955 : #i101419#
2009-07-14 07:02:10 +0200 mod r273954 : changes from notes9
2009-07-14 06:14:25 +0200 mod r273953 : #i103476#
2009-09-11 kz CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
2009-09-11 kz CWS-TOOLING: integrate CWS hb32bugs02
2009-09-02 Henning Brinkmann #i102420# revert changes
2009-08-26 Henning Brinkmann merged DEV300_m56
2009-08-19 Henning Brinkmann merged DEV300_m55
2009-08-14 Henning Brinkmann merged changes from wntmsci12
2009-08-12 Henning Brinkmann Implemented NoSpaceEdit constructor and destructor in .cxx to allow compile with debug on wntmsci12.
2009-08-12 Henning Brinkmann Added some SW_DLLPUBLIC to make compilable on wntmsci12.
2009-08-11 Henning Brinkmann #i102420# dbg_out: surround output for SwNodes with <nodes-array>.
2009-08-10 Henning Brinkmann #i102420# rewritten debug output for SwNodes.
2009-08-07 Henning Brinkmann #i102420# debug _MoveNodes: output the destination, too. Break after two iterations.
2009-08-07 Henning Brinkmann #i102420# _MoveNodes: Additionally check if destination index is inside source => false
Check if current range was already handled => loop
Debug output current range
2009-08-06 Henning Brinkmann merged DEV300_m54
2009-08-06 Henning Brinkmann added master fix
2009-08-06 Henning Brinkmann debug output for SwNodeRange
2009-08-04 Henning Brinkmann #i102844# robustness: check for NULL pointer to prevent crash
2009-08-03 Henning Brinkmann #i103475# applied patch and verified
2009-08-03 Henning Brinkmann Removed code preventing build of sw with DEBUG.
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 convert-repo update tags
2009-09-10 kz CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 kz CWS-TOOLING: integrate CWS mingwport23
2009-08-29 07:07:53 +0200 tono r275555 : i#104522: mingw port graphite
2009-08-29 07:07:26 +0200 tono r275554 : i#104522: mingw port printf format fix
2009-09-10 kz CWS-TOOLING: integrate CWS mh232
2009-08-26 03:52:57 +0200 mh r275385 : #i102182# FreeBSD patch
2009-08-26 03:43:20 +0200 mh r275384 : #i101333# patch for FreeBSD
2009-08-26 03:11:20 +0200 mh r275383 : #i39230
2009-08-26 03:07:51 +0200 mh r275382 : #i39230# more space for initials field
2009-08-26 02:41:19 +0200 mh r275380 : #i39230# use vos::osecurity for reading the user name
2009-08-18 22:06:00 +0200 mh r275130 : #i104243#, line ending problem with newer perl
2009-08-18 21:53:21 +0200 mh r275129 : #i39230# read initials via getpwnam
2009-08-18 21:34:05 +0200 mh r275128 : enable CAIROCANVAS for Linux and Mac, #i88613#
2009-08-17 18:02:59 +0200 mh r275067 : #i95498# make compile with gcc3
2009-09-10 kz CWS-TOOLING: integrate CWS tkr24
2009-09-07 14:31:06 +0200 is r275898 : #160081# adding NO_LICENSE_INTO_COPYRIGHT
2009-09-10 releng #i10000# change KeyMapping to SingletonRef<framework::KeyMapping>
2009-09-11 14:29:45 +00:00
|
|
|
pWrtShell->SwEditShell::Insert2( sNew );
|
2000-09-18 16:15:01 +00:00
|
|
|
pWrtShell->EndAllAction();
|
|
|
|
sOldFml = sNew;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SwInputWindow::DelBoxCntnt()
|
|
|
|
{
|
|
|
|
if( bIsTable )
|
|
|
|
{
|
|
|
|
pWrtShell->StartAllAction();
|
|
|
|
pWrtShell->ClearMark();
|
2011-01-17 15:06:54 +01:00
|
|
|
pWrtShell->Pop( sal_False );
|
2000-09-18 16:15:01 +00:00
|
|
|
pWrtShell->Push();
|
|
|
|
pWrtShell->MoveSection( fnSectionCurr, fnSectionStart );
|
|
|
|
pWrtShell->SetMark();
|
|
|
|
pWrtShell->MoveSection( fnSectionCurr, fnSectionEnd );
|
|
|
|
pWrtShell->SwEditShell::Delete();
|
|
|
|
pWrtShell->EndAllAction();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2010-12-11 15:42:15 +01:00
|
|
|
void InputEdit::KeyInput(const KeyEvent& rEvent)
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
const KeyCode aCode = rEvent.GetKeyCode();
|
|
|
|
if(aCode == KEY_RETURN || aCode == KEY_F2 )
|
|
|
|
((SwInputWindow*)GetParent())->ApplyFormula();
|
|
|
|
else if(aCode == KEY_ESCAPE )
|
|
|
|
((SwInputWindow*)GetParent())->CancelFormula();
|
|
|
|
else
|
|
|
|
Edit::KeyInput(rEvent);
|
|
|
|
}
|
|
|
|
|
|
|
|
//==================================================================
|
|
|
|
|
2010-12-11 15:42:15 +01:00
|
|
|
void InputEdit::UpdateRange(const String& rBoxes,
|
2000-09-18 16:15:01 +00:00
|
|
|
const String& rName )
|
|
|
|
{
|
|
|
|
if( !rBoxes.Len() )
|
|
|
|
{
|
|
|
|
GrabFocus();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
const sal_Unicode cOpen = '<', cClose = '>',
|
2007-09-27 11:25:28 +00:00
|
|
|
cOpenBracket = '(';
|
2000-09-18 16:15:01 +00:00
|
|
|
String aPrefix = rName;
|
|
|
|
if(rName.Len())
|
|
|
|
aPrefix += '.';
|
|
|
|
String aBoxes = aPrefix;
|
|
|
|
aBoxes += rBoxes;
|
|
|
|
Selection aSelection(GetSelection());
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nSel = (sal_uInt16) aSelection.Len();
|
2000-09-18 16:15:01 +00:00
|
|
|
//OS: mit dem folgenden Ausdruck wird sichergestellt, dass im overwrite-Modus
|
|
|
|
//die selektierte schliessende Klammer nicht geloescht wird
|
|
|
|
if( nSel && ( nSel > 1 ||
|
2013-01-21 14:32:09 +01:00
|
|
|
GetText()[ (sal_uInt16)aSelection.Min() ] != cClose ))
|
2000-09-18 16:15:01 +00:00
|
|
|
Cut();
|
|
|
|
else
|
|
|
|
aSelection.Max() = aSelection.Min();
|
|
|
|
String aActText(GetText());
|
2011-01-17 15:06:54 +01:00
|
|
|
const sal_uInt16 nLen = aActText.Len();
|
2000-09-18 16:15:01 +00:00
|
|
|
if( !nLen )
|
|
|
|
{
|
2012-07-04 23:58:05 +01:00
|
|
|
String aStr = rtl::OUStringBuffer().
|
|
|
|
append(cOpen).append(aBoxes).append(cClose).
|
|
|
|
makeStringAndClear();
|
2000-09-18 16:15:01 +00:00
|
|
|
SetText(aStr);
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nPos = aStr.Search( cClose );
|
2010-10-24 23:48:32 +02:00
|
|
|
OSL_ENSURE(nPos < aStr.Len(), "delimiter not found");
|
2000-09-18 16:15:01 +00:00
|
|
|
++nPos;
|
|
|
|
SetSelection( Selection( nPos, nPos ));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-02-13 00:02:30 +09:00
|
|
|
bool bFound = false;
|
2002-09-04 11:02:43 +00:00
|
|
|
sal_Unicode cCh;
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nPos, nEndPos = 0, nStartPos = (sal_uInt16) aSelection.Min();
|
2000-09-18 16:15:01 +00:00
|
|
|
if( nStartPos-- )
|
|
|
|
{
|
|
|
|
do {
|
|
|
|
if( cOpen == (cCh = aActText.GetChar( nStartPos ) ) ||
|
|
|
|
cOpenBracket == cCh )
|
|
|
|
{
|
|
|
|
bFound = cCh == cOpen;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while( nStartPos-- > 0 );
|
|
|
|
}
|
|
|
|
if( bFound )
|
|
|
|
{
|
2013-02-13 00:02:30 +09:00
|
|
|
bFound = false;
|
2000-09-18 16:15:01 +00:00
|
|
|
nEndPos = nStartPos;
|
|
|
|
while( nEndPos < nLen )
|
|
|
|
{
|
2010-11-04 01:06:10 +02:00
|
|
|
if( cClose == (cCh = aActText.GetChar( nEndPos )))
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2013-02-13 00:02:30 +09:00
|
|
|
bFound = true;
|
2000-09-18 16:15:01 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
++nEndPos;
|
|
|
|
}
|
|
|
|
// nur wenn akt. Pos im Breich oder direkt dahinter liegt
|
2011-01-17 15:06:54 +01:00
|
|
|
if( bFound && !( nStartPos < (sal_uInt16)aSelection.Max() &&
|
|
|
|
(sal_uInt16)aSelection.Max() <= nEndPos + 1 ))
|
2013-02-13 00:02:30 +09:00
|
|
|
bFound = false;
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
|
|
|
if( bFound )
|
|
|
|
{
|
|
|
|
nPos = ++nStartPos + 1; // wir wollen dahinter
|
|
|
|
aActText.Erase( nStartPos, nEndPos - nStartPos );
|
|
|
|
aActText.Insert( aBoxes, nStartPos );
|
2007-09-27 11:25:28 +00:00
|
|
|
nPos = nPos + aBoxes.Len();
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2012-07-04 23:58:05 +01:00
|
|
|
rtl::OUString aTmp = rtl::OUStringBuffer().
|
|
|
|
append(cOpen).append(aBoxes).append(cClose).
|
|
|
|
makeStringAndClear();
|
2011-01-17 15:06:54 +01:00
|
|
|
nPos = (sal_uInt16)aSelection.Min();
|
2000-09-18 16:15:01 +00:00
|
|
|
aActText.Insert( aTmp, nPos );
|
2012-07-04 23:58:05 +01:00
|
|
|
nPos = nPos + aTmp.getLength();
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
2013-01-21 14:32:09 +01:00
|
|
|
if( GetText() != OUString(aActText) )
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
SetText( aActText );
|
|
|
|
SetSelection( Selection( nPos, nPos ) );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
GrabFocus();
|
|
|
|
|
|
|
|
}
|
|
|
|
//==================================================================
|
|
|
|
|
2007-09-27 11:25:28 +00:00
|
|
|
SwInputChild::SwInputChild(Window* _pParent,
|
2011-01-17 15:06:54 +01:00
|
|
|
sal_uInt16 nId,
|
2001-06-11 08:18:10 +00:00
|
|
|
SfxBindings* pBindings,
|
2000-09-18 16:15:01 +00:00
|
|
|
SfxChildWinInfo* ) :
|
2007-09-27 11:25:28 +00:00
|
|
|
SfxChildWindow( _pParent, nId )
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
2001-06-11 08:18:10 +00:00
|
|
|
pDispatch = pBindings->GetDispatcher();
|
2007-09-27 11:25:28 +00:00
|
|
|
pWindow = new SwInputWindow( _pParent, pBindings );
|
|
|
|
((SwInputWindow*)pWindow)->ShowWin();
|
2000-09-18 16:15:01 +00:00
|
|
|
eChildAlignment = SFX_ALIGN_LOWESTTOP;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-12-12 00:08:03 +01:00
|
|
|
SwInputChild::~SwInputChild()
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
if(pDispatch)
|
2011-01-17 15:06:54 +01:00
|
|
|
pDispatch->Lock(sal_False);
|
2000-09-18 16:15:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-12-11 15:42:15 +01:00
|
|
|
SfxChildWinInfo SwInputChild::GetInfo() const
|
2000-09-18 16:15:01 +00:00
|
|
|
{
|
|
|
|
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
|
|
|
|
return aInfo;
|
|
|
|
}
|
|
|
|
|
2010-10-14 08:30:41 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|