summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <thb@openoffice.org>2002-08-12 14:41:24 +0000
committerThorsten Behrens <thb@openoffice.org>2002-08-12 14:41:24 +0000
commit0f4cd275d1983a8a993d930714f669f808aaa843 (patch)
tree87d84e84fedd172805274f3d05a82e08e053168f
parentaea8844ecadfb5c304bd1cd2fece3f2a0f632d0d (diff)
#101000# Added strings to resource
-rw-r--r--sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx93
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineView.cxx19
-rw-r--r--sd/source/ui/accessibility/accessibility.hrc87
-rw-r--r--sd/source/ui/accessibility/accessibility.src138
-rwxr-xr-xsd/source/ui/accessibility/makefile.mk7
-rw-r--r--sd/util/makefile.mk8
6 files changed, 327 insertions, 25 deletions
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index ab7527e4abfc..6c33f0026a1c 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleDrawDocumentView.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: af $ $Date: 2002-06-28 14:46:44 $
+ * last change: $Author: thb $ $Date: 2002-08-12 15:38:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -128,6 +128,9 @@
#endif
#include <memory>
+#include "accessibility.hrc"
+#include "sdresid.hxx"
+
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star::accessibility;
@@ -434,8 +437,51 @@ void SAL_CALL
AccessibleDrawDocumentView::CreateAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM("AccessibleDrawDocumentView"));
+ rtl::OUString sName;
+
+ uno::Reference<lang::XServiceInfo> xInfo (mxController, uno::UNO_QUERY);
+ if (xInfo.is())
+ {
+ uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
+ OUString sFirstService = aServices[0];
+ if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ {
+ if( aServices.getLength() >= 2 &&
+ aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sName = OUString( SdResId(SID_SD_A11Y_I_DRAWVIEW_N) );
+ }
+ else
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sName = OUString( SdResId(SID_SD_A11Y_D_DRAWVIEW_N) );
+ }
+ }
+ else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sName = OUString( SdResId(SID_SD_A11Y_I_NOTESVIEW_N) );
+ }
+ else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sName = OUString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_N) );
+ }
+ else
+ {
+ sName = sFirstService;
+ }
+ }
+ else
+ {
+ sName = OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleDrawDocumentView"));
+ }
+ return sName;
}
@@ -453,18 +499,45 @@ void SAL_CALL
uno::Reference<lang::XServiceInfo> xInfo (mxController, uno::UNO_QUERY);
if (xInfo.is())
{
- OUString sFirstService = xInfo->getSupportedServiceNames()[0];
- if (sFirstService == OUString (
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ uno::Sequence< ::rtl::OUString > aServices( xInfo->getSupportedServiceNames() );
+ OUString sFirstService = aServices[0];
+ if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DrawingDocumentDrawView")))
+ {
+ if( aServices.getLength() >= 2 &&
+ aServices[1] == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PresentationView")))
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sDescription = OUString( SdResId(SID_SD_A11Y_I_DRAWVIEW_D) );
+ }
+ else
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sDescription = OUString( SdResId(SID_SD_A11Y_D_DRAWVIEW_D) );
+ }
+ }
+ else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesView")))
{
- sDescription = OUString (RTL_CONSTASCII_USTRINGPARAM("Draw Document"));
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sDescription = OUString( SdResId(SID_SD_A11Y_I_NOTESVIEW_D) );
+ }
+ else if (sFirstService == OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutView")))
+ {
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ sDescription = OUString( SdResId(SID_SD_A11Y_I_HANDOUTVIEW_D) );
}
else
+ {
sDescription = sFirstService;
+ }
}
else
- sDescription = OUString (
- RTL_CONSTASCII_USTRINGPARAM("Accessible Draw Document"));
+ {
+ sDescription = OUString(RTL_CONSTASCII_USTRINGPARAM("Accessible Draw Document"));
+ }
return sDescription;
}
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index fdf585228bec..24b92e7310a3 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: AccessibleOutlineView.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: thb $ $Date: 2002-06-26 11:18:14 $
+ * last change: $Author: thb $ $Date: 2002-08-12 15:38:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -132,6 +132,9 @@
#include <memory>
+#include "accessibility.hrc"
+#include "sdresid.hxx"
+
using namespace ::com::sun::star;
using namespace ::drafts::com::sun::star::accessibility;
@@ -319,8 +322,9 @@ void SAL_CALL
AccessibleOutlineView::CreateAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM("AccessibleOutlineView"));
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
+
+ return ::rtl::OUString( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N) );
}
@@ -331,12 +335,9 @@ void SAL_CALL
AccessibleOutlineView::CreateAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
- rtl::OUString sDescription;
-
- sDescription = ::rtl::OUString (
- RTL_CONSTASCII_USTRINGPARAM("Accessible Draw Document Outline"));
+ ::vos::OGuard aGuard( Application::GetSolarMutex() );
- return sDescription;
+ return ::rtl::OUString( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D) );
}
void AccessibleOutlineView::UpdateChildren()
diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc
new file mode 100644
index 000000000000..ed404cf98d3b
--- /dev/null
+++ b/sd/source/ui/accessibility/accessibility.hrc
@@ -0,0 +1,87 @@
+/*************************************************************************
+ *
+ * $RCSfile: accessibility.hrc,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: thb $ $Date: 2002-08-12 15:38:52 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#ifndef _SD_ACCESSIBILITY_HRC
+#define _SD_ACCESSIBILITY_HRC
+
+#ifndef _SFX_HRC
+#include <sfx2/sfx.hrc>
+#endif
+
+#define SID_SD_A11Y_START (SID_SD_START+600)
+
+#define SID_SD_A11Y_D_DRAWVIEW_N (SID_SD_A11Y_START + 0)
+#define SID_SD_A11Y_D_DRAWVIEW_D (SID_SD_A11Y_START + 1)
+
+#define SID_SD_A11Y_I_DRAWVIEW_N (SID_SD_A11Y_START + 2)
+#define SID_SD_A11Y_I_DRAWVIEW_D (SID_SD_A11Y_START + 3)
+#define SID_SD_A11Y_I_OUTLINEVIEW_N (SID_SD_A11Y_START + 4)
+#define SID_SD_A11Y_I_OUTLINEVIEW_D (SID_SD_A11Y_START + 5)
+#define SID_SD_A11Y_I_SLIDEVIEW_N (SID_SD_A11Y_START + 6)
+#define SID_SD_A11Y_I_SLIDEVIEW_D (SID_SD_A11Y_START + 7)
+#define SID_SD_A11Y_I_NOTESVIEW_N (SID_SD_A11Y_START + 8)
+#define SID_SD_A11Y_I_NOTESVIEW_D (SID_SD_A11Y_START + 9)
+#define SID_SD_A11Y_I_HANDOUTVIEW_N (SID_SD_A11Y_START + 10)
+#define SID_SD_A11Y_I_HANDOUTVIEW_D (SID_SD_A11Y_START + 11)
+
+
+#endif /* _SD_ACCESSIBILITY_HRC */
+
diff --git a/sd/source/ui/accessibility/accessibility.src b/sd/source/ui/accessibility/accessibility.src
new file mode 100644
index 000000000000..bcd74b710940
--- /dev/null
+++ b/sd/source/ui/accessibility/accessibility.src
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
+ * $RCSfile: accessibility.src,v $
+ *
+ * $Revision: 1.1 $
+ *
+ * last change: $Author: thb $ $Date: 2002-08-12 15:38:52 $
+ *
+ * The Contents of this file are made available subject to the terms of
+ * either of the following licenses
+ *
+ * - GNU Lesser General Public License Version 2.1
+ * - Sun Industry Standards Source License Version 1.1
+ *
+ * Sun Microsystems Inc., October, 2000
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2000 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ *
+ * Sun Industry Standards Source License Version 1.1
+ * =================================================
+ * The contents of this file are subject to the Sun Industry Standards
+ * Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ * Software provided under this License is provided on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ * See the License for the specific provisions governing your rights and
+ * obligations concerning the Software.
+ *
+ * The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ * Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ * All Rights Reserved.
+ *
+ * Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include "accessibility.hrc"
+
+/* Names and descriptions of the Draw/Impress accessibility views
+ ==============================================================
+*/
+
+String SID_SD_A11Y_D_DRAWVIEW_N
+{
+ Text = "Zeichnungsansicht" ;
+ Text [ english ] = "Drawing View" ;
+};
+
+String SID_SD_A11Y_D_DRAWVIEW_D
+{
+ Text = "Hier knnen Sie Zeichnungen erzeugen und bearbeiten." ;
+ Text [ english ] = "This is where you create and edit drawings." ;
+};
+
+String SID_SD_A11Y_I_DRAWVIEW_N
+{
+ Text = "Zeichnungsansicht" ;
+ Text [ english ] = "Drawing View" ;
+};
+
+String SID_SD_A11Y_I_DRAWVIEW_D
+{
+ Text = "Hier knnen Sie Prsentationen erzeugen und bearbeiten." ;
+ Text [ english ] = "This is where you create and edit slides." ;
+};
+
+String SID_SD_A11Y_I_OUTLINEVIEW_N
+{
+ Text = "Gliederungsansicht" ;
+ Text [ english ] = "Outline View" ;
+};
+
+String SID_SD_A11Y_I_OUTLINEVIEW_D
+{
+ Text = "Hier knnen Sie Text in der Gliederungsansicht eingeben und bearbeiten." ;
+ Text [ english ] = "This is where you enter or edit text in list form." ;
+};
+
+String SID_SD_A11Y_I_SLIDEVIEW_N
+{
+ Text = "Diaansicht" ;
+ Text [ english ] = "Slides View" ;
+};
+
+String SID_SD_A11Y_I_SLIDEVIEW_D
+{
+ Text = "Hier knnen Sie Seiten sortieren." ;
+ Text [ english ] = "This is where you sort slides." ;
+};
+
+String SID_SD_A11Y_I_NOTESVIEW_N
+{
+ Text = "Notizansicht" ;
+ Text [ english ] = "Notes View" ;
+};
+
+String SID_SD_A11Y_I_NOTESVIEW_D
+{
+ Text = "Hier knnen Sie Notizen eingeben und bearbeiten." ;
+ Text [ english ] = "This is where you enter and view notes." ;
+};
+
+String SID_SD_A11Y_I_HANDOUTVIEW_N
+{
+ Text = "Handzettelansicht" ;
+ Text [ english ] = "Handout View" ;
+};
+
+String SID_SD_A11Y_I_HANDOUTVIEW_D
+{
+ Text = "Hier knnen Sie das Layout der Handzettel bearbeiten." ;
+ Text [ english ] = "This is where you decide on the layout for handouts." ;
+};
diff --git a/sd/source/ui/accessibility/makefile.mk b/sd/source/ui/accessibility/makefile.mk
index 8a65f9433921..c590e52aeffe 100755
--- a/sd/source/ui/accessibility/makefile.mk
+++ b/sd/source/ui/accessibility/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: thb $ $Date: 2002-04-26 10:42:39 $
+# last change: $Author: thb $ $Date: 2002-08-12 15:38:52 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -95,6 +95,9 @@ SLOFILES = \
EXCEPTIONSFILES=
+SRS2NAME = accessibility
+SRC2FILES = accessibility.src
+
# --- Tagets -------------------------------------------------------
.INCLUDE : target.mk
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index cc15f9a051db..e44b743a142d 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.16 $
+# $Revision: 1.17 $
#
-# last change: $Author: ka $ $Date: 2002-04-18 15:48:12 $
+# last change: $Author: thb $ $Date: 2002-08-12 15:41:24 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -89,12 +89,12 @@ LINKFLAGS+=/SEGMENTS:512 /PACKD:32768
RESLIBSPLIT1NAME=sd
RESLIBSPLIT1SRSFILES= \
$(SRS)$/app.srs $(SRS)$/dlg.srs $(SRS)$/core.srs $(SRS)$/html.srs $(SRS)$/sdslots.srs \
- $(SOLARRESDIR)$/sfx.srs
+ $(SRS)$/accessibility.srs $(SOLARRESDIR)$/sfx.srs
.ELSE
RESLIB1NAME=sd
RESLIB1SRSFILES=\
$(SRS)$/app.srs $(SRS)$/dlg.srs $(SRS)$/core.srs $(SRS)$/html.srs $(SRS)$/sdslots.srs \
- $(SOLARRESDIR)$/sfx.srs
+ $(SRS)$/accessibility.srs $(SOLARRESDIR)$/sfx.srs
.ENDIF
#.IF "$(solarlang)" == "deut"