#i103496#: make svl buildable

18 files changed, 107 insertions, 51 deletions

diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index 53c447bde830..a1125306eb7b 100644
--- a/svl/source/misc/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 
 #ifndef GCC
diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index 37c25d6c669f..2dcece9e2671 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/inetmime.hxx>
 #include <adrparse.hxx>
 
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 1f54a6771f95..3de51f2fc8c6 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -30,7 +30,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index f5e5ae934e3d..d50645c97439 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include "filenotation.hxx"
 #include <osl/file.h>
 #include <osl/diagnose.h>
diff --git a/svl/source/misc/flbytes.cxx b/svl/source/misc/flbytes.cxx
index acf53d9b3e94..ce414be8e838 100644
--- a/svl/source/misc/flbytes.cxx
+++ b/svl/source/misc/flbytes.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <vcl/svapp.hxx>
 #include <flbytes.hxx>
 
diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index 7f95bdaaa0bc..9ec7ead0a4be 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include "folderrestriction.hxx"
 #include "osl/process.h"
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 82480fc83473..43619e879a91 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/string.hxx>
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 5a1a3719d7ca..5dfc2744f67a 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <svtools/inethist.hxx>
 
 #ifndef INCLUDED_ALGORITHM
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index ce62d7f3b2fc..f0e62b798cff 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -29,11 +29,11 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <tools/table.hxx>
 #include <tools/wldcrd.hxx>
 #include <svtools/inettype.hxx>
-#include <svtools/svtdata.hxx>
+#include <svtools/svldata.hxx>
 #ifndef _SVTOOLS_HRC
 #include <svtools/svtools.hrc>
 #endif
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index e00540af1ab1..df7c28d22b1d 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <lngmisc.hxx>
 #include <tools/solar.h>
 #include <tools/string.hxx>
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index ba4440c462a8..8d0bc0f26415 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -30,7 +30,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
diff --git a/svl/source/misc/makefile.mk b/svl/source/misc/makefile.mk
new file mode 100644
index 000000000000..93ebc7f9470c
--- /dev/null
+++ b/svl/source/misc/makefile.mk
@@ -0,0 +1,75 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.6 $
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=svl
+TARGET=misc
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/svl.pmk
+
+# --- Files --------------------------------------------------------
+
+EXCEPTIONSFILES=\
+    $(SLO)$/documentlockfile.obj \
+    $(SLO)$/flbytes.obj \
+    $(SLO)$/folderrestriction.obj \
+    $(SLO)$/fstathelper.obj \
+    $(SLO)$/lockfilecommon.obj \
+    $(SLO)$/ownlist.obj \
+    $(SLO)$/restrictedpaths.obj \
+    $(SLO)$/sharecontrolfile.obj \
+    $(SLO)$/strmadpt.obj \
+    $(SLO)$/svldata.obj \
+    $(SLO)$/urihelper.obj 
+
+SLOFILES=\
+    $(EXCEPTIONSFILES) \
+    $(SLO)$/adrparse.obj \
+    $(SLO)$/filenotation.obj \
+    $(SLO)$/inethist.obj \
+    $(SLO)$/inettype.obj \
+    $(SLO)$/lngmisc.obj \
+    $(SLO)$/PasswordHelper.obj
+
+SRS1NAME=$(TARGET)
+SRC1FILES=\
+    mediatyp.src
+
+# --- Targets -------------------------------------------------------
+
+.INCLUDE :  target.mk
+
+
+
+
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index 346b4ff7251e..e642f00ba826 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <ctype.h>
 #include <stdio.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 354e32126680..286b046a5067 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <svtools/restrictedpaths.hxx>
 
 #include <algorithm>
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 32d7b1873f68..2a151b24fd26 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <stdio.h>
 
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 4c4835609b7b..9803f2bcc32f 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <functional> // needed under Solaris when including <algorithm>...
 
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index 51247a628c0e..d791e9d9a560 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.cxx
@@ -6,7 +6,7 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: svtdata.cxx,v $
+ * $RCSfile: svldata.cxx,v $
  * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
@@ -29,20 +29,20 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 
 #include <map>
 #include <tools/resmgr.hxx>
 #include <tools/shl.hxx>
 #include <vos/process.hxx>
-#include <svtools/svtdata.hxx>
+#include <svtools/svldata.hxx>
 
-namespace unnamed_svtools_svtdata {}
-using namespace unnamed_svtools_svtdata;
+namespace unnamed_svl_svldata {}
+using namespace unnamed_svl_svldata;
     // unnamed namespaces don't work well yet
 
 //============================================================================
-namespace unnamed_svtools_svtdata {
+namespace unnamed_svl_svldata {
 
 typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
 
@@ -50,13 +50,14 @@ typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap;
 
 //============================================================================
 //
-//  ImpSvtData
+//  ImpSvlData
 //
 //============================================================================
 
-ImpSvtData::~ImpSvtData()
+static ImpSvlData* pSvlData = 0;
+
+ImpSvlData::~ImpSvlData()
 {
-    delete pResMgr;
     for (SimpleResMgrMap::iterator t
              = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin();
          t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t)
@@ -65,17 +66,7 @@ ImpSvtData::~ImpSvtData()
 }
 
 //============================================================================
-ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale)
-{
-    if (!pResMgr)
-    {
-        pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svt), aLocale );
-    }
-    return pResMgr;
-}
-
-//============================================================================
-SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale)
+SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale)
 {
     if (!m_pThreadsafeRMs)
         m_pThreadsafeRMs = new SimpleResMgrMap;
@@ -92,22 +83,12 @@ SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc
     return rResMgr;
 }
 
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
-    if (!pPatchResMgr)
-    {
-        pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
-    }
-    return pPatchResMgr;
-}
-
 //============================================================================
 // static
-ImpSvtData & ImpSvtData::GetSvtData()
+ImpSvlData & ImpSvlData::GetSvlData()
 {
-    void ** pAppData = GetAppData(SHL_SVT);
-    if (!*pAppData)
-        *pAppData= new ImpSvtData;
-    return *static_cast<ImpSvtData *>(*pAppData);
+    if (!pSvlData)
+        pSvlData= new ImpSvlData;
+    return *pSvlData;
 }
 
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 1ddb4c6dd6f9..58e21f425bf6 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
+#include "precompiled_svl.hxx"
 #include <urihelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp"