[Libreoffice-commits] .: 5 commits - dbaccess/Executable_odbcconfig.mk sc/Library_vbaobj.mk sd/inc solenv/gbuild vcl/win

[Norbert Thiebaud]

 dbaccess/Executable_odbcconfig.mk          |    2 ++
 sc/Library_vbaobj.mk                       |    2 ++
 sd/inc/helper/simplereferencecomponent.hxx |    3 ++-
 solenv/gbuild/platform/windows.mk          |    1 +
 vcl/win/source/gdi/salgdi3.cxx             |    2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit fee11cbc619576ae69b03e62622a38bef8799502
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 13 14:14:26 2011 +0200

    Replace removed ByteString API usage

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 5943c17..967f58a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2812,7 +2812,7 @@ sal_Bool WinSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) )
         return FALSE;
     const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding();
-    const ByteString aToFile( aSysPath.getStr(), (xub_StrLen)aSysPath.getLength(), aThreadEncoding );
+    const ByteString aToFile( rtl::OUStringToOString(aSysPath, RTL_TEXTENCODING_UTF8));
 
     // check if the font has a CFF-table
     const DWORD nCffTag = CalcTag( "CFF " );
commit c92cabc25a93678c68a80c69cc4732e30887219e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 13 14:13:05 2011 +0200

    fix fumble in makefile

diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 0b5fb7d..44e09b6 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -148,6 +148,8 @@ $(eval $(call gb_Library_add_cxxobjects,vbaobj,\
 else
 $(eval $(call gb_Library_add_exception_objects,vbaobj,\
     sc/source/ui/vba/vbasheetobjects \
+))
+endif
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_add_linked_libs,vbaobj,\
 	advapi32 \
commit c1997502aa4302aabd4c55c7de482769ee19c550
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 13 14:11:55 2011 +0200

    silence marketing warning from windows compiler

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5cec2fb..8e23ec9 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -171,6 +171,7 @@ gb_CXXFLAGS := \
 	-wd4800 \
 	-wd4820 \
 	-wd4826 \
+	-wd4996 \
 	-Zc:forScope,wchar_t- \
 	-Zm500 \
 
commit 0ae3794348be4520adff16eebaa9486c56de70e8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 13 14:09:35 2011 +0200

    windows compiler insist to have access to delete[], no matter what

diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx
index 45194d8..a6d0512 100644
--- a/sd/inc/helper/simplereferencecomponent.hxx
+++ b/sd/inc/helper/simplereferencecomponent.hxx
@@ -98,6 +98,7 @@ private:
      */
     void operator =(SimpleReferenceComponent);
 
+#ifndef WNT
     /** not implemented (see general class documentation)
         @internal
      */
@@ -107,7 +108,7 @@ private:
         @internal
      */
     static void operator delete[](void * pPtr);
-
+#endif
     bool mbDisposed;
 };
 
commit ff20c561ac0c1253442e20d17a15cdcba9c459e2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Aug 13 14:08:08 2011 +0200

    odbcconfig is not a console application

diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 2f74b96..6e18eb4 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -28,6 +28,8 @@
 
 $(eval $(call gb_Executable_Executable,odbcconfig))
 
+$(eval $(call gb_Executable_set_targettype_gui,odbcconfig,YES))
+
 $(eval $(call gb_Executable_add_precompiled_header,odbcconfig,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
 
 $(eval $(call gb_Executable_set_include,odbcconfig,\