1 files changed, 24 insertions, 37 deletions

diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
index cdcda6b30691..59d964fff5bb 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
+++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx
@@ -1,30 +1,21 @@
 /* -*- 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.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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.
- *
- ************************************************************************/
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 
 #include "MyListener.h"
@@ -52,8 +43,8 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
 {
     css::uno::Sequence< css::beans::NamedValue > lEnv;
 
-          sal_Int32               i = 0;
-          sal_Int32               c = lArguments.getLength();
+    sal_Int32                     i = 0;
+    sal_Int32                     c = lArguments.getLength();
     const css::beans::NamedValue* p = lArguments.getConstArray();
     for (i=0; i<c; ++i)
     {
@@ -92,12 +83,10 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
         return css::uno::Any();
 
     css::uno::Reference< css::lang::XServiceInfo > xInfo(xModel, css::uno::UNO_QUERY);
-    sal_Bool bCalc   = xInfo->supportsService(::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"));
-    sal_Bool bWriter = (
-                         xInfo->supportsService(::rtl::OUString("com.sun.star.text.TextDocument")) &&
-                        !xInfo->supportsService(::rtl::OUString("com.sun.star.text.WebDocument")) &&
-                        !xInfo->supportsService(::rtl::OUString("com.sun.star.text.GlobalDocument"))
-                       );
+    sal_Bool bCalc   = xInfo->supportsService("com.sun.star.sheet.SpreadsheetDocument");
+    sal_Bool bWriter = ( xInfo->supportsService("com.sun.star.text.TextDocument") &&
+                        !xInfo->supportsService("com.sun.star.text.WebDocument") &&
+                        !xInfo->supportsService("com.sun.star.text.GlobalDocument") );
 
     // We are interested only in Writer and Calc. However, here we are
     // notified of all newly opened Documents...
@@ -123,7 +112,7 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans:
 ::rtl::OUString SAL_CALL MyListener::getImplementationName()
     throw (css::uno::RuntimeException)
 {
-    return ::rtl::OUString(MYLISTENER_IMPLEMENTATIONNAME);
+    return ::rtl::OUString( MYLISTENER_IMPLEMENTATIONNAME );
 }
 
 
@@ -131,7 +120,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa
     throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString(MYLISTENER_SERVICENAME);
+    lNames[0] = ::rtl::OUString( MYLISTENER_SERVICENAME );
     return lNames;
 }
 
@@ -139,10 +128,8 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa
 sal_Bool SAL_CALL MyListener::supportsService(const ::rtl::OUString& sServiceName)
     throw (css::uno::RuntimeException)
 {
-    return (
-            sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MYLISTENER_SERVICENAME)) ||
-            sServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.task.Job"))
-           );
+    return sServiceName== MYLISTENER_SERVICENAME ||
+           sServiceName == "com.sun.star.task.Job";
 }