summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/ui/shells/textsh.cxx10
-rw-r--r--sw/source/ui/table/chartins.cxx7
-rw-r--r--sw/source/ui/uno/swdet2.cxx7
3 files changed, 14 insertions, 10 deletions
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 7fa290fbb77d..94326a339716 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: textsh.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: rt $ $Date: 2003-09-19 08:47:24 $
+ * last change: $Author: rt $ $Date: 2003-09-22 09:08:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -553,7 +553,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
}
else
{
- rSh.Insert( 0, &SvGlobalName( SO3_SCH_CLASSID ), TRUE, 0, &rReq );
+ SvGlobalName aGlobalName( SO3_SCH_CLASSID );
+ rSh.Insert( 0, &aGlobalName, TRUE, 0, &rReq );
}
SvInPlaceObjectRef xOLE = rSh.GetOLEObj();
if(pItem && xOLE.Is())
@@ -575,7 +576,8 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
case FN_INSERT_SMA:
{
- rSh.Insert( 0, &SvGlobalName( SO3_SM_CLASSID ), TRUE, 0, &rReq );
+ SvGlobalName aGlobalName( SO3_SM_CLASSID );
+ rSh.Insert( 0, &aGlobalName, TRUE, 0, &rReq );
}
break;
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index d9fa0fa183e2..0fdd0fb3d60f 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: chartins.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2003-09-19 08:47:35 $
+ * last change: $Author: rt $ $Date: 2003-09-22 09:08:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -315,7 +315,8 @@ IMPL_LINK( SwInsertChartDlg, FinishHdl, Button *, EMPTYARG )
}
else
{
- pShell->Insert( 0, &SvGlobalName( SO3_SCH_CLASSID ), FALSE );
+ SvGlobalName aGlobalName( SO3_SCH_CLASSID );
+ pShell->Insert( 0, &aGlobalName, FALSE );
}
delete pOutSet;
delete pChData;
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index 49fe13a09085..16fd9deabba5 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: swdet2.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2003-09-19 11:40:32 $
+ * last change: $Author: rt $ $Date: 2003-09-22 09:08:09 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -228,11 +228,12 @@ ULONG SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilt
else
{
//Bug 41417: JP 09.07.97: HTML auf die WebDocShell defaulten
+ SfxFilterContainer aFilterContainer( String::CreateFromAscii("swriter/web") );
if( pTmp->GetUserData() != C2S(sHTML) ||
String::CreateFromAscii( "com.sun.star.text.WebDocument" ) ==
String( pTmp->GetServiceName() ) ||
0 == ( (*ppFilter) = SwIoSystem::GetFilterOfFormat( C2S(sHTML),
- &SfxFilterContainer(String::CreateFromAscii("swriter/web") ) ) ) )
+ &aFilterContainer ) ) )
*ppFilter = pTmp;
}