renaissance2: rebase m77

6 files changed, 5 insertions, 265 deletions

diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk
index 84fbe3676b97..d64d9b672f7e 100755
--- a/sd/source/ui/app/makefile.mk
+++ b/sd/source/ui/app/makefile.mk
@@ -95,11 +95,7 @@ $(INCCOM)$/sddll0.hxx: makefile.mk
 .IF "$(GUI)"=="UNX"
     echo \#define DLL_NAME \"libsd$(DLLPOSTFIX)$(DLLPOST)\" >$@
 .ELSE			# "$(GUI)"=="UNX"
-.IF "$(USE_SHELL)"!="4nt"
     echo \#define DLL_NAME \"sd$(DLLPOSTFIX).DLL\" >$@
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    echo #define DLL_NAME "sd$(DLLPOSTFIX).DLL" >$@
-.ENDIF			#  "$(USE_SHELL)"!="4nt"
 .ENDIF			# "$(GUI)"=="UNX"
 
 LOCALIZE_ME =  tbxids_tmpl.src menuids2_tmpl.src menu_tmpl.src menuids_tmpl.src menuids4_tmpl.src popup2_tmpl.src toolbox2_tmpl.src menuportal_tmpl.src menuids3_tmpl.src
diff --git a/sd/source/ui/func/futext2.cxx b/sd/source/ui/func/futext2.cxx
deleted file mode 100755
index 5e6bed107e93..000000000000
--- a/sd/source/ui/func/futext2.cxx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk
index 332d5d505792..9ec946325239 100755
--- a/sd/source/ui/func/makefile.mk
+++ b/sd/source/ui/func/makefile.mk
@@ -61,7 +61,6 @@ SLOFILES = \
         $(SLO)$/fuscale.obj		\
         $(SLO)$/futransf.obj 	\
         $(SLO)$/futext.obj		\
-        $(SLO)$/futext2.obj		\
         $(SLO)$/fuline.obj		\
         $(SLO)$/sdundo.obj		\
         $(SLO)$/sdundogr.obj 	\
@@ -133,7 +132,6 @@ LIB1OBJFILES= \
         $(SLO)$/fuscale.obj		\
         $(SLO)$/futransf.obj 	\
         $(SLO)$/futext.obj		\
-        $(SLO)$/futext2.obj		\
         $(SLO)$/fuline.obj		\
         $(SLO)$/sdundo.obj		\
         $(SLO)$/sdundogr.obj 	\
diff --git a/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx b/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx
deleted file mode 100755
index 9d873b897402..000000000000
--- a/sd/source/ui/toolpanel/ControlDescriptorIterator.cxx
+++ /dev/null
@@ -1,223 +0,0 @@
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sd.hxx"
-
-/*
-#include "ControlDescriptorIterator.hxx"
-
-#include "ControlContainer.hxx"
-#include "ControlContainerDescriptor.hxx"
-
-namespace sd { namespace toolpanel {
-
-
-ControlDescriptorIterator::ControlDescriptorIterator (void)
-    : mpContainer (NULL),
-      mbSkipInvisibleControls(true)
-{
-}
-
-
-
-
-ControlDescriptorIterator::ControlDescriptorIterator (
-    ControlDescriptorList& rContainer,
-    const ControlDescriptorList::iterator& aIterator,
-    bool bSkipInvisibleControls)
-    : mpContainer(&rContainer),
-      maIterator (aIterator),
-      mbSkipInvisibleControls(bSkipInvisibleControls)
-{
-    AdvanceToNextVisibleControl();
-}
-
-
-
-
-ControlDescriptorIterator::ControlDescriptorIterator (
-    const ControlDescriptorIterator& aIterator)
-    : mpContainer (aIterator.mpContainer),
-      maIterator (aIterator.maIterator),
-      mbSkipInvisibleControls (aIterator.mbSkipInvisibleControls)
-{
-}
-
-
-
-
-ControlDescriptorIterator& ControlDescriptorIterator::operator= (
-    const ControlDescriptorIterator& aIterator)
-{
-    mpContainer = aIterator.mpContainer;
-    maIterator = aIterator.maIterator;
-    mbSkipInvisibleControls = aIterator.mbSkipInvisibleControls;
-
-    AdvanceToNextVisibleControl();
-
-    return *this;
-}
-
-
-
-
-ControlDescriptorIterator::value_type&
-    ControlDescriptorIterator::operator* (void)
-{
-    return *maIterator;
-}
-
-
-
-
-const ControlDescriptorIterator::value_type&
-    ControlDescriptorIterator::operator* (void)
-    const
-{
-    return *maIterator;
-}
-
-
-
-
-ControlDescriptorIterator::value_type&
-    ControlDescriptorIterator::operator-> (void)
-{
-    return *maIterator;
-}
-
-
-
-
-const ControlDescriptorIterator::value_type&
-    ControlDescriptorIterator::operator-> (void)
-    const
-{
-    return *maIterator;
-}
-
-
-
-
-bool ControlDescriptorIterator::operator== (
-    const ControlDescriptorIterator& aIterator) const
-{
-    return ! operator!=(aIterator);
-}
-
-
-
-
-bool ControlDescriptorIterator::operator!= (
-    const ControlDescriptorIterator& aIterator) const
-{
-    return maIterator != aIterator.maIterator;
-}
-
-
-
-
-ControlDescriptorIterator& ControlDescriptorIterator::operator++ (void)
-{
-    maIterator++;
-    AdvanceToNextVisibleControl();
-    return *this;
-}
-
-
-
-ControlDescriptorIterator ControlDescriptorIterator::operator++ (int)
-{
-    ControlDescriptorIterator aIterator (*this);
-    ++(*this);
-    return aIterator;
-}
-
-
-
-
-ControlDescriptorIterator& ControlDescriptorIterator::operator-- (void)
-{
-    maIterator--;
-    AdvanceToPreviousVisibleControl();
-    return *this;
-}
-
-
-
-ControlDescriptorIterator ControlDescriptorIterator::operator-- (int)
-{
-    ControlDescriptorIterator aIterator (*this);
-    --(*this);
-    return aIterator;
-}
-
-
-
-
-ControlDescriptorIterator ControlDescriptorIterator::operator+ (
-    int nValue) const
-{
-    return ControlDescriptorIterator (*mpContainer, maIterator+nValue);
-}
-
-
-
-ControlDescriptorIterator ControlDescriptorIterator::operator- (
-    int nValue) const
-{
-    return ControlDescriptorIterator (*mpContainer, maIterator-nValue);
-}
-
-
-
-void ControlDescriptorIterator::AdvanceToNextVisibleControl (void)
-{
-    if (mbSkipInvisibleControls && mpContainer!=NULL)
-    {
-        while (maIterator != mpContainer->end()
-            && ! (**maIterator).IsVisible())
-            ++maIterator;
-    }
-}
-
-
-
-
-void ControlDescriptorIterator::AdvanceToPreviousVisibleControl (void)
-{
-    if (mbSkipInvisibleControls && mpContainer!=NULL)
-    {
-        while (maIterator != mpContainer->begin()
-            && ! (**maIterator).IsVisible())
-            --maIterator;
-    }
-}
-
-} } // end of namespace ::sd::toolpanel
-*/
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
index 5a1030f1c18d..6419cb5c4e90 100755
--- a/sd/source/ui/view/DocumentRenderer.src
+++ b/sd/source/ui/view/DocumentRenderer.src
@@ -160,7 +160,7 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
         {
             < "Original colors" ; > ;
             < "Grayscale" ; > ;
-            < "Black & White" ; > ;
+            < "Black & white" ; > ;
         };
     };
     StringArray _STR_IMPRESS_PRINT_UI_QUALITY_CHOICES_HELP
@@ -184,8 +184,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
         {
             < "Original size" ; > ;
             < "Fit to printable page" ; > ;
-            < "Distribute on multiple paper sheets" ; > ;
-            < "Tile paper sheet with repeated slides" ; > ;
+            < "Distribute on multiple sheets of paper" ; > ;
+            < "Tile sheet of paper with repeated slides" ; > ;
         };
     };
     StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
@@ -194,8 +194,8 @@ Resource _STR_IMPRESS_PRINT_UI_OPTIONS
         {
             < "Original size" ; > ;
             < "Fit to printable page" ; > ;
-            < "Distribute on multiple paper sheets" ; > ;
-            < "Tile paper sheet with repeated pages" ; > ;
+            < "Distribute on multiple sheets of paper" ; > ;
+            < "Tile sheet of paper with repeated pages" ; > ;
         };
     };
     StringArray _STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_HELP
diff --git a/sd/source/ui/view/makefile.mk b/sd/source/ui/view/makefile.mk
index 2cc2a96d46a2..3ef489cadf94 100755
--- a/sd/source/ui/view/makefile.mk
+++ b/sd/source/ui/view/makefile.mk
@@ -53,7 +53,6 @@ SLOFILES =	\
         $(SLO)$/sdview2.obj	\
         $(SLO)$/sdview3.obj	\
         $(SLO)$/sdview4.obj	\
-        $(SLO)$/sdview5.obj	\
         $(SLO)$/viewshel.obj \
         $(SLO)$/viewshe2.obj \
         $(SLO)$/viewshe3.obj \