[Libreoffice-commits] .: 2 commits - sal/qa vcl/generic vcl/source

[Libreoffice Gerrit user]

 sal/qa/rtl/strings/test_oustring_startswith.cxx |   37 +++---------------------
 vcl/generic/fontmanager/fontmanager.cxx         |    3 -
 vcl/source/app/svmain.cxx                       |    5 +++
 3 files changed, 11 insertions(+), 34 deletions(-)

New commits:
commit 63a4eac4269910d577b9fae7f48d3bd946d08a1f
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Sep 7 17:34:28 2012 +0200

    move temporary font cleaning to a place that is run on all platforms
    
    Change-Id: Idc647684772b53d36a364afd91d9695210545e19

diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 209970d..0fd8d28 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1035,7 +1035,6 @@ PrintFontManager::~PrintFontManager()
     delete m_pAtoms;
     if( m_pFontCache )
         delete m_pFontCache;
-    TemporaryFonts::clear();
 }
 
 // -------------------------------------------------------------------------
@@ -1662,8 +1661,6 @@ void PrintFontManager::initialize()
     CALLGRIND_ZERO_STATS();
     #endif
 
-    TemporaryFonts::clear();
-
     long aDirEntBuffer[ (sizeof(struct dirent)+_PC_NAME_MAX)+1 ];
 
     if( ! m_pFontCache )
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 0bcdb64..fe895a5 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -49,6 +49,7 @@
 #include "vcl/unowrap.hxx"
 #include "vcl/configsettings.hxx"
 #include "vcl/lazydelete.hxx"
+#include "vcl/temporaryfonts.hxx"
 
 #ifdef WNT
 #include <svsys.h>
@@ -257,6 +258,8 @@ sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang
     if( pExceptionHandler != NULL )
         return sal_False;
 
+    TemporaryFonts::clear();
+
     if( ! ImplGetSVData() )
         ImplInitSVData();
 
@@ -594,6 +597,8 @@ void DeInitVCL()
         delete pOwnSvApp;
         pOwnSvApp = NULL;
     }
+
+    TemporaryFonts::clear();
 }
 
 // only one call is allowed
commit ff97ebe1cac06fe6887854b1daa6dbf23b968cd2
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Sep 7 16:29:44 2012 +0200

    use new file header, this is actually a new file
    
    Change-Id: If12e05b0d46fbbd815b9af5dc9551e2f07d859be

diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index a16a244..fc4a414 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -1,41 +1,16 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
  *
- * 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.
- *
- ************************************************************************/
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include "rtl/strbuf.hxx"
-#include "rtl/string.h"
-#include "rtl/string.hxx"
-#include "rtl/textenc.h"
 #include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include <sal/macros.h>
 
 namespace test { namespace oustring {