View | Details | Raw Unified | Return to issue 107734
Collapse All | Expand All

(-)a/main/dtrans/source/win32/ftransl/ftransl.cxx (+2 lines)
Lines 516-521 void SAL_CALL CDataFormatTranslator::initTranslationTable() Link Here
516
	m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
516
	m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
517
	//SOT_FORMATSTR_ID_PNG
517
	//SOT_FORMATSTR_ID_PNG
518
	m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
518
	m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
519
    //SOT_FORMATSTR_ID_MATHML
520
    m_TranslTable.push_back(FormatEntry("application/mathml+xml;windows_formatname=\"MathML\"", "MathML", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
519
	//SOT_FORMATSTR_ID_DUMMY3
521
	//SOT_FORMATSTR_ID_DUMMY3
520
	m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
522
	m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
521
	//SOT_FORMATSTR_ID_DUMMY4
523
	//SOT_FORMATSTR_ID_DUMMY4
(-)a/main/helpcontent2/source/text/smath/00/00000004.xhp (+2 lines)
Lines 323-328 Link Here
323
</variable></paragraph>
323
</variable></paragraph>
324
<paragraph role="paragraph" id="par_id3153802" xml-lang="en-US" l10n="U" oldref="64"><variable id="etsfim">Choose <emph>Tools - Import Formula</emph>
324
<paragraph role="paragraph" id="par_id3153802" xml-lang="en-US" l10n="U" oldref="64"><variable id="etsfim">Choose <emph>Tools - Import Formula</emph>
325
</variable></paragraph>
325
</variable></paragraph>
326
<paragraph role="paragraph" id="par_id3153803" xml-lang="en-US"><variable id="etsmim">Choose <emph>Tools - Import MathML from Clipboard</emph>
327
</variable></paragraph>
326
<paragraph role="paragraph" id="par_id3154594" xml-lang="en-US" l10n="U" oldref="65"><variable id="etsaps">Choose <emph>Tools - Customize</emph>
328
<paragraph role="paragraph" id="par_id3154594" xml-lang="en-US" l10n="U" oldref="65"><variable id="etsaps">Choose <emph>Tools - Customize</emph>
327
</variable></paragraph>
329
</variable></paragraph>
328
<section id="sonst">
330
<section id="sonst">
(-)a/main/helpcontent2/source/text/smath/01/06020000.xhp (-9 / +18 lines)
Lines 2-8 Link Here
2
2
3
3
4
<!--***********************************************************
4
<!--***********************************************************
5
 * 
5
 *
6
 * Licensed to the Apache Software Foundation (ASF) under one
6
 * Licensed to the Apache Software Foundation (ASF) under one
7
 * or more contributor license agreements.  See the NOTICE file
7
 * or more contributor license agreements.  See the NOTICE file
8
 * distributed with this work for additional information
8
 * distributed with this work for additional information
Lines 10-25 Link Here
10
 * to you under the Apache License, Version 2.0 (the
10
 * to you under the Apache License, Version 2.0 (the
11
 * "License"); you may not use this file except in compliance
11
 * "License"); you may not use this file except in compliance
12
 * with the License.  You may obtain a copy of the License at
12
 * with the License.  You may obtain a copy of the License at
13
 * 
13
 *
14
 *   http://www.apache.org/licenses/LICENSE-2.0
14
 *   http://www.apache.org/licenses/LICENSE-2.0
15
 * 
15
 *
16
 * Unless required by applicable law or agreed to in writing,
16
 * Unless required by applicable law or agreed to in writing,
17
 * software distributed under the License is distributed on an
17
 * software distributed under the License is distributed on an
18
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
19
 * KIND, either express or implied.  See the License for the
19
 * KIND, either express or implied.  See the License for the
20
 * specific language governing permissions and limitations
20
 * specific language governing permissions and limitations
21
 * under the License.
21
 * under the License.
22
 * 
22
 *
23
 ***********************************************************-->
23
 ***********************************************************-->
24
24
25
<helpdocument version="1.0">
25
<helpdocument version="1.0">
Lines 30-43 Link Here
30
</topic>
30
</topic>
31
</meta>
31
</meta>
32
<body>
32
<body>
33
33
<section id="importfile">
34
34
  <bookmark xml-lang="en-US" branch="index" id="bm_id3154659"><bookmark_value>importing; %PRODUCTNAME Math formulas</bookmark_value></bookmark><bookmark xml-lang="en-US" branch="index" id="bm_id3154660"><bookmark_value>MathML; import from file</bookmark_value></bookmark><bookmark branch="hid/.uno:ImportFormula" xml-lang="en-US" id="bm_id3150346"/><paragraph role="heading" level="1" id="hd_id3154659" l10n="U" xml-lang="en-US" oldref="1">Import Formula from File</paragraph>
35
36
  <bookmark xml-lang="en-US" branch="index" id="bm_id3154659"><bookmark_value>importing; %PRODUCTNAME Math formulas</bookmark_value></bookmark><bookmark branch="hid/.uno:InsertFormula" xml-lang="en-US" id="bm_id3150346"/><paragraph role="heading" level="1" id="hd_id3154659" l10n="U" xml-lang="en-US" oldref="1">Import formula</paragraph>
37
  <paragraph l10n="U" role="paragraph" id="par_id3150251" xml-lang="en-US" oldref="2"><variable id="formelimportierentext"><ahelp hid="SID_INSERT_FORMULA" visibility="visible">This command opens a dialog for importing a formula.</ahelp></variable></paragraph>
35
  <paragraph l10n="U" role="paragraph" id="par_id3150251" xml-lang="en-US" oldref="2"><variable id="formelimportierentext"><ahelp hid="SID_INSERT_FORMULA" visibility="visible">This command opens a dialog for importing a formula.</ahelp></variable></paragraph>
38
  <paragraph xml-lang="en-US" oldref="3" id="par_id3153916" l10n="U" role="paragraph">The <emph>Insert</emph> dialog is set up like the <link href="text/shared/01/01020000.xhp" name="Open">Open</link> dialog under <emph>File</emph>. Use the <emph>Insert</emph> dialog to load, edit and display a formula saved as a file in the <emph>Commands</emph> window.</paragraph>
36
  <paragraph xml-lang="en-US" oldref="3" id="par_id3153916" l10n="U" role="paragraph">The <emph>Insert</emph> dialog is set up like the <link href="text/shared/01/01020000.xhp" name="Open">Open</link> dialog under <emph>File</emph>. Use the <emph>Insert</emph> dialog to load, edit and display a formula saved as a file in the <emph>Commands</emph> window.</paragraph>
37
  <paragraph xml-lang="en-US" id="par_id3153917" role="paragraph">You can import MathML files created by other applications as well. The MathML source must have a <item type="code">math</item> element with an <item type="code">xmlns</item> attribute with value "http://www.w3.org/1998/Math/MathML". The languages MathML and StarMath are not fully compatible, therefore you should revise the import result. For details about the language MathML see its <link href="http://www.w3.org/TR/#tr_MathML">specification</link>.</paragraph>
39
  <section id="howtoget">
38
  <section id="howtoget">
40
  <embed href="text/smath/00/00000004.xhp#etsfim"/>
39
  <embed href="text/smath/00/00000004.xhp#etsfim"/>
40
  </section>
41
</section>
42
<section id="importclipboard">
43
  <bookmark xml-lang="en-US" branch="index" id="bm_id3154661"><bookmark_value>MathML; import via clipboard</bookmark_value></bookmark><bookmark xml-lang="en-US" branch="index" id="bm_id3154662"><bookmark_value>importing; MathML</bookmark_value></bookmark><bookmark branch="hid/.uno:ImportMathMLClipboard" xml-lang="en-US" id="bm_id3150347"/><paragraph role="heading" level="1" id="hd_id3154661" xml-lang="en-US">Import MathML from Clipboard</paragraph>
44
  <paragraph role="paragraph" id="par_id3150252" xml-lang="en-US"><variable id="mathmlimportierentext"><ahelp hid="SID_IMPORT_MATHML_CLIPBOARD" visibility="visible">This command transforms MathML clipboard content to StarMath and inserts it at the current cursor position.</ahelp></variable></paragraph>
45
  <paragraph xml-lang="en-US" id="par_id3153918" role="paragraph">If the transformation fails, nothing is inserted.</paragraph>
46
  <section id="howtoget">
47
  <embed href="text/smath/00/00000004.xhp#etsmim"/>
48
  </section>
49
  <paragraph xml-lang="en-US" id="par_id3153919" role="paragraph">This command handles only MathML content. If you have copied a %PRODUCTNAME Math formula to clipboard, insert it using the command <link href="text/shared/01/02060000.xhp" name="Paste">Paste</link> under <emph>Edit</emph>.</paragraph>
41
</section>
50
</section>
42
 </body>
51
</body>
43
</helpdocument>
52
</helpdocument>
(-)a/main/helpcontent2/source/text/smath/main0106.xhp (-2 / +4 lines)
Lines 36-46 Link Here
36
<body>
36
<body>
37
<section id="extras">
37
<section id="extras">
38
<paragraph role="heading" id="hd_id3149019" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/main0106.xhp" name="Tools">Tools</link></paragraph>
38
<paragraph role="heading" id="hd_id3149019" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/smath/main0106.xhp" name="Tools">Tools</link></paragraph>
39
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="2">Use this menu to open and edit the symbol catalog, or import an external formula as a data file. The program interface can be adjusted to meet your requirements. You can also change the program options.</paragraph>
39
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="U" oldref="2">Use this menu to open and edit the symbol catalog, or import an external formula as a data file or via clipboard. The program interface can be adjusted to meet your requirements. You can also change the program options.</paragraph>
40
</section>
40
</section>
41
<embed href="text/smath/01/06010000.xhp#symbol"/>
41
<embed href="text/smath/01/06010000.xhp#symbol"/>
42
<paragraph role="heading" id="hd_id3150206" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/smath/01/06020000.xhp" name="Import Formula">Import Formula</link></paragraph>
42
<paragraph role="heading" id="hd_id3150206" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/smath/01/06020000.xhp#importfile" name="Import Formula">Import Formula</link></paragraph>
43
<embed href="text/smath/01/06020000.xhp#formelimportierentext"/>
43
<embed href="text/smath/01/06020000.xhp#formelimportierentext"/>
44
<paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2"><link href="text/smath/01/06020000.xhp#importclipboard" name="Import MathML">Import MathML from Clipboard</link></paragraph>
45
<embed href="text/smath/01/06020000.xhp#mathmlimportierentext"/>
44
<paragraph role="heading" id="hd_id3145385" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
46
<paragraph role="heading" id="hd_id3145385" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/01/06140000.xhp" name="Customize">Customize</link></paragraph>
45
<embed href="text/shared/01/06140000.xhp#anpassen"/>
47
<embed href="text/shared/01/06140000.xhp#anpassen"/>
46
<embed href="text/shared/optionen/01000000.xhp#optionen"/>
48
<embed href="text/shared/optionen/01000000.xhp#optionen"/>
(-)a/main/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu (+5 lines)
Lines 77-82 Link Here
77
                    <value xml:lang="en-US">~Import Formula...</value>
77
                    <value xml:lang="en-US">~Import Formula...</value>
78
                </prop>
78
                </prop>
79
            </node>
79
            </node>
80
            <node oor:name=".uno:ImportMathMLClipboard" oor:op="replace">
81
                <prop oor:name="Label" oor:type="xs:string">
82
                    <value xml:lang="en-US">Import MathML from Clipboard</value>
83
                </prop>
84
            </node>
80
            <node oor:name=".uno:InsertCommand" oor:op="replace">
85
            <node oor:name=".uno:InsertCommand" oor:op="replace">
81
                <prop oor:name="Label" oor:type="xs:string">
86
                <prop oor:name="Label" oor:type="xs:string">
82
                    <value xml:lang="en-US">Insert Command</value>
87
                    <value xml:lang="en-US">Insert Command</value>
(-)a/main/sot/inc/sot/formats.hxx (-1 / +2 lines)
Lines 182-188 Link Here
182
#define SOT_FORMATSTR_ID_STARBASE_8             ((sal_uLong)139)
182
#define SOT_FORMATSTR_ID_STARBASE_8             ((sal_uLong)139)
183
#define SOT_FORMATSTR_ID_HC_GDIMETAFILE         ((sal_uLong)140)
183
#define SOT_FORMATSTR_ID_HC_GDIMETAFILE         ((sal_uLong)140)
184
#define SOT_FORMATSTR_ID_PNG                    ((sal_uLong)141)
184
#define SOT_FORMATSTR_ID_PNG                    ((sal_uLong)141)
185
#define SOT_FORMATSTR_ID_USER_END               SOT_FORMATSTR_ID_PNG
185
#define SOT_FORMATSTR_ID_MATHML                 ((sal_uLong)142)
186
#define SOT_FORMATSTR_ID_USER_END               SOT_FORMATSTR_ID_MATHML
186
187
187
#endif // _SOT_FORMATS_HXX
188
#endif // _SOT_FORMATS_HXX
188
189
(-)a/main/sot/source/base/exchange.cxx (+1 lines)
Lines 208-213 namespace Link Here
208
            /*139 SOT_FORMATSTR_ID_STARBASE_8*/            { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
208
            /*139 SOT_FORMATSTR_ID_STARBASE_8*/            { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
209
            /*140 SOT_FORMAT_GDIMETAFILE*/					{ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
209
            /*140 SOT_FORMAT_GDIMETAFILE*/					{ "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
210
            /*141 SOT_FORMATSTR_ID_PNG*/                    { "image/png", "PNG Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
210
            /*141 SOT_FORMATSTR_ID_PNG*/                    { "image/png", "PNG Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
211
            /*142 SOT_FORMATSTR_ID_MATHML*/                 { "application/mathml+xml;windows_formatname=\"MathML\"", "MathML", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
211
            };
212
            };
212
	    return &aInstance[0];
213
	    return &aInstance[0];
213
        }
214
        }
(-)a/main/starmath/inc/starmath.hrc (+1 lines)
Lines 52-57 Link Here
52
#define SID_SYMBOLS 				(SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
52
#define SID_SYMBOLS 				(SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
53
#define SID_TEXTMODE 				(SID_SMA_START + 57)
53
#define SID_TEXTMODE 				(SID_SMA_START + 57)
54
#define SID_IMPORT_FORMULA          (SID_SMA_START + 58)
54
#define SID_IMPORT_FORMULA          (SID_SMA_START + 58)
55
#define SID_IMPORT_MATHML_CLIPBOARD (SID_SMA_START + 59)
55
#define SID_TEXT                    (SID_SMA_START + 100)
56
#define SID_TEXT                    (SID_SMA_START + 100)
56
#define SID_GAPHIC_SM               (SID_SMA_START + 101)
57
#define SID_GAPHIC_SM               (SID_SMA_START + 101)
57
#define SID_FITINWINDOW 			(SID_SMA_START + 103)
58
#define SID_FITINWINDOW 			(SID_SMA_START + 103)
(-)a/main/starmath/sdi/smath.sdi (+25 lines)
Lines 424-429 SfxBoolItem ImportFormula SID_IMPORT_FORMULA Link Here
424
]
424
]
425
425
426
//--------------------------------------------------------------------------
426
//--------------------------------------------------------------------------
427
SfxBoolItem ImportMathMLClipboard SID_IMPORT_MATHML_CLIPBOARD
428
()
429
[
430
	/* flags: */  
431
	AutoUpdate = FALSE, 
432
	Cachable = Cachable, 
433
	FastCall = TRUE, 
434
	HasCoreId = FALSE, /*obsolete */
435
	HasDialog = FALSE, /*obsolete */
436
	ReadOnlyDoc = FALSE, 
437
	Toggle = FALSE, 
438
	Container = FALSE, 
439
	RecordAbsolute = FALSE, /*obsolete */
440
	RecordPerSet;
441
	Synchron;
442
443
	/* config: */ 
444
	AccelConfig = TRUE, 
445
	MenuConfig = TRUE, 
446
	StatusBarConfig = FALSE, 
447
	ToolBoxConfig = TRUE, 
448
	GroupId = GID_INSERT;
449
]
450
451
//--------------------------------------------------------------------------
427
SfxVoidItem LoadSymbols SID_LOADSYMBOLS
452
SfxVoidItem LoadSymbols SID_LOADSYMBOLS
428
()
453
()
429
[
454
[
(-)a/main/starmath/sdi/smslots.sdi (+6 lines)
Lines 277-282 interface FormulaView Link Here
277
        StateMethod = GetState ;
277
        StateMethod = GetState ;
278
        Export = FALSE ;
278
        Export = FALSE ;
279
    ]
279
    ]
280
    SID_IMPORT_MATHML_CLIPBOARD //idlpp ole : no , status : no
281
    [
282
        ExecMethod = Execute ;
283
        StateMethod = GetState ;
284
        Export = FALSE ;
285
    ]
280
	//idlpp kein Menueeintrag , also keine Texte
286
	//idlpp kein Menueeintrag , also keine Texte
281
	SID_ATTR_ZOOM //idlpp ole : no , status : no
287
	SID_ATTR_ZOOM //idlpp ole : no , status : no
282
	[
288
	[
(-)a/main/starmath/source/view.cxx (+74 lines)
Lines 64-69 Link Here
64
#include <vcl/menu.hxx>
64
#include <vcl/menu.hxx>
65
#include <vcl/msgbox.hxx>
65
#include <vcl/msgbox.hxx>
66
#include <vcl/wrkwin.hxx>
66
#include <vcl/wrkwin.hxx>
67
#include <unotools/streamwrap.hxx>
67
68
68
#include "unomodel.hxx"
69
#include "unomodel.hxx"
69
#include "view.hxx"
70
#include "view.hxx"
Lines 90-95 using namespace com::sun::star; Link Here
90
using namespace com::sun::star::accessibility;
91
using namespace com::sun::star::accessibility;
91
using namespace com::sun::star::uno;
92
using namespace com::sun::star::uno;
92
93
94
using ::rtl::OUString;
95
93
//////////////////////////////////////////////////////////////////////
96
//////////////////////////////////////////////////////////////////////
94
97
95
SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):
98
SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell):
Lines 1601-1606 void SmViewShell::Execute(SfxRequest& rReq) Link Here
1601
            break;
1604
            break;
1602
        }
1605
        }
1603
1606
1607
        case SID_IMPORT_MATHML_CLIPBOARD:
1608
        {
1609
            TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard(GetEditWindow()) );
1610
            uno::Reference < io::XInputStream > xStrm;
1611
            SotFormatStringId nId = SOT_FORMAT_SYSTEM_START; //dummy initialize to avoid warning
1612
            if  ( aDataHelper.GetTransferable().is() )
1613
            {
1614
                if ( aDataHelper.HasFormat( nId = SOT_FORMATSTR_ID_MATHML ) )
1615
                {
1616
                    if ( aDataHelper.GetInputStream( nId, xStrm ) && xStrm.is() )
1617
                    {
1618
                        SfxMedium* pClipboardMedium = new SfxMedium();
1619
                        pClipboardMedium->GetItemSet(); //generate initial itemset, not sure if necessary
1620
                        const SfxFilter* pMathFilter = SfxFilter::GetFilterByName( String::CreateFromAscii(MATHML_XML) );
1621
                        pClipboardMedium->SetFilter(pMathFilter);
1622
                        pClipboardMedium->setStreamToLoadFrom( xStrm, sal_True /*bIsReadOnly*/ );
1623
                        InsertFrom(*pClipboardMedium);
1624
                        GetDoc()->UpdateText();
1625
                        delete pClipboardMedium;
1626
                    }
1627
                }
1628
                else
1629
                {
1630
                    if ( aDataHelper.HasFormat( nId = FORMAT_STRING) )
1631
                    {
1632
                        // In case of FORMAT_STRING no stream exists, need to generate one
1633
                        ::rtl::OUString aString;
1634
                        if (aDataHelper.GetString( nId, aString))
1635
                        {
1636
                            SfxMedium* pClipboardMedium = new SfxMedium();
1637
                            pClipboardMedium->GetItemSet(); //generates initial itemset, not sure if necessary
1638
                            const SfxFilter* pMathFilter = SfxFilter::GetFilterByName( String::CreateFromAscii(MATHML_XML) );
1639
                            pClipboardMedium->SetFilter(pMathFilter);
1640
1641
                            SvMemoryStream * pStrm;
1642
                            // The text to be imported might asserts encoding like 'encoding="utf-8"' but FORMAT_STRING is UTF-16.
1643
                            // Force encoding to UTF-16, if encoding exists.
1644
                            bool bForceUTF16 = false;
1645
                            sal_Int32 nPosL = aString.indexOf( OUString::createFromAscii("encoding=\""));
1646
                            sal_Int32 nPosU = -1;
1647
                            if ( nPosL >= 0 && nPosL +10 < aString.getLength() )
1648
                            {
1649
                                nPosL += 10;
1650
                                nPosU = aString.indexOf( '"',nPosL);
1651
                                if (nPosU > nPosL)
1652
                                {
1653
                                    bForceUTF16 = true;
1654
                                }
1655
                            }
1656
                            if ( bForceUTF16 )
1657
                            {
1658
                                OUString aNewString = aString.replaceAt( nPosL,nPosU-nPosL,OUString::createFromAscii("UTF-16"));
1659
                                pStrm = new SvMemoryStream( (void*)aNewString.getStr(), aNewString.getLength() * sizeof(sal_Unicode), STREAM_READ);
1660
                            }
1661
                            else
1662
                            {
1663
                                pStrm = new SvMemoryStream( (void*)aString.getStr(), aString.getLength() * sizeof(sal_Unicode), STREAM_READ);
1664
                            }
1665
                            com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xStrm( new ::utl::OInputStreamWrapper( *pStrm ) );
1666
                            pClipboardMedium->setStreamToLoadFrom( xStrm, sal_True /*bIsReadOnly*/ );
1667
                            InsertFrom(*pClipboardMedium);
1668
                            GetDoc()->UpdateText();
1669
                            delete pClipboardMedium;
1670
                            delete pStrm;
1671
                        }
1672
                    }
1673
                }
1674
            }
1675
            break;
1676
        }
1677
1604
        case SID_NEXTERR:
1678
        case SID_NEXTERR:
1605
			NextError();
1679
			NextError();
1606
			if (pWin)
1680
			if (pWin)
(-)a/main/starmath/uiconfig/smath/menubar/menubar.xml (+1 lines)
Lines 104-109 Link Here
104
    <menu:menupopup>
104
    <menu:menupopup>
105
      <menu:menuitem menu:id=".uno:SymbolCatalogue"/>
105
      <menu:menuitem menu:id=".uno:SymbolCatalogue"/>
106
      <menu:menuitem menu:id=".uno:ImportFormula"/>
106
      <menu:menuitem menu:id=".uno:ImportFormula"/>
107
      <menu:menuitem menu:id=".uno:ImportMathMLClipboard"/>
107
      <menu:menuseparator/>
108
      <menu:menuseparator/>
108
      <menu:menu menu:id=".uno:MacrosMenu">
109
      <menu:menu menu:id=".uno:MacrosMenu">
109
        <menu:menupopup>
110
        <menu:menupopup>

Return to issue 107734