summaryrefslogtreecommitdiff
path: root/starmath/source/view.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-03-17 08:50:47 +0000
committerOliver Bolte <obo@openoffice.org>2004-03-17 08:50:47 +0000
commitc97cd30fc575af62ee57d9757d4c7a792b8305ed (patch)
tree254d2c9c59b9148ef6ccad1f40cb382acc57d0d1 /starmath/source/view.cxx
parent3fecbb08d91dd21f7f7305d45baa06fa51068957 (diff)
INTEGRATION: CWS tl02 (1.31.6); FILE MERGED
2004/02/19 11:37:17 tl 1.31.6.1: #i25649# define for slot SID_GRAPHIC changed due to conflict with new define in svx
Diffstat (limited to 'starmath/source/view.cxx')
-rw-r--r--starmath/source/view.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 204196c719..00440b5528 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: view.cxx,v $
*
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
- * last change: $Author: kz $ $Date: 2004-02-25 16:10:04 $
+ * last change: $Author: obo $ $Date: 2004-03-17 09:50:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1672,7 +1672,7 @@ void SmViewShell::GetState(SfxItemSet &rSet)
SmViewShell::SmViewShell(SfxViewFrame *pFrame, SfxViewShell *):
SfxViewShell(pFrame, SFX_VIEW_DISABLE_ACCELS | SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_HAS_PRINTOPTIONS | SFX_VIEW_CAN_PRINT),
aGraphic(this),
- aGraphicController(aGraphic, SID_GRAPHIC, pFrame->GetBindings())
+ aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame->GetBindings())
{
pViewFrame = &pFrame->GetWindow();