[Libreoffice-commits] .: 2 commits - desktop/source l10ntools/inc l10ntools/prj slideshow/test svtools/bmpmaker tools/bootstrp

[Tor Lillqvist]

 desktop/source/pkgchk/unopkg/unopkg_app.cxx |    1 
 l10ntools/inc/l10ntools/vosapp.hxx          |   41 ----------------------------
 l10ntools/prj/d.lst                         |    1 
 slideshow/test/demoshow.cxx                 |    1 
 svtools/bmpmaker/g2g.cxx                    |    2 -
 tools/bootstrp/rscdep.cxx                   |    1 
 6 files changed, 47 deletions(-)

New commits:
commit 97722c821556b1a7738c34490b4d58d9a9010c67
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Sat Nov 5 12:08:02 2011 +0200

    Drop unnecessary inclusions of <sal/main.h>

diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 3289d5b..aa612e4 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -33,7 +33,6 @@
 #include "unopkg_main.h"
 #include "unopkg_shared.h"
 #include "dp_identifier.hxx"
-#include "sal/main.h"
 #include "tools/extendapplicationenvironment.hxx"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/uri.hxx"
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 2432e37..f52ba55 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -26,7 +26,6 @@
  *
  ************************************************************************/
 
-#include <sal/main.h>
 #include <rtl/ref.hxx>
 #include <rtl/bootstrap.hxx>
 
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 024700d..159b2c8 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -33,8 +33,6 @@
 #include <signal.h>
 #include <ctype.h>
 
-#include <sal/main.h>
-
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index 3595137..adae8ca 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.cxx
@@ -37,7 +37,6 @@
 #include <string.h>
 
 #include "bootstrp/prj.hxx"
-#include "sal/main.h"
 
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
commit 27c031434f8737d4c11b50e348a125cd6e4991ad
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Nov 4 17:00:46 2011 +0200

    Remove the unused <l10ntools/vosapp.hxx> header

diff --git a/l10ntools/inc/l10ntools/vosapp.hxx b/l10ntools/inc/l10ntools/vosapp.hxx
deleted file mode 100644
index ee7d3a4..0000000
--- a/l10ntools/inc/l10ntools/vosapp.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef VOSAPP_HXX
-#define VOSAPP_HXX
-
-#include <sal/main.h>
-#include <tools/solar.h>
-#include <tools/string.hxx>
-
-// Mininmal vcl/svapp compatibility without vcl dependence
-class Application
-{
-public:
-    sal_uInt16 GetCommandLineParamCount();
-    XubString GetCommandLineParam( sal_uInt16 nParam );
-    virtual void Main() = 0;
-};
-
-// Urg: Cut & Paste from svapp.cxx: we don't want to depend on vcl
-sal_uInt16 Application::GetCommandLineParamCount()
-{
-#ifdef _MSC_VER
-// Avoid using a cast, instead just disable the warning, sigh...
-#pragma warning (push)
-#pragma warning (disable:4244)
-#endif
-    return osl_getCommandArgCount();
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-}
-
-XubString Application::GetCommandLineParam( sal_uInt16 nParam )
-{
-    rtl::OUString aParam;
-    osl_getCommandArg( nParam, &aParam.pData );
-    return XubString( aParam );
-}
-
-#endif /* VOSAPP_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index 5bbc5ba..b3e48cf 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -41,7 +41,6 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
 ..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx
 ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
 ..\inc\l10ntools\file.hxx %_DEST%\inc\l10ntools\file.hxx
-..\inc\l10ntools\vosapp.hxx %_DEST%\inc\l10ntools\vosapp.hxx
 ..\source\filter\merge\FCFGMerge.cfg  %_DEST%\inc\l10ntools\FCFGMerge.cfg
 
 ..\%__SRC%\lib\transex.lib %_DEST%\lib\transex.lib