diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-03-10 18:46:05 +0100 |
| commit | c79b2f1f56fee5968a3193e5e6cc17bb3343381c (patch) | |
| tree | b98ecff61ef0075817574fe5564fe1898ebc17af /sfx2/source/doc/objcont.cxx | |
| parent | cc57137b9c8731202e4b1877d5892b88cc4d64e7 (diff) | |
| parent | 8b9ebf6f31f42f8d48c87c6a2ef8fca2d2f9b5fe (diff) | |
sw33bf02: merge with DEV300_m74
Diffstat (limited to 'sfx2/source/doc/objcont.cxx')
| -rw-r--r-- | sfx2/source/doc/objcont.cxx | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 52ed89bf2b..5b596414c2 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -1,14 +1,11 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: objcont.cxx,v $ - * $Revision: 1.78 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -974,11 +971,8 @@ BOOL SfxObjectShell::Remove String aName(pMySheet->GetName()); String aEmpty; SfxStyleFamily eFamily = pMySheet->GetFamily(); - if (pMySheet) - { - pMyPool->Remove(pMySheet); - bRet = TRUE; - } + pMyPool->Remove(pMySheet); + bRet = TRUE; SfxStyleSheetBase* pTestSheet = pMyPool->First(); while (pTestSheet) @@ -999,20 +993,10 @@ BOOL SfxObjectShell::Remove pTestSheet = pMyPool->Next(); } - if(bRet) - SetModified( TRUE ); - } -/* - else if (nIdx1 == CONTENT_CONFIG) - { - if (GetConfigManager()->RemoveItem(nIdx2)) - { - SetModified(TRUE); - bRet = TRUE; - SFX_APP()->GetDispatcher_Impl()->Update_Impl(TRUE); - } + + SetModified( TRUE ); } -*/ + return bRet; } |