From 60c0bf9b1a5a6ee202eb40d2b66958bfe06be4a9 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- starmath/source/view.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'starmath/source') diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 855831fc9e9f..233054cfe35b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -752,7 +752,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } -SFX_IMPL_VIEWFACTORY(SmViewShell, SmResId(RID_VIEWNAME)) +SFX_IMPL_VIEWFACTORY(SmViewShell) { SFX_VIEW_REGISTRATION(SmDocShell); } -- cgit From 5b01ceae454fa10269eed69fc0dab8b5c6c50699 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Apr 2010 15:55:51 +0200 Subject: CWS gnumake2: move all delivered headers in svx to inc/svx; remove unused or useless headers --- starmath/source/makefile.mk | 3 - starmath/source/menu_tmpl.src | 160 ------------------------------------------ starmath/source/smres.src | 2 - 3 files changed, 165 deletions(-) delete mode 100644 starmath/source/menu_tmpl.src (limited to 'starmath/source') diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk index a69a90010700..d786e0423db3 100644 --- a/starmath/source/makefile.mk +++ b/starmath/source/makefile.mk @@ -108,9 +108,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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#ifndef _SFX_HRC //autogen -#include -#endif -#ifndef _GLOBLMN_HRC //autogen -#include -#endif -#ifndef _GLOBALACC_SRC //autogen -#include -#endif -#ifndef _SVX_SVXIDS_HRC //autogen -#include -#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: -/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/smres.src b/starmath/source/smres.src index 64891a95daf9..a171fe002a21 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -3478,8 +3478,6 @@ String RID_ERR_RIGHTEXPECTED Text [ en-US ] = "'RIGHT' expected" ; }; -#include "menu.src" - ToolBox RID_MATH_TOOLBOX { HelpId = RID_MATH_TOOLBOX ; -- cgit From 7e94829cb910f8c2d4419e541cd7754c7d86994a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 24 Apr 2010 00:09:05 +0200 Subject: CWS gnumake2: avoid export of template symbols --- starmath/source/smdetect.cxx | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'starmath/source') diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index aef4df112431..df49bf57205a 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -30,7 +30,7 @@ #include "smdetect.hxx" -#include +//#include #include #include #include @@ -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() ); } } -- cgit From 5eb9ea76e2b0aa72c1bd00d7f0429cb0de3bb1da Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- starmath/source/smres.src | 74 ----------------------------------------------- starmath/source/view.cxx | 8 ----- 2 files changed, 82 deletions(-) (limited to 'starmath/source') diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 804da5671b7c..bef6d0bec106 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -1743,77 +1743,6 @@ 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" ; @@ -1838,9 +1767,6 @@ StringArray RID_PRINTUIOPTIONS < "Adjusts the formula to the page format used in the printout."; >; < "~Scaling"; >; < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; -// < "Miscellaneous options"; >; -// < "Ig~nore ~~ and ` at the end of the line"; >; -// < "Specfies that these space wildcards will be removed if they are at the end of a line."; >; }; }; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index c2756685d451..748e62e3536e 100755 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -738,10 +738,6 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER, SmResId(RID_MATH_TOOLBOX )); - //Dummy-Objectbar, damit es bei aktivieren nicht staendig zuppelt. -// Wegen #58705# entfernt (RID wurde nirgends verwendet) -// SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_SERVER, -// SmResId(RID_DRAW_OBJECTBAR) ); SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE); SFX_CHILDWINDOW_REGISTRATION(SmToolBoxWrapper::GetChildWindowId()); @@ -749,11 +745,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0)) } -<<<<<<< local -SFX_IMPL_VIEWFACTORY(SmViewShell) -======= SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default") ->>>>>>> other { SFX_VIEW_REGISTRATION(SmDocShell); } -- cgit