[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/setsdkenv_windows.template sd/source

[Andre Fischer]

 odk/setsdkenv_windows.template                          |   22 +++++++++++++++-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |    1 
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 88914c616747693083819ec44ea81c9d96fa5136
Author: Andre Fischer <af at apache.org>
Date:   Mon Jun 3 10:38:19 2013 +0000

    122437: Fixed context notification for Draw documents.

diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 0bed381..46895c0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate)
         case ViewShell::ST_IMPRESS:
         case ViewShell::ST_SLIDE_SORTER:
         case ViewShell::ST_NOTES:
+        case ViewShell::ST_DRAW:
             eContext = EnumContext::Context_DrawPage;
             if (pMainViewShell->ISA(DrawViewShell))
             {
commit ec3d57252111792c7cf5dbc13966b426c0a5b8fa
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Mon Jun 3 10:11:15 2013 +0000

    #122356# add mistakenly removed licene header

diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index eb04beb..501a2f8 100644
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -1,5 +1,25 @@
 @echo off
-Rem This script sets all enviroment variables, which
+REM *************************************************************
+REM
+REM  Licensed to the Apache Software Foundation (ASF) under one
+REM  or more contributor license agreements.  See the NOTICE file
+REM  distributed with this work for additional information
+REM  regarding copyright ownership.  The ASF licenses this file
+REM  to you under the Apache License, Version 2.0 (the
+REM  "License")rem you may not use this file except in compliance
+REM  with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM  Unless required by applicable law or agreed to in writing,
+REM  software distributed under the License is distributed on an
+REM  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM  KIND, either express or implied.  See the License for the
+REM  specific language governing permissions and limitations
+REM  under the License.
+REM
+REM *************************************************************
+REM This script sets all enviroment variables, which
 REM are necessary for building the examples of the Office Development Kit.
 REM The Script was developed for the operating systems Windows.
 REM The SDK name