strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SID_GAPHIC_SM->SID_GRAPHIC_SM

Browse source 
Change-Id: Ie5446fc349778ad6dc50ac5f622ddb45ee18eefa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114335
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-04-20 13:27:51 +01:00
parent b9f0060b94
commit de90d47410
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
starmath/inc/starmath.hrc
View file

@ -40,7 +40,7 @@
#define SID_IMPORT_FORMULA (SID_SMA_START + 58)
#define SID_IMPORT_MATHML_CLIPBOARD (SID_SMA_START + 59)
#define SID_TEXT (SID_SMA_START + 100)
#define SID_GAPHIC_SM (SID_SMA_START + 101)
#define SID_GRAPHIC_SM (SID_SMA_START + 101)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
#define SID_INSERTSPECIAL (SID_SMA_START + 104)
/** Command for inserting a math construction */

2
starmath/sdi/smath.sdi
View file

@ -197,7 +197,7 @@ SfxVoidItem FormelCursor SID_FORMULACURSOR
]
SfxInt16Item Graphic SID_GAPHIC_SM
SfxInt16Item Graphic SID_GRAPHIC_SM
[
AutoUpdate = FALSE,

2
starmath/sdi/smslots.sdi
View file

@ -107,7 +107,7 @@ interface FormulaDocument
StateMethod = GetState ;
]
//idlpp no menu entry, so no texts
SID_GAPHIC_SM //idlpp ole : no , status : no
SID_GRAPHIC_SM //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;

12
starmath/source/document.cxx
View file

@ -123,7 +123,7 @@ void SmDocShell::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
SetFormulaArranged(false);
mnModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
mnModifyCount++; //! see comment for SID_GRAPHIC_SM in SmDocShell::GetState
Repaint();
}
@ -203,14 +203,14 @@ void SmDocShell::SetFormat(SmFormat const & rFormat)
SetFormulaArranged( false );
SetModified();
mnModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
mnModifyCount++; //! see comment for SID_GRAPHIC_SM in SmDocShell::GetState
// don't use SmGetActiveView since the view shell might not be active (0 pointer)
// if for example the Basic Macro dialog currently has the focus. Thus:
SfxViewFrame* pFrm = SfxViewFrame::GetFirst( this );
while (pFrm)
{
pFrm->GetBindings().Invalidate(SID_GAPHIC_SM);
pFrm->GetBindings().Invalidate(SID_GRAPHIC_SM);
pFrm = SfxViewFrame::GetNext( *pFrm, this );
}
}
@ -236,7 +236,7 @@ void SmDocShell::Parse()
mpTree.reset();
ReplaceBadChars();
mpTree = maParser->Parse(maText);
mnModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
mnModifyCount++; //! see comment for SID_GRAPHIC_SM in SmDocShell::GetState
SetFormulaArranged( false );
InvalidateCursor();
maUsedSymbols = maParser->GetUsedSymbols();
@ -1144,12 +1144,12 @@ void SmDocShell::GetState(SfxItemSet &rSet)
rSet.Put(SfxStringItem(SID_TEXT, GetText()));
break;
case SID_GAPHIC_SM:
case SID_GRAPHIC_SM:
//! very old (pre UNO) and ugly hack to invalidate the SmGraphicWindow.
//! If mnModifyCount gets changed then the call below will implicitly notify
//! SmGraphicController::StateChanged and there the window gets invalidated.
//! Thus all the 'mnModifyCount++' before invalidating this slot.
rSet.Put(SfxInt16Item(SID_GAPHIC_SM, mnModifyCount));
rSet.Put(SfxInt16Item(SID_GRAPHIC_SM, mnModifyCount));
break;
case SID_UNDO:

8
starmath/source/view.cxx
View file

@ -1346,7 +1346,7 @@ void SmViewShell::Insert( SfxMedium& rMedium )
pDoc->SetModified();
SfxBindings &rBnd = GetViewFrame()->GetBindings();
rBnd.Invalidate(SID_GAPHIC_SM);
rBnd.Invalidate(SID_GRAPHIC_SM);
rBnd.Invalidate(SID_TEXT);
}
@ -1381,7 +1381,7 @@ void SmViewShell::InsertFrom(SfxMedium &rMedium)
pDoc->SetModified();
SfxBindings& rBnd = GetViewFrame()->GetBindings();
rBnd.Invalidate(SID_GAPHIC_SM);
rBnd.Invalidate(SID_GRAPHIC_SM);
rBnd.Invalidate(SID_TEXT);
}
@ -1890,7 +1890,7 @@ void SmViewShell::GetState(SfxItemSet &rSet)
SmViewShell::SmViewShell(SfxViewFrame *pFrame_, SfxViewShell *)
: SfxViewShell(pFrame_, SfxViewShellFlags::HAS_PRINTOPTIONS)
, mpGraphic(VclPtr<SmGraphicWindow>::Create(this))
, maGraphicController(*mpGraphic, SID_GAPHIC_SM, pFrame_->GetBindings())
, maGraphicController(*mpGraphic, SID_GRAPHIC_SM, pFrame_->GetBindings())
, mbPasteState(false)
, mbInsertIntoEditWindow(false)
{
@ -1962,7 +1962,7 @@ IMPL_LINK( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, voi
pDoc->ArrangeFormula();
pDoc->Repaint();
// adjust window, repaint, increment ModifyCount,...
GetViewFrame()->GetBindings().Invalidate(SID_GAPHIC_SM);
GetViewFrame()->GetBindings().Invalidate(SID_GRAPHIC_SM);
}
}