CWS-TOOLING: integrate CWS gnumake2

16 files changed, 17 insertions, 176 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 7e92020eb88f..2a80030b7560 100644..100755
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -617,7 +617,6 @@
 #include "svx/galbrws.hxx"
 #include "svx/gallery.hxx"
 #include "svx/globl3d.hxx"
-#include "svx/globlac.hrc"
 #include "svx/globlmn.hrc"
 #include "svx/grafctrl.hxx"
 #include "svx/hlnkitem.hxx"
@@ -865,7 +864,7 @@
 #include "vcl/group.hxx"
 #include "vcl/help.hxx"
 #include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
 #include "vcl/jobset.hxx"
 #include "vcl/lineinfo.hxx"
 #include "vcl/lstbox.hxx"
diff --git a/sd/source/ui/app/accel_tmpl.src b/sd/source/ui/app/accel_tmpl.src
deleted file mode 100644
index 467c5e2ae466..000000000000
--- a/sd/source/ui/app/accel_tmpl.src
+++ /dev/null
@@ -1,117 +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 SD_ACCELERATOR
-#define SD_ACCELERATOR RID_DRAW_DEFAULTACCEL
-#include "accelids.src"
-#endif
-
-#ifndef _GLOBALACC_SRC
-#include <svx/globlac.hrc>
-#endif
-
-/** For the presentation we change some accelerator keys:
-    The navigator is moved from F5 to Shift-F5.
-    The presentation is started for F5, F9, Control-F2. The later two are
-    defined in svx/globalac.hrc.
-*/
-#define AI_SD_NAVIGATOR ACC_CODE(SID_NAVIGATOR, KEY_F5, TRUE, FALSE, FALSE )
-#define AI_PRESENTATION_F5 ACC_CODE(SID_PRESENTATION, KEY_F5, FALSE, FALSE, FALSE )
-
-Accelerator SD_ACCELERATOR
-{
-    ItemList =
-    {
-         // Funktionstasten
-        AI_ATTR_CHAR
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_PRESENTATION_F5
-        AI_PRESENTATION
-        AI_PRESENTATION_COMPAT
-#endif
-        AI_ENTER_GROUP
-        AI_COPYOBJECTS
-        AI_LEAVE_GROUP
-        AI_ATTR_TRANSFORM
-        //      AI_NAVIGATOR
-        AI_SD_NAVIGATOR
-        AI_SPELLING
-        AI_THESAURUS
-        AI_BEZIER_EDIT
-        AI_ATTR_TEXT_FITTOSIZE
-        AI_STYLE_DESIGNER
-#if SD_ACCELERATOR != RID_GRAPHIC_DEFAULTACCEL
-        AI_OUTLINEMODE
-        AI_DRAWINGMODE
-#endif
-         // A-Z Acceleratoren
-        AI_ATTR_PARA_LINESPACE_10
-        AI_ATTR_PARA_LINESPACE_20
-        AI_ATTR_PARA_LINESPACE_15
-        AI_SHOW_ITEMBROWSER
-        AI_ATTR_PARA_ADJUST_BLOCK
-        AI_ATTR_PARA_ADJUST_CENTER
-        AI_ATTR_CHAR_WEIGHT
-        AI_GROUP
-        AI_UNGROUP
-         // Weitersuchen ...
-        AI_SET_SUPER_SCRIPT
-        AI_ATTR_CHAR_POSTURE
-        AI_COMBINE
-        AI_DISMANTLE
-        AI_ATTR_PARA_ADJUST_LEFT
-        AI_ATTR_PARA_ADJUST_RIGHT
-        AI_SET_SUB_SCRIPT
-        AI_ATTR_CHAR_UNDERLINE
-        AI_STYLE_CATALOG
-#if SD_ACCELERATOR != RID_PLUGINACCEL
-// Ob das wirklich richtig ist (PlugIn-Accel) sollte mal geprueft werden !!!
-         // Anordnung
-        AI_FRAME_TO_TOP
-        AI_MOREFRONT
-        AI_FRAME_TO_BOTTOM
-        AI_MOREBACK
-         // sonstige Acceleratoren
-        AI_NEWDOC
-        AI_OPENDOC
-#endif
-        AI_SAVEDOC
-        AI_PRINTDOC
-        AI_QUITAPP
-        AI_CUT
-        AI_COPY
-        AI_PASTE
-        AI( SID_PASTE2, KEY_V, TRUE, TRUE, FALSE )
-        AI_UNDO
-        AI_REDO
-        AI_REPEAT
-        AI_DELETE
-    };
-};
-
-
-
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 2b21802b7a9e..488737fa6b56 100644..100755
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -44,10 +44,10 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dockwin.hxx>
+#include <sfx2/sfxresid.hxx>
 
 #include "pres.hxx"
 #include "navigatr.hxx"
-//#include "navichld.hxx"
 #include "navigatr.hrc"
 #include "pgjump.hxx"
 #include "app.hrc"
@@ -345,7 +345,6 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
             pMenu->Execute( this, maToolbox.GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN );
             pBox->EndSelection();
             delete pMenu;
-            //pBox->Invalidate();
         }
         break;
 
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index af2668fc9dad..c7404b820ed7 100755
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/embed/VerbAttributes.hpp>
 
 #include "sdattr.hxx"
-
+#include <sfx2/sfxresid.hxx>
 
 #include <vcl/waitobj.hxx>
 #include <osl/file.hxx>
@@ -489,7 +489,7 @@ void SdTPAction::OpenFileDialog()
             // filter makes the (Windows system) open file dialog follow
             // links on the desktop to directories.
             aFileDialog.AddFilter (
-                String (SdResId (STR_SFX_FILTERNAME_ALL)),
+                String (SfxResId (STR_SFX_FILTERNAME_ALL)),
                 String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
 
 
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 970a54b24339..6362d1e476a2 100644..100755
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -31,7 +31,7 @@
 
 
 #ifndef _IMAGEBTN_HXX //autogen
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #endif
 #ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx
index 90682ce9d3f1..ca431d1d74b9 100644..100755
--- a/sd/source/ui/inc/morphdlg.hxx
+++ b/sd/source/ui/inc/morphdlg.hxx
@@ -28,7 +28,7 @@
 #ifndef SD_MORPH_DLG_HXX
 #define SD_MORPH_DLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index 0df81c78d652..310926fd49b3 100644..100755
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -29,7 +29,7 @@
 #ifndef _SD_VECTDLG_HXX
 #define _SD_VECTDLG_HXX
 
-#include <vcl/imagebtn.hxx>
+#include <vcl/button.hxx>
 #include <vcl/group.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 9f268dec0cfa..f462d22a780e 100755
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -291,20 +291,16 @@ SdFilterDetect::~SdFilterDetect()
                                     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/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index 99e45a0d05d6..e63ce8d62fa1 100755
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(GraphicViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new GraphicViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(GraphicDocShell);
-}
-*/
 SfxViewFactory* GraphicViewShellBase::pFactory;
 SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 69906fbfd5d8..17815dcc9554 100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -45,12 +45,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ImpressViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ImpressViewShellBase::pFactory;
 SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index 3c31155a9fb5..4e0827727e79 100755
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(OutlineViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new OutlineViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(OutlineViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* OutlineViewShellBase::pFactory;
 SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 0fcb421a9888..ac7fb4ac32d6 100755
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -52,12 +52,6 @@ TYPEINIT1(PresentationViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new PresentationViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* PresentationViewShellBase::pFactory;
 SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
     SfxViewFrame *_pFrame, SfxViewShell *pOldView)
@@ -118,7 +112,6 @@ PresentationViewShellBase::~PresentationViewShellBase (void)
 
 
 
-
 void PresentationViewShellBase::InitializeFramework (void)
 {
     com::sun::star::uno::Reference<com::sun::star::frame::XController>
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 7944d2cf4b2e..792555904f60 100755
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -43,12 +43,6 @@ TYPEINIT1(SlideSorterViewShellBase, ViewShellBase);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new SlideSorterViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(SlideSorterViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* SlideSorterViewShellBase::pFactory;
 SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index c748ffbc05e0..e7a39c9d3369 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -241,12 +241,6 @@ TYPEINIT1(ViewShellBase, SfxViewShell);
 // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
 // new ViewShellBase object has been constructed.
 
-/*
-SFX_IMPL_VIEWFACTORY(ViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
-    SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
 SfxViewFactory* ViewShellBase::pFactory;
 SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
     SfxViewFrame *pFrame, SfxViewShell *pOldView)
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 7ce0b577ed9e..363ff91edf36 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -34,8 +34,9 @@
 #include "GraphicViewShellBase.hxx"
 
 #include <sfx2/viewfrm.hxx>
+#include <svtools/svtools.hrc>
 #include <com/sun/star/lang/Locale.hpp>
-
+#include <svtools/svtdata.hxx>
 #include <utility>
 #include <vector>
 
@@ -165,7 +166,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
-            String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp( SvtResId( STR_UNDO ) );
             aTmp += pUndoManager->GetUndoActionComment(0);
             rSet.Put(SfxStringItem(SID_UNDO, aTmp));
         }
@@ -193,7 +194,7 @@ void  ViewShell::GetMenuState( SfxItemSet &rSet )
         {
             // #87229# Set the necessary string like in
             // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
-            String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager()));
+            String aTmp(SvtResId(STR_REDO));
             aTmp += pUndoManager->GetRedoActionComment(0);
             rSet.Put(SfxStringItem(SID_REDO, aTmp));
         }
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index ac01158b5b85..5794696b84e4 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -54,7 +54,7 @@ RESLIB1SRSFILES=\
     $(SRS)$/uitable.srs			\
     $(SRS)$/view.srs			\
     $(SRS)$/uiannotations.srs	\
-    $(SOLARCOMMONRESDIR)$/sfx.srs
+
 
 # --- StarDraw DLL