[Libreoffice-commits] core.git: starmath/inc starmath/sdi starmath/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Apr 20 13:57:16 UTC 2021
starmath/inc/starmath.hrc | 2 +-
starmath/sdi/smath.sdi | 2 +-
starmath/sdi/smslots.sdi | 2 +-
starmath/source/document.cxx | 12 ++++++------
starmath/source/view.cxx | 8 ++++----
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit de90d47410164a663230f5b881190f10d0269311
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 20 13:27:51 2021 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 20 15:56:36 2021 +0200
SID_GAPHIC_SM->SID_GRAPHIC_SM
Change-Id: Ie5446fc349778ad6dc50ac5f622ddb45ee18eefa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114335
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index b7733017cfbd..5001b29b0f51 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -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 */
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 575e464fa944..48045629ecd7 100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -197,7 +197,7 @@ SfxVoidItem FormelCursor SID_FORMULACURSOR
]
-SfxInt16Item Graphic SID_GAPHIC_SM
+SfxInt16Item Graphic SID_GRAPHIC_SM
[
AutoUpdate = FALSE,
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index dee2a14b19b2..47468ce5f11d 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -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 ;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 0b908d00fc76..c3faff24b8d1 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -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:
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 3a177f6276cb..73b52e9c2750 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -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);
}
}
More information about the Libreoffice-commits
mailing list