summaryrefslogtreecommitdiff
path: root/starmath/source
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2001-07-10 11:32:24 +0000
committerCaolán McNamara <cmc@openoffice.org>2001-07-10 11:32:24 +0000
commitb10b9c169a4fd87885f79c8a0667924a5426faae (patch)
tree0cddfa968ac94956e2483c92289f665b07fc9de3 /starmath/source
parente363934442721dbe7564a00191628f0b7c380662 (diff)
#88893# settings before content
Diffstat (limited to 'starmath/source')
-rw-r--r--starmath/source/mathml.cxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/starmath/source/mathml.cxx b/starmath/source/mathml.cxx
index 223d251b31a3..ef5e071f062b 100644
--- a/starmath/source/mathml.cxx
+++ b/starmath/source/mathml.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mathml.cxx,v $
*
- * $Revision: 1.33 $
+ * $Revision: 1.34 $
*
- * last change: $Author: cmc $ $Date: 2001-07-10 11:19:44 $
+ * last change: $Author: cmc $ $Date: 2001-07-10 12:32:24 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -302,13 +302,14 @@ sal_Bool SmXMLWrapper::Import(SfxMedium &rMedium)
rMedium.GetStorage(), xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
"com.sun.star.comp.Math.XMLMetaImporter" );
+ ReadThroughComponent(
+ rMedium.GetStorage(), xModelComp, "settings.xml", 0, xServiceFactory,
+ "com.sun.star.comp.Math.XMLSettingsImporter" );
+
bRet = ReadThroughComponent(
rMedium.GetStorage(), xModelComp, "content.xml", "Content.xml", xServiceFactory,
"com.sun.star.comp.Math.XMLImporter" );
- ReadThroughComponent(
- rMedium.GetStorage(), xModelComp, "settings.xml", 0, xServiceFactory,
- "com.sun.star.comp.Math.XMLSettingsImporter" );
}
else
@@ -548,6 +549,8 @@ void SmXMLImport::endDocument(void)
aText.Erase(aText.Len()-1,1);
}
}
+ String aDummy;
+ pDocShell->SetText(aDummy);
pDocShell->SetText(aText);
}
DBG_ASSERT(pModel,"So there *was* a uno problem after all");