From 5e838ad7d9d9919a362497cf5f04bdb2e7c1c6f7 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
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

---
 sfx2/source/appl/appinit.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sfx2/source/appl/appinit.cxx')

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 837ccc461586..1bca6323f699 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -85,7 +85,7 @@
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
 #include "sfxhelp.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/viewsh.hxx>
 #include "nochaos.hxx"
-- 
cgit 


From fdfb7900c36637c38f73cfa2a2a68b7c7a65046e Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Mon, 1 Nov 2010 15:32:53 +0100
Subject: undoapi: made the SfxMacroConfig event more slim, by removing unused
 methods. In turn, got rid of SfxMacroInfo, which is not used anymore

---
 sfx2/source/appl/appinit.cxx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'sfx2/source/appl/appinit.cxx')

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 08023c5414a6..fbd30a9bf42d 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -77,7 +77,6 @@
 #include <sfx2/docfac.hxx>
 #include <sfx2/evntconf.hxx>
 #include "intro.hxx"
-#include <sfx2/macrconf.hxx>
 #include <sfx2/mnumgr.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/progress.hxx>
-- 
cgit 


From 615bdd3fa8315bec38546e33a0fe0bffd7823c26 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Fri, 3 Dec 2010 20:33:01 +0100
Subject: CWS gnumake2:some fixes for problems found in autotests

---
 sfx2/source/appl/appinit.cxx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'sfx2/source/appl/appinit.cxx')

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index ddec7341f4c5..2aa19901d87c 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -65,9 +65,6 @@
 #include <rtl/logfile.hxx>
 #include <vcl/edit.hxx>
 
-#ifndef GCC
-#endif
-
 #include <sfx2/unoctitm.hxx>
 #include "app.hrc"
 #include "sfxlocal.hrc"
@@ -89,6 +86,7 @@
 #include <sfx2/fcontnr.hxx>
 #include "helper.hxx"   // SfxContentHelper::Kill()
 #include "sfxpicklist.hxx"
+#include <tools/svlibrary.hxx>
 
 #ifdef UNX
 #define stricmp(a,b) strcmp(a,b)
@@ -215,10 +213,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
     {
         bDetermineFunction = true;
 
-        String sLibName = String::CreateFromAscii( STRING( DLL_NAME ) );
-        sLibName.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "sfx" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "cui" ) ) );
-
-        rtl::OUString aLibName( sLibName );
+        static ::rtl::OUString aLibName( RTL_CONSTASCII_USTRINGPARAM( SVLIBRARY( "cui" ) ) );
         oslModule handleMod = osl_loadModuleRelative(
             &thisModule, aLibName.pData, 0 );
 
-- 
cgit 


From 7afd69a40182db58aef59502f78705ffaffd19c6 Mon Sep 17 00:00:00 2001
From: Mikhail Voytenko <mav@openoffice.org>
Date: Wed, 12 Jan 2011 10:36:54 +0100
Subject: removetooltypes01: #i112600# remove tooltypes from sfx2

---
 sfx2/source/appl/appinit.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sfx2/source/appl/appinit.cxx')

diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 2aa19901d87c..295d1445ea57 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -231,7 +231,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
 
 //====================================================================
 
-FASTBOOL SfxApplication::Initialize_Impl()
+bool SfxApplication::Initialize_Impl()
 {
     RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
 
-- 
cgit