summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--[-rwxr-xr-x]sd/prj/build.lst1
-rwxr-xr-xsd/prj/make.bat92
-rwxr-xr-xsd/prj/postdlv.btm2
-rwxr-xr-xsd/prj/stree.bat151
-rw-r--r--sd/qa/unoapi/Test.java51
-rwxr-xr-xsd/qa/unoapi/knownissues.xcl4
-rwxr-xr-xsd/qa/unoapi/makefile.mk30
-rwxr-xr-xsd/source/ui/app/makefile.mk4
-rwxr-xr-xsd/source/ui/func/futext2.cxx30
-rwxr-xr-xsd/source/ui/func/makefile.mk2
-rwxr-xr-xsd/source/ui/toolpanel/ControlDescriptorIterator.cxx223
-rwxr-xr-xsd/source/ui/view/DocumentRenderer.src10
-rwxr-xr-xsd/source/ui/view/makefile.mk1
-rwxr-xr-xsd/util/makefile.mk2
-rwxr-xr-xsd/util/sd.map8
-rwxr-xr-xsd/util/sdd.map8
-rwxr-xr-xsd/util/sdfilt.map2
-rwxr-xr-xsd/util/sdui.map2
18 files changed, 83 insertions, 540 deletions
diff --git a/sd/prj/build.lst b/sd/prj/build.lst
index c8a15328d886..381e9bc6a3a2 100755..100644
--- a/sd/prj/build.lst
+++ b/sd/prj/build.lst
@@ -45,3 +45,4 @@ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd
sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
sd sd\source\ui\annotations nmake - all sd_uiannotations sd_inc NULL
sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_controller sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories sd_text sd_annotations sd_uiannotations NULL
+sd sd\qa\unoapi nmake - all sd_qa_unoapi NULL
diff --git a/sd/prj/make.bat b/sd/prj/make.bat
deleted file mode 100755
index 7525d0a51632..000000000000
--- a/sd/prj/make.bat
+++ /dev/null
@@ -1,92 +0,0 @@
-@echo off
-REM *****************************************************************
-REM * MAKE
-REM * (c) Copyright 1992-1994 STAR DIVISION
-REM * Beschreibung: Uebersetzt aktuelle Version
-REM * Aufruf: MAKE [Option1 .. OptionN]
-REM * Optionen: PRODUCT - Product-Version (FULL)
-REM * DEMO - Product-Version (DEMO)
-REM * DEPEND - Depend-Listen erzeugen
-REM * OPTIMIZE - Version mit Optimierung
-REM * DEBUG - Version mit Debuginformationen
-REM * PROFILE - Version fuer Profiling
-REM * DBGUITL - Version mit Assertions
-REM * ESO: PCH - Precompiled Header verwenden
-REM *****************************************************************
-
-IF "%1" == "" goto Next
-
-set STEMPFILE=%temp%\temp.mak
-echo. >%STEMPFILE%
-set MAKECMD=@%STEMPFILE%
-
-REM *** Parameter parsen ***
-:Loop
-
-IF "%1" == "" goto Next
-
-IF "%1" == "product" echo product=full >>%STEMPFILE%
-IF "%1" == "Product" echo product=full >>%STEMPFILE%
-IF "%1" == "PRODUCT" echo product=full >>%STEMPFILE%
-
-IF "%1" == "demo" echo product=demo >>%STEMPFILE%
-IF "%1" == "Demo" echo product=demo >>%STEMPFILE%
-IF "%1" == "DEMO" echo product=demo >>%STEMPFILE%
-
-IF "%1" == "depend" echo depend=true >>%STEMPFILE%
-IF "%1" == "Depend" echo depend=true >>%STEMPFILE%
-IF "%1" == "DEPEND" echo depend=true >>%STEMPFILE%
-
-IF "%1" == "optimize" echo optimize=true >>%STEMPFILE%
-IF "%1" == "Optimize" echo optimize=true >>%STEMPFILE%
-IF "%1" == "OPTIMIZE" echo optimize=true >>%STEMPFILE%
-
-IF "%1" == "debug" echo debug=true >>%STEMPFILE%
-IF "%1" == "Debug" echo debug=true >>%STEMPFILE%
-IF "%1" == "DEBUG" echo debug=true >>%STEMPFILE%
-
-IF "%1" == "profile" echo product=full profile=true >>%STEMPFILE%
-IF "%1" == "Profile" echo product=full profile=true >>%STEMPFILE%
-IF "%1" == "PROFILE" echo product=full profile=true >>%STEMPFILE%
-
-IF "%1" == "dbgutil" echo dbgutil=true >>%STEMPFILE%
-IF "%1" == "Dbgutil" echo dbgutil=true >>%STEMPFILE%
-IF "%1" == "DBGUTIL" echo dbgutil=true >>%STEMPFILE%
-
-IF "%1" == "seg" echo product=full seg=true >>%STEMPFILE%
-IF "%1" == "Seg" echo product=full seg=true >>%STEMPFILE%
-IF "%1" == "SEG" echo product=full seg=true >>%STEMPFILE%
-
-IF "%1" == "tcv" echo product=full tcv=-2000 >>%STEMPFILE%
-IF "%1" == "tcv" echo product=full tcv=-2000 >>%STEMPFILE%
-IF "%1" == "TCV" echo product=full tcv=-2000 >>%STEMPFILE%
-
-IF "%1" == "siz" echo product=full siz=true >>%STEMPFILE%
-IF "%1" == "Siz" echo product=full siz=true >>%STEMPFILE%
-IF "%1" == "SIZ" echo product=full siz=true >>%STEMPFILE%
-
-IF "%1" == "pch" echo prjpch=true >>%STEMPFILE%
-IF "%1" == "Pch" echo prjpch=true >>%STEMPFILE%
-IF "%1" == "PCH" echo prjpch=true >>%STEMPFILE%
-
-IF "%1" == "-i" echo -i >>%STEMPFILE%
-IF "%1" == "-I" echo -i >>%STEMPFILE%
-
-shift
-goto Loop
-
-:Next
-REM *** Kommando setzen ***
-SET STREECMD=nmake %MAKECMD%
-
-REM *** Kommando ausfuehren ***
-echo ******************************************************
-echo MAKE - (c) 1992-1994 STAR DIVISION
-call stree MAKE
-
-REM *** Aufraeumen ***
-IF NOT "%STEMPFILE%" == "" del %STEMPFILE%
-SET STREECMD=
-set STEMPFILE=
-set MAKECMD=
-echo on
diff --git a/sd/prj/postdlv.btm b/sd/prj/postdlv.btm
deleted file mode 100755
index 3db49b3ad126..000000000000
--- a/sd/prj/postdlv.btm
+++ /dev/null
@@ -1,2 +0,0 @@
-quit
-
diff --git a/sd/prj/stree.bat b/sd/prj/stree.bat
deleted file mode 100755
index 3903ca0043fc..000000000000
--- a/sd/prj/stree.bat
+++ /dev/null
@@ -1,151 +0,0 @@
-REM *****************************************************************
-REM * STREE
-REM * (c) Copyright 1992-1994 STAR DIVISION
-REM * Beschreibung: Arbeitet Source-Verzeichnis-Baum von TOOLS ab
-REM * Aufruf: STREE DIR
-REM * DIR: ALL - Alle Verzeichnisse
-REM * MAKE - Alle Verzeichnisse mit MAKEFILE
-REM * Umgebung: GUI - Systemversion
-REM * COM - Systemversion
-REM * GUIBASE - Abhaengiges Source-Verzeichnis
-REM * STREECMD - Auszufuehrendes Kommando (z.B. nmake)
-REM *****************************************************************
-
-REM *** Parameter parsen und Variablen ueberpruefen ***
-IF "%GUI%" == "" GOTO Error1
-IF "%COM%" == "" GOTO Error1
-IF "%GUIBASE%" == "" GOTO Error1
-
-IF "%1" == "" GOTO Error3
-IF "%STREECMD%" == "" GOTO Error3
-
-
-REM *** Kommando ausgeben ***
-echo Kommando: %STREECMD%
-
-REM *** In die Root wechseln
-cd ..
-
-
-REM *** Include - Verzeichnisse ***
-IF NOT "%1" == "ALL" goto NotAll
-cd inc
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd res
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd source\ui\inc
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..\..\..
-
-REM *** Verzeichnisse mit Makefile ***
-:NotAll
-
-cd sdi
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-REM stardiv/sd -> ONE
-
-cd source\ui
-cd app
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd dlg
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd docshell
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd view
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd func
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd unoidl
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..\..
-
-cd core
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-cd filter
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-echo ------------------------------------------------------
-cd
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-echo ------------------------------------------------------
-cd util
-%STREECMD%
-IF ERRORLEVEL 1 goto Error2
-cd ..
-
-echo ------------------------------------------------------
-cd prj
-goto End
-
-REM *** Fehler ausgeben ***
-:Error1
-echo Error: Keine Systemversion oder nicht vollstaendig gesetzt !
-goto End
-:Error2
-echo Error: Fehler bei Ausfhrung eines Kommandos !
-goto End
-:Error3
-echo Error: Falsche Parameter wurden an STREE uebergeben !
-goto End
-
-REM *** Aufraeumen ***
-:End
-
diff --git a/sd/qa/unoapi/Test.java b/sd/qa/unoapi/Test.java
new file mode 100644
index 000000000000..cfb4f13d7743
--- /dev/null
+++ b/sd/qa/unoapi/Test.java
@@ -0,0 +1,51 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package org.openoffice.sd.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+ @org.junit.Before public void setUp() throws Exception {
+ connection.setUp();
+ }
+
+ @org.junit.After public void tearDown()
+ throws InterruptedException, com.sun.star.uno.Exception
+ {
+ connection.tearDown();
+ }
+
+ @org.junit.Test public void test() {
+ assertTrue(
+ Runner.run(
+ "-sce", "sd.sce", "-xcl", "knownissues.xcl", "-cs",
+ connection.getDescription()));
+ }
+
+ private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/sd/qa/unoapi/knownissues.xcl b/sd/qa/unoapi/knownissues.xcl
index c3f100506e47..0f28aebd2890 100755
--- a/sd/qa/unoapi/knownissues.xcl
+++ b/sd/qa/unoapi/knownissues.xcl
@@ -50,3 +50,7 @@ sd.DrawController_OutlineView::com::sun::star::beans::XPropertySet
### i88537 ###
sd.DrawController_PresentationView::com::sun::star::beans::XPropertySet
+
+### i109518 ###
+sd.SdXPresentation::com::sun::star::presentation::XPresentation
+sd.SdXPresentation::com::sun::star::beans::XPropertySet
diff --git a/sd/qa/unoapi/makefile.mk b/sd/qa/unoapi/makefile.mk
index 8828b08d6af5..62aefb3f5f71 100755
--- a/sd/qa/unoapi/makefile.mk
+++ b/sd/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
#*************************************************************************
-#
# 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
@@ -22,19 +21,28 @@
# version 3 along with OpenOffice.org. If not, see
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
-PRJNAME=sd
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = sd
+TARGET = qa_unoapi
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/sd/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
+.INCLUDE: settings.mk
.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
-ALLTAR : UNOAPI_TEST
+ALLTAR : javatest
-UNOAPI_TEST:
- +$(SOLARENV)$/bin$/checkapi -sce sd.sce -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments -THRCNT 1
+.END
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 \
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index b0d0b133ab4c..8f56a0d47f7f 100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -157,7 +157,7 @@ LIB6FILES= \
# sdd
SHL2TARGET= sdd$(DLLPOSTFIX)
SHL2IMPLIB= sddimp
-SHL2VERSIONMAP= sdd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
diff --git a/sd/util/sd.map b/sd/util/sd.map
deleted file mode 100755
index 59e1057c6daa..000000000000
--- a/sd/util/sd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SD_1_0 {
- global:
- component_getImplementationEnvironment;
- component_writeInfo;
- component_getFactory;
- local:
- *;
-};
diff --git a/sd/util/sdd.map b/sd/util/sdd.map
deleted file mode 100755
index c7439a13948e..000000000000
--- a/sd/util/sdd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SCH_1_0 {
- global:
- component_getImplementationEnvironment;
- component_writeInfo;
- component_getFactory;
- local:
- *;
-};
diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map
index 62213393408d..e38cc1e8c597 100755
--- a/sd/util/sdfilt.map
+++ b/sd/util/sdfilt.map
@@ -1,4 +1,4 @@
-PPTEXPORTER_1_0 {
+UDK_3_0_0 {
global:
ExportPPT;
ImportPPT;
diff --git a/sd/util/sdui.map b/sd/util/sdui.map
index 51f26bb81cfb..ad5e33836c7c 100755
--- a/sd/util/sdui.map
+++ b/sd/util/sdui.map
@@ -1,4 +1,4 @@
-CUI_1_0 {
+UDK_3_0_0 {
global:
CreateDialogFactory;
local:
generated by cgit (git 2.34.1) at 2025-02-03 02:19:57 +0000