diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-11-16 13:49:31 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-11-16 13:49:31 +0100 |
| commit | fec39755122679e980f94d2cb1eb7fd9182c0e55 (patch) | |
| tree | 63eb05cc806c8e848d45776d102b96d3abc4c783 | |
| parent | 74e166c51d867f7348c4a16dd602886c303d5dda (diff) | |
| parent | 82ef3e48972df40f5ffa77032fd1f6f4ffa4fffc (diff) | |
CWS-TOOLING: integrate CWS tlmath01
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 9 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs | 9 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/ipclient.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/view/ipclient.cxx | 6 |
4 files changed, 25 insertions, 0 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 4a3c2c02c3..ea806e58f3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1512,6 +1512,15 @@ <info> <desc>Contains miscellaneous settings.</desc> </info> + <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean"> + <!-- UIHints: none yet --> + <info> + <author>TL</author> + <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc> + <label>Align Math objects</label> + </info> + <value>true</value> + </prop> <prop oor:name="MeasureUnit" oor:type="xs:int"> <!-- OldPath: Writer/Layout --> <!-- OldLocation: Soffice.cfg --> diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index 8738d9db21..b92e4684c8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -418,6 +418,15 @@ <info> <desc>Contains miscellaneous settings.</desc> </info> + <prop oor:name="IsAlignMathObjectsToBaseline" oor:type="xs:boolean"> + <!-- UIHints: none yet --> + <info> + <author>TL</author> + <desc>Automatically align the baseline of Math objects with the baseline of the surrounding text.</desc> + <label>Align Math objects</label> + </info> + <value>true</value> + </prop> <prop oor:name="MeasureUnit" oor:type="xs:int"> <!-- OldPath: HTML_Editor/Layout/Window --> <!-- OldLocation: Soffice.cfg --> diff --git a/sfx2/inc/sfx2/ipclient.hxx b/sfx2/inc/sfx2/ipclient.hxx index 1e00d474fa..99f24c703f 100644 --- a/sfx2/inc/sfx2/ipclient.hxx +++ b/sfx2/inc/sfx2/ipclient.hxx @@ -101,6 +101,7 @@ public: // used in Writer // Rectangle PixelObjVisAreaToLogic( const Rectangle & rObjRect ) const; // Rectangle LogicObjAreaToPixel( const Rectangle & rRect ) const; + virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning) }; #endif diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index ff1d963ab5..fc5a49eb58 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -220,6 +220,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a if ( m_pClient && aEvent.EventName.equalsAscii("OnVisAreaChanged") && m_nAspect != embed::Aspects::MSOLE_ICON ) { + m_pClient->FormatChanged(); // for Writer when format of the object is changed with the area m_pClient->ViewChanged(); m_pClient->Invalidate(); } @@ -1082,6 +1083,11 @@ void SfxInPlaceClient::MakeVisible() // dummy implementation } +void SfxInPlaceClient::FormatChanged() +{ + // dummy implementation +} + void SfxInPlaceClient::DeactivateObject() { if ( GetObject().is() ) |