summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
Diffstat (limited to 'starmath')
-rw-r--r--[-rwxr-xr-x]starmath/inc/starmath.hrc0
-rw-r--r--[-rwxr-xr-x]starmath/inc/toolbox.hxx0
-rw-r--r--[-rwxr-xr-x]starmath/sdi/smath.sdi0
-rw-r--r--[-rwxr-xr-x]starmath/sdi/smslots.sdi0
-rw-r--r--[-rwxr-xr-x]starmath/source/dialog.cxx0
-rw-r--r--[-rwxr-xr-x]starmath/source/makefile.mk3
-rw-r--r--starmath/source/menu_tmpl.src160
-rw-r--r--starmath/source/smdetect.cxx16
-rw-r--r--starmath/source/smres.src71
-rw-r--r--[-rwxr-xr-x]starmath/source/toolbox.hrc0
-rw-r--r--[-rwxr-xr-x]starmath/source/toolbox.src0
-rwxr-xr-xstarmath/source/view.cxx4
-rw-r--r--[-rwxr-xr-x]starmath/uiconfig/smath/menubar/menubar.xml0
-rw-r--r--starmath/util/makefile.mk3
14 files changed, 82 insertions, 175 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 1b919471115c..1b919471115c 100755..100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index fcc1b046f2dd..fcc1b046f2dd 100755..100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 4b9eaedac599..4b9eaedac599 100755..100644
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 69cecf25f308..69cecf25f308 100755..100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index a33ab14a98bf..a33ab14a98bf 100755..100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index 0e038bb9c78d..5900fae65b87 100755..100644
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -95,9 +95,6 @@ LIB1OBJFILES = \
# --- Targets -------------------------------------------------------
-LOCALIZE_ME = menu_tmpl.src
-
-
.INCLUDE : target.mk
$(INCCOM)$/dllname.hxx: makefile.mk
diff --git a/starmath/source/menu_tmpl.src b/starmath/source/menu_tmpl.src
deleted file mode 100644
index c6eeeb60b7cd..000000000000
--- a/starmath/source/menu_tmpl.src
+++ /dev/null
@@ -1,160 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SFX_HRC //autogen
-#include <sfx2/sfx.hrc>
-#endif
-#ifndef _GLOBLMN_HRC //autogen
-#include <svx/globlmn.hrc>
-#endif
-#ifndef _GLOBALACC_SRC //autogen
-#include <svx/globlac.hrc>
-#endif
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-
-#ifndef _STARMATH_HRC
-#include "starmath.hrc"
-#endif
-
-#ifndef MN_HELP
-#define MN_HELP
-#endif
-
-/////////////////////////////////////////////////////////////////
-
-/*
-
-The application menu bar resource has become obsolete. You can now find the menu bar definition at:
-<project>/smath/menubar/menubar.xml.
-
-*/
-
-/////////////////////////////////////////////////////////////////
-
-Accelerator RID_SMACCEL
-{
- ItemList =
- {
- AI_UNDO
- AI_REDO
- AcceleratorItem
- {
- Identifier = SID_SELECT ;
- Key = KeyCode
- {
- Code = KEY_A ;
- Modifier1 = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_NEXTMARK ;
- Key = KeyCode
- {
- Code = KEY_F4 ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_PREVMARK ;
- Key = KeyCode
- {
- Code = KEY_F4 ;
- Shift = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_NEXTERR ;
- Key = KeyCode
- {
- Code = KEY_F3 ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_PREVERR ;
- Key = KeyCode
- {
- Code = KEY_F3 ;
- Shift = TRUE ;
- };
- };
- AcceleratorItem
- {
- Identifier = SID_DRAW ;
- Key = KeyCode
- {
- Code = KEY_F9 ;
- };
- };
- };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 583098b6d8a2..6986864f6e80 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -30,7 +30,7 @@
#include "smdetect.hxx"
-#include <framework/interaction.hxx>
+//#include <framework/interaction.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XFrame.hpp>
@@ -274,20 +274,16 @@ SmFilterDetect::~SmFilterDetect()
if ( !bRepairPackage )
{
// ask the user whether he wants to try to repair
- RequestPackageReparation* pRequest = new RequestPackageReparation( aDocumentTitle );
- uno::Reference< task::XInteractionRequest > xRequest ( pRequest );
-
- xInteraction->handle( xRequest );
-
- bRepairAllowed = pRequest->isApproved();
+ RequestPackageReparation aRequest( aDocumentTitle );
+ xInteraction->handle( aRequest.GetRequest() );
+ bRepairAllowed = aRequest.isApproved();
}
if ( !bRepairAllowed )
{
// repair either not allowed or not successful
- NotifyBrokenPackage* pNotifyRequest = new NotifyBrokenPackage( aDocumentTitle );
- uno::Reference< task::XInteractionRequest > xRequest ( pNotifyRequest );
- xInteraction->handle( xRequest );
+ NotifyBrokenPackage aNotifyRequest( aDocumentTitle );
+ xInteraction->handle( aNotifyRequest.GetRequest() );
}
}
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index e608b1c9108d..804da5671b7c 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1743,6 +1743,77 @@ String RID_ERR_RIGHTEXPECTED
Text [ en-US ] = "'RIGHT' expected" ;
};
+<<<<<<< local
+ToolBox RID_MATH_TOOLBOX
+{
+ HelpId = RID_MATH_TOOLBOX ;
+ Customize = TRUE ;
+ LineSpacing = TRUE ;
+ Dockable = TRUE ;
+ Moveable = TRUE ;
+ Sizeable = TRUE ;
+ Closeable = TRUE ;
+ Zoomable = TRUE ;
+ Scroll = TRUE ;
+ HideWhenDeactivate = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Align = BOXALIGN_LEFT ;
+ Size = MAP_APPFONT ( 0 , 0 ) ;
+ MenuStrings = TRUE ;
+ ItemList =
+ {
+ ToolBoxItem
+ {
+ Identifier = SID_ZOOMIN ;
+ HelpID = SID_ZOOMIN ;
+ Text [ en-US ] = "Zoom In" ;
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_ZOOMOUT ;
+ HelpID = SID_ZOOMOUT ;
+ Text [ en-US ] = "Zoom Out" ;
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_VIEW100 ;
+ HelpID = SID_VIEW100 ;
+ Text [ en-US ] = "Zoom 100%" ;
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_ADJUST ;
+ HelpID = SID_ADJUST ;
+ Text [ en-US ] = "Entire Formula" ;
+ };
+ ToolBoxItem
+ {
+ Type = TOOLBOXITEM_SEPARATOR ;
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_DRAW ;
+ HelpID = SID_DRAW ;
+ Text [ en-US ] = "Refresh" ;
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_FORMULACURSOR ;
+ HelpID = SID_FORMULACURSOR ;
+ Text [ en-US ] = "Formula Cursor";
+ };
+ ToolBoxItem
+ {
+ Identifier = SID_SYMBOLS_CATALOGUE ;
+ HelpID = SID_SYMBOLS_CATALOGUE ;
+ Text [ en-US ] = "Symbols" ;
+ };
+ };
+};
+
+=======
+>>>>>>> other
String RID_MATH_TOOLBOX
{
Text [ en-US ] = "Main Toolbar" ;
diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc
index 29adff303a3e..29adff303a3e 100755..100644
--- a/starmath/source/toolbox.hrc
+++ b/starmath/source/toolbox.hrc
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index ead1b32810c3..ead1b32810c3 100755..100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 20c235408013..c2756685d451 100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -749,7 +749,11 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
}
+<<<<<<< local
+SFX_IMPL_VIEWFACTORY(SmViewShell)
+=======
SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default")
+>>>>>>> other
{
SFX_VIEW_REGISTRATION(SmDocShell);
}
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 7c82d733fa70..7c82d733fa70 100755..100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 08f673452f3c..09fedb57fb2c 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -42,8 +42,7 @@ GEN_HID_OTHER=TRUE
RESLIB1NAME=sm
RESLIB1IMAGES=$(PRJ)$/res
RESLIB1SRSFILES=\
- $(SRS)$/smres.srs \
- $(SOLARCOMMONRESDIR)$/sfx.srs
+ $(SRS)$/smres.srs
SHL1TARGET= sm$(DLLPOSTFIX)
SHL1IMPLIB= smimp
generated by cgit (git 2.34.1) at 2025-05-04 03:35:10 +0000